ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs RmicTest.java
Date Tue, 10 Aug 2004 12:14:10 GMT
stevel      2004/08/10 05:14:10

  Modified:    src/etc/testcases/taskdefs/optional dotnet.xml
               src/etc/testcases/taskdefs/optional/dotnet example.cs
                        example2.cs
               src/testcases/org/apache/tools/ant/taskdefs RmicTest.java
  Log:
  test fixup, I still think the csc tests are broken.
  
  Revision  Changes    Path
  1.20      +8 -3      ant/src/etc/testcases/taskdefs/optional/dotnet.xml
  
  Index: dotnet.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/dotnet.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- dotnet.xml	30 Jul 2004 06:33:04 -0000	1.19
  +++ dotnet.xml	10 Aug 2004 12:14:09 -0000	1.20
  @@ -137,6 +137,7 @@
       <csc
         destFile="${testCSC.exe}"
         targetType="exe"
  +      srcDir="${src.dir}"
         >
       </csc>
       <available property="app.created" file="${testCSC.exe}"/>
  @@ -152,6 +153,7 @@
         destFile="${testCSC.exe}"
         targetType="exe"
         includedefaultreferences="true"
  +      srcDir="${src.dir}"
         >
       </csc>
       <available property="app.created" file="${testCSC.exe}"/>
  @@ -171,7 +173,8 @@
       <csc
         destFile="${testCSC.exe}"
         targetType="exe"
  -      srcDir="."
  +      srcDir="${src.dir}"
  +      includes="**/*.cs"
         >
       </csc>
       <available property="app.created" file="${testCSC.exe}"/>
  @@ -186,7 +189,8 @@
       <csc
         destFile="${testCSC.exe}"
         targetType="exe"
  -      srcDir="."
  +      srcDir="${src.dir}"
  +      includes="**/*.cs"
         includedefaultreferences="true"
         >
       </csc>
  @@ -348,7 +352,7 @@
           destFile="${jsharp.exe}"
           targetType="exe"
           >
  -      <src dir="dotnet" includes="*.java"/>
  +      <src dir="${src.dir}" includes="*.java"/>
       </jsharpc>
       <exec executable="${jsharp.exe}" failonerror="true" />
     </target>
  @@ -361,6 +365,7 @@
         targetType="exe"
         executable="${cs.compiler}"
         useResponseFile="true"
  +      srcDir="${src.dir}"
         >
       </csc>
       <available property="app.created" file="${testCSCresponseFile.exe}"/>
  
  
  
  1.3       +12 -49    ant/src/etc/testcases/taskdefs/optional/dotnet/example.cs
  
  Index: example.cs
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/dotnet/example.cs,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- example.cs	11 Mar 2003 06:10:47 -0000	1.2
  +++ example.cs	10 Aug 2004 12:14:10 -0000	1.3
  @@ -1,55 +1,18 @@
   /*
  - * The Apache Software License, Version 1.1
  + * Copyright  2003-2004 The Apache Software Foundation
    *
  - * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  - * reserved.
  + *  Licensed under the Apache License, Version 2.0 (the "License");
  + *  you may not use this file except in compliance with the License.
  + *  You may obtain a copy of the License at
  + *
  + *      http://www.apache.org/licenses/LICENSE-2.0
  + *
  + *  Unless required by applicable law or agreed to in writing, software
  + *  distributed under the License is distributed on an "AS IS" BASIS,
  + *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
    *
  - * 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/>.
    */
    
   using System;
  
  
  
  1.2       +12 -49    ant/src/etc/testcases/taskdefs/optional/dotnet/example2.cs
  
  Index: example2.cs
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/optional/dotnet/example2.cs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- example2.cs	11 Mar 2003 06:10:47 -0000	1.1
  +++ example2.cs	10 Aug 2004 12:14:10 -0000	1.2
  @@ -1,55 +1,18 @@
   /*
  - * The Apache Software License, Version 1.1
  + * Copyright  2003-2004 The Apache Software Foundation
    *
  - * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
  - * reserved.
  + *  Licensed under the Apache License, Version 2.0 (the "License");
  + *  you may not use this file except in compliance with the License.
  + *  You may obtain a copy of the License at
  + *
  + *      http://www.apache.org/licenses/LICENSE-2.0
  + *
  + *  Unless required by applicable law or agreed to in writing, software
  + *  distributed under the License is distributed on an "AS IS" BASIS,
  + *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + *  See the License for the specific language governing permissions and
  + *  limitations under the License.
    *
  - * 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/>.
    */
    
   using System;
  
  
  
  1.9       +2 -3      ant/src/testcases/org/apache/tools/ant/taskdefs/RmicTest.java
  
  Index: RmicTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/RmicTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- RmicTest.java	4 Aug 2004 22:03:46 -0000	1.8
  +++ RmicTest.java	10 Aug 2004 12:14:10 -0000	1.9
  @@ -98,8 +98,7 @@
           // check defaults
           String compiler = rmic.getCompiler();
           assertNotNull(compiler);
  -        assertTrue("default value",
  -                   "sun".equals(compiler) || "kaffe".equals(compiler));
  +        assertEquals("expected sun or kaffe, but found "+compiler,compiler,"default");
   
           project.setNewProperty("build.rmic", "weblogic");
           compiler = rmic.getCompiler();
  
  
  

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


Mime
View raw message