ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/proposal/sandbox/dotnet/src/testcases/org/apache/tools/ant/taskdefs/optional/dotnet MSBuildTaskTest.java NAntTaskTest.java
Date Tue, 25 Nov 2003 11:57:14 GMT
bodewig     2003/11/25 03:57:14

  Modified:    proposal/sandbox/dotnet/src/etc/testcases msbuild.xml
                        nant.xml
  Added:       proposal/sandbox/dotnet/src/testcases/org/apache/tools/ant/taskdefs/optional/dotnet
                        MSBuildTaskTest.java NAntTaskTest.java
  Log:
  Add unit tests for <nant> and <msbuild>
  
  Revision  Changes    Path
  1.2       +9 -0      ant/proposal/sandbox/dotnet/src/etc/testcases/msbuild.xml
  
  Index: msbuild.xml
  ===================================================================
  RCS file: /home/cvs/ant/proposal/sandbox/dotnet/src/etc/testcases/msbuild.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- msbuild.xml	21 Nov 2003 13:53:57 -0000	1.1
  +++ msbuild.xml	25 Nov 2003 11:57:14 -0000	1.2
  @@ -9,6 +9,15 @@
       </classpath>
     </taskdef>
   
  +  <property environment="env"/>
  +  <condition property="msbuild.found">
  +    <or>
  +      <available file="MSBuild.exe" filepath="${env.PATH}"/>
  +      <available file="MSBuild.exe" filepath="${env.Path}"/>
  +      <available file="MSBuild.exe"/>
  +    </or>
  +  </condition>
  +
     <target name="echo">
       <msbuild 
         buildfile="src/msbuild.proj" 
  
  
  
  1.2       +9 -0      ant/proposal/sandbox/dotnet/src/etc/testcases/nant.xml
  
  Index: nant.xml
  ===================================================================
  RCS file: /home/cvs/ant/proposal/sandbox/dotnet/src/etc/testcases/nant.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- nant.xml	21 Nov 2003 13:53:57 -0000	1.1
  +++ nant.xml	25 Nov 2003 11:57:14 -0000	1.2
  @@ -9,6 +9,15 @@
       </classpath>
     </taskdef>
   
  +  <property environment="env"/>
  +  <condition property="nant.found">
  +    <or>
  +      <available file="NAnt.exe" filepath="${env.PATH}"/>
  +      <available file="NAnt.exe" filepath="${env.Path}"/>
  +      <available file="NAnt.exe"/>
  +    </or>
  +  </condition>
  +
     <target name="echo">
       <nant 
         buildfile="src/nant.build" 
  
  
  
  1.1                  ant/proposal/sandbox/dotnet/src/testcases/org/apache/tools/ant/taskdefs/optional/dotnet/MSBuildTaskTest.java
  
  Index: MSBuildTaskTest.java
  ===================================================================
  /*
   *  The Apache Software License, Version 1.1
   *
   *  Copyright (c) 2003 The Apache Software Foundation.  All rights
   *  reserved.
   *
   *  Redistribution and use in source and binary forms, with or without
   *  modification, are permitted provided that the following conditions
   *  are met:
   *
   *  1. Redistributions of source code must retain the above copyright
   *  notice, this list of conditions and the following disclaimer.
   *
   *  2. Redistributions in binary form must reproduce the above copyright
   *  notice, this list of conditions and the following disclaimer in
   *  the documentation and/or other materials provided with the
   *  distribution.
   *
   *  3. The end-user documentation included with the redistribution, if
   *  any, must include the following acknowlegement:
   *  "This product includes software developed by the
   *  Apache Software Foundation (http://www.apache.org/)."
   *  Alternately, this acknowlegement may appear in the software itself,
   *  if and wherever such third-party acknowlegements normally appear.
   *
   *  4. The names "Ant" and "Apache Software
   *  Foundation" must not be used to endorse or promote products derived
   *  from this software without prior written permission. For written
   *  permission, please contact apache@apache.org.
   *
   *  5. Products derived from this software may not be called "Apache"
   *  nor may "Apache" appear in their names without prior written
   *  permission of the Apache Group.
   *
   *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   *  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   *  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   *  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   *  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   *  SUCH DAMAGE.
   *  ====================================================================
   *
   *  This software consists of voluntary contributions made by many
   *  individuals on behalf of the Apache Software Foundation.  For more
   *  information on the Apache Software Foundation, please see
   *  <http://www.apache.org/>.
   */
  package org.apache.tools.ant.taskdefs.optional.dotnet;
  
  import org.apache.tools.ant.BuildFileTest;
  
  /**
   * Tests the MSBuildTask task.
   */
  public class MSBuildTaskTest extends BuildFileTest {
  
      /**
       * Description of the Field
       */
      private final static String TASKDEFS_DIR = "src/etc/testcases/";
  
      /**
       * Constructor 
       *
       * @param name testname
       */
      public MSBuildTaskTest(String name) {
          super(name);
      }
  
      /**
       * The JUnit setup method
       */
      public void setUp() {
          configureProject(TASKDEFS_DIR + "msbuild.xml");
      }
  
      public void testEcho() throws Exception {
          if (getProject().getProperty("msbuild.found") != null) {
              expectLogContaining("echo", "foo is bar");
          }
      }
  }
  
  
  
  1.1                  ant/proposal/sandbox/dotnet/src/testcases/org/apache/tools/ant/taskdefs/optional/dotnet/NAntTaskTest.java
  
  Index: NAntTaskTest.java
  ===================================================================
  /*
   *  The Apache Software License, Version 1.1
   *
   *  Copyright (c) 2003 The Apache Software Foundation.  All rights
   *  reserved.
   *
   *  Redistribution and use in source and binary forms, with or without
   *  modification, are permitted provided that the following conditions
   *  are met:
   *
   *  1. Redistributions of source code must retain the above copyright
   *  notice, this list of conditions and the following disclaimer.
   *
   *  2. Redistributions in binary form must reproduce the above copyright
   *  notice, this list of conditions and the following disclaimer in
   *  the documentation and/or other materials provided with the
   *  distribution.
   *
   *  3. The end-user documentation included with the redistribution, if
   *  any, must include the following acknowlegement:
   *  "This product includes software developed by the
   *  Apache Software Foundation (http://www.apache.org/)."
   *  Alternately, this acknowlegement may appear in the software itself,
   *  if and wherever such third-party acknowlegements normally appear.
   *
   *  4. The names "Ant" and "Apache Software
   *  Foundation" must not be used to endorse or promote products derived
   *  from this software without prior written permission. For written
   *  permission, please contact apache@apache.org.
   *
   *  5. Products derived from this software may not be called "Apache"
   *  nor may "Apache" appear in their names without prior written
   *  permission of the Apache Group.
   *
   *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   *  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   *  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   *  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   *  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   *  SUCH DAMAGE.
   *  ====================================================================
   *
   *  This software consists of voluntary contributions made by many
   *  individuals on behalf of the Apache Software Foundation.  For more
   *  information on the Apache Software Foundation, please see
   *  <http://www.apache.org/>.
   */
  package org.apache.tools.ant.taskdefs.optional.dotnet;
  
  import org.apache.tools.ant.BuildFileTest;
  
  /**
   * Tests the NAntTask task.
   */
  public class NAntTaskTest extends BuildFileTest {
  
      /**
       * Description of the Field
       */
      private final static String TASKDEFS_DIR = "src/etc/testcases/";
  
      /**
       * Constructor 
       *
       * @param name testname
       */
      public NAntTaskTest(String name) {
          super(name);
      }
  
      /**
       * The JUnit setup method
       */
      public void setUp() {
          configureProject(TASKDEFS_DIR + "nant.xml");
      }
  
      public void testEcho() throws Exception {
          if (getProject().getProperty("nant.found") != null) {
              expectLogContaining("echo", "foo is bar");
          }
      }
  }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message