svn commit: r540935 - in /ant/sandbox/antlibs/debian/trunk/src/tests/antunit: build-test.xml controlfile-test.xml

[kevj]

Author: kevj
Date: Wed May 23 05:05:15 2007
New Revision: 540935

URL: http://svn.apache.org/viewvc?view=rev&rev=540935
Log:
-updated tests

Modified:
    ant/sandbox/antlibs/debian/trunk/src/tests/antunit/build-test.xml
    ant/sandbox/antlibs/debian/trunk/src/tests/antunit/controlfile-test.xml

Modified: ant/sandbox/antlibs/debian/trunk/src/tests/antunit/build-test.xml
URL: 
http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/src/tests/antunit/build-test.xml?view=diff&rev=540935&r1=540934&r2=540935
==============================================================================
--- ant/sandbox/antlibs/debian/trunk/src/tests/antunit/build-test.xml (original)
+++ ant/sandbox/antlibs/debian/trunk/src/tests/antunit/build-test.xml Wed May 
23 05:05:15 2007
@@ -20,11 +20,27 @@
        <deb:control file="${controlfile}" 
          package="ant" version="1.7.1alpha" maintainer="[EMAIL PROTECTED]"
          essential="no" priority="optional" section="Development" 
architecture="all">
-         <dependency name="java-gjc-compat | java-virtual-machine"/>
-         <dependency name="java-gjc-compat | java1-runtime | java2-runtime"/>
-         <dependency name="libxerces2-java"/>
-         <recommends name="ant-optional"/>
-         <recommends name="jike | java-compiler"/>
+      <depends>java-gjc-compat | java-virtual-machine</depends>
+      <depends>java-gjc-compat | java1-runtime | java2-runtime</depends>
+         <depends>libxerces2-java</depends>
+         <recommends>ant-optional</recommends>
+         <recommends>jikes | java-compiler</recommends>
+         <suggests>ant-doc</suggests>
+         <conflicts>ant-(&lt;1.7.0)</conflicts>
+         <conflicts>ant-doc(&lt;1.7.0)</conflicts>
+         <replaces>ant-(&lt;1.7.0)</replaces>
+         <replaces>ant-doc(&lt;1.7.0)</replaces>
+         <dependency>nice</dependency>
+         <dependency>libzeroc-ice-java</dependency>
+         <dependency>libtomcat5.5-java</dependency>
+         <dependency>libtomcat5-java</dependency>
+         <dependency>libow-util-ant-tasks-java</dependency>
+         <dependency>libaxis-java</dependency>
+         <dependency>velocity</dependency>
+         <dependency>jde</dependency>
+         <dependency>ecj</dependency>
+         <dependency>ant-optional</dependency>
+         <dependency>ant-doc</dependency>
          <description>Java based build tool like make</description>
        </deb:control>
     <au:assertFileExists file="${controlfile}"/>

Modified: 
ant/sandbox/antlibs/debian/trunk/src/tests/antunit/controlfile-test.xml
URL: 
http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/src/tests/antunit/controlfile-test.xml?view=diff&rev=540935&r1=540934&r2=540935
==============================================================================
--- ant/sandbox/antlibs/debian/trunk/src/tests/antunit/controlfile-test.xml 
(original)
+++ ant/sandbox/antlibs/debian/trunk/src/tests/antunit/controlfile-test.xml Wed 
May 23 05:05:15 2007
@@ -6,7 +6,7 @@
     <property name="testfile" value="control"/>
 
     <target name="tearDown">
-      <delete file="${java.io.tmpdir}/${testfile}"/>
+      <!--<delete file="${java.io.tmpdir}/${testfile}"/>-->
     </target>
 
     <target name="test-control-file-created">
@@ -14,12 +14,28 @@
       <deb:control file="${java.io.tmpdir}/${testfile}" 
        package="ant" version="1.7.1alpha" maintainer="[EMAIL PROTECTED]"
        essential="no" priority="optional" section="Development" 
architecture="all">
-        <dependency name="java-gjc-compat | java-virtual-machine"/>
-        <dependency name="java-gjc-compat | java1-runtime | java2-runtime"/>
-       <dependency name="libxerces2-java"/>
-       <recommends name="ant-optional"/>
-       <recommends name="jike | java-compiler"/>
-               <description>Java based build tool like make</description>
+        <depends>java-gjc-compat | java-virtual-machine</depends>
+        <depends>java-gjc-compat | java1-runtime | java2-runtime</depends>
+       <depends>libxerces2-java</depends>
+       <recommends>ant-optional</recommends>
+       <recommends>jikes | java-compiler</recommends>
+       <suggests>ant-doc</suggests>
+       <conflicts>ant-(&lt;1.7.0)</conflicts>
+       <conflicts>ant-doc(&lt;1.7.0)</conflicts>
+       <replaces>ant-(&lt;1.7.0)</replaces>
+       <replaces>ant-doc(&lt;1.7.0)</replaces>
+       <dependency>nice</dependency>
+       <dependency>libzeroc-ice-java</dependency>
+       <dependency>libtomcat5.5-java</dependency>
+       <dependency>libtomcat5-java</dependency>
+       <dependency>libow-util-ant-tasks-java</dependency>
+       <dependency>libaxis-java</dependency>
+       <dependency>velocity</dependency>
+       <dependency>jde</dependency>
+       <dependency>ecj</dependency>
+       <dependency>ant-optional</dependency>
+       <dependency>ant-doc</dependency>
+       <description>Java based build tool like make</description>
       </deb:control>
       <au:assertFileExists file="${java.io.tmpdir}/${testfile}"/>
     </target>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]