incubator-depot-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nickcha...@apache.org
Subject svn commit: rev 6951 - incubator/depot/trunk/ruper/src/test/ant/org/apache/ruper/ant/sandbox/chalko
Date Mon, 01 Mar 2004 09:15:06 GMT
Author: nickchalko
Date: Mon Mar  1 01:15:05 2004
New Revision: 6951

Added:
   incubator/depot/trunk/ruper/src/test/ant/org/apache/ruper/ant/sandbox/chalko/build.xml
      - copied, changed from rev 6946, incubator/depot/trunk/ruper/src/test/ant/org/apache/ruper/ant/sandbox/chalko/test-build.xml
Removed:
   incubator/depot/trunk/ruper/src/test/ant/org/apache/ruper/ant/sandbox/chalko/test-build.xml
Modified:
   incubator/depot/trunk/ruper/src/test/ant/org/apache/ruper/ant/sandbox/chalko/RuperSetTaskTest.java
Log:
Renamed build file.

Modified: incubator/depot/trunk/ruper/src/test/ant/org/apache/ruper/ant/sandbox/chalko/RuperSetTaskTest.java
==============================================================================
--- incubator/depot/trunk/ruper/src/test/ant/org/apache/ruper/ant/sandbox/chalko/RuperSetTaskTest.java
(original)
+++ incubator/depot/trunk/ruper/src/test/ant/org/apache/ruper/ant/sandbox/chalko/RuperSetTaskTest.java
Mon Mar  1 01:15:05 2004
@@ -35,11 +35,11 @@
 		junit.textui.TestRunner.run(RuperSetTaskTest.class);
 	}
 	public void setUp() {
-		configureProject("src/test/ant/org/apache/ruper/ant/sandbox/chalko/test-build.xml");
+		configureProject("src/test/ant/org/apache/ruper/ant/sandbox/chalko/build.xml");
 	}
 	public void test1() {
 		executeTarget("test1");
-		File file = new File("build/test/sandbox/helloworld-1.2.jar");
+		File file = new File("build/test/sandbox/helloworld/jars/helloworld-1.2.jar");
 		assertTrue("Expected " + file + " to  exists", file.exists());
 	}
 }

Copied: incubator/depot/trunk/ruper/src/test/ant/org/apache/ruper/ant/sandbox/chalko/build.xml
(from rev 6946, incubator/depot/trunk/ruper/src/test/ant/org/apache/ruper/ant/sandbox/chalko/test-build.xml)
==============================================================================
--- incubator/depot/trunk/ruper/src/test/ant/org/apache/ruper/ant/sandbox/chalko/test-build.xml
(original)
+++ incubator/depot/trunk/ruper/src/test/ant/org/apache/ruper/ant/sandbox/chalko/build.xml
Mon Mar  1 01:15:05 2004
@@ -16,10 +16,14 @@
 limitations under the License.
 -->
 <project name="ruperModule-test" basedir="../../../../../../../../../" default="test1">
+    <property name="localtest.dir" value="${basedir}/src/resources/test/repo"/>
     <typedef resource="org/apache/ruper/ant/antlib.xml"/>
-    <target name="test1">
-        <repository id="maven" url="http://www.ibiblio.org/maven/" remote="true"/>
-        <repository id="localtest" url="file:///${basedir}/src/test/repo" remote="true"/>
+    <repository id="maven" url="http://www.ibiblio.org/maven/" remote="true"/>
+    <repository id="localtest" url="file:///${localtest.dir}" remote="true"/>
+    <target name="test1" depends="clean-jars">
+        <copy toDir="${ant.home}/tools/repo">
+            <fileset dir="${localtest.dir}"/>
+        </copy>
         <ruperset id="test1">
             <resource name="helloworld" ext="jar" version="1.2" repository="localtest"/>
         </ruperset>
@@ -27,10 +31,21 @@
             <fileset refid="test1.fileset"/>
         </copy>
     </target>
-    <target name="test2">
+    <target name="test2" depends="clean-jars">
+        <ruperset id="test1">
+            <resource name="helloworld" ext="jar" version="1.2" repository="localtest"/>
+        </ruperset>
+        <copy toDir="build/test/sandbox">
+            <fileset refid="test1.fileset"/>
+        </copy>
+    </target>
+    <target name="test3">
         <ruperFileSet id="foo">
             <project name="xalan" version="4" module="http://gump.apache.org/modules/xalan.xml"/>
         </ruperFileSet>
     </target>
-    <target name="test3"/>
+    <target name="test4"/>
+    <target name="clean-jars">
+        <delete dir="${ant.home}/tools/repo/helloworld"/>
+    </target>
 </project>

Mime
View raw message