[Junit-devel] CVS: junit/build/experimental-use-of-antunit macros.ant, NONE, 1.1 junit-remote.ant, NONE, 1.1 junit.ant, 1.1, 1.2 build.xml, 1.1, 1.2 junit-slow.ant, 1.1, 1.2

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/build/experimental-use-of-antunit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16775/build/experimental-use-of-antunit

Modified Files:
	junit.ant build.xml junit-slow.ant 
Added Files:
	macros.ant junit-remote.ant 
Log Message:
Fix upload ant task, and cleaned up ant tests

--- NEW FILE: macros.ant ---
<project>
	<property file="junit.properties" />

	<!-- is called prior to the test -->
	<target name="setUp">
	</target>

	<!-- is called after the test, even if that caused an error -->
	<target name="tearDown">
		<delete dir="${antdistdir}" />
		<delete dir="${tempdir}" />
		<delete file="${exttestjavadoczip}" />
	</target>

	<macrodef name="junitbuild">
		<attribute name="target" />
		<sequential>
			<ant antfile="build.xml" target="@{target}" dir="${junitdir}">
				<property name="dist" value="${antdist}" />
				<property name="javadocdir"
				          value="${antdist}/ant-unit-java-docs"
				/>
				<property name="javadoczip" value="${testjavadoczip}" />
				<property name="javadocpackages" value="org.junit" />
			</ant>
		</sequential>
	</macrodef>
</project>
--- NEW FILE: junit-remote.ant ---
<project xmlns:au="antlib:org.apache.ant.antunit">
	<import file="macros.ant"/>
	
	<target name="testCharacterize_Upload">
		<!-- TODO: DUP -->
		<ant antfile="build.xml" target="clean" dir="${junitdir}">
			<property name="dist" value="${antdist}" />
		</ant>
		<!-- Should work -->
		<ant antfile="build.xml" target="upload.to.sourceforge" dir="${junitdir}">
			<property name="dist" value="${antdist}" />
		</ant>
	</target>
</project>
Index: junit.ant
===================================================================
RCS file: /cvsroot/junit/junit/build/experimental-use-of-antunit/junit.ant,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- junit.ant	10 Mar 2007 07:10:32 -0000	1.1
+++ junit.ant	20 Mar 2007 14:12:23 -0000	1.2
@@ -1,30 +1,5 @@
 <project xmlns:au="antlib:org.apache.ant.antunit">
-	<property file="junit.properties" />
-
-	<!-- is called prior to the test -->
-	<target name="setUp">
-	</target>
-
-	<!-- is called after the test, even if that caused an error -->
-	<target name="tearDown">
-		<delete dir="${antdistdir}" />
-		<delete dir="${tempdir}" />
-		<delete file="${exttestjavadoczip}" />
-	</target>
-
-	<macrodef name="junitbuild">
-		<attribute name="target" />
-		<sequential>
-			<ant antfile="build.xml" target="@{target}" dir="${junitdir}">
-				<property name="dist" value="${antdist}" />
-				<property name="javadocdir"
-				          value="${antdist}/ant-unit-java-docs"
-				/>
-				<property name="javadoczip" value="${testjavadoczip}" />
-				<property name="javadocpackages" value="org.junit" />
-			</ant>
-		</sequential>
-	</macrodef>
+	<import file="macros.ant"/>
 
 	<macrodef name="sizeOfDir">
 		<attribute name="property.name" />

Index: build.xml
===================================================================
RCS file: /cvsroot/junit/junit/build/experimental-use-of-antunit/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- build.xml	10 Mar 2007 07:10:32 -0000	1.1
+++ build.xml	20 Mar 2007 14:12:23 -0000	1.2
@@ -4,17 +4,25 @@
 	         classpath="lib/ant-antunit-1.0.jar"
 	/>
 
+	<macrodef name="antunit.plain">
+		<attribute name="includes" />
+		<sequential>
+			<au:antunit>
+				<fileset dir="." includes="@{includes}" />
+				<au:plainlistener />
+			</au:antunit>
+		</sequential>
+	</macrodef>
+	
 	<target name="fast">
-		<au:antunit>
-			<fileset dir="." includes="touch.ant,junit.ant" />
-			<au:plainlistener />
-		</au:antunit>
+		<antunit.plain includes="touch.ant,junit.ant" />
 	</target>
 
-	<target name="all">
-		<au:antunit>
-			<fileset dir="." includes="touch.ant,junit.ant,junit-slow.ant" />
-			<au:plainlistener />
-		</au:antunit>
+	<target name="all" depends="fast">
+		<antunit.plain includes="junit-slow.ant" />
+	</target>
+
+	<target name="remote">
+		<antunit.plain includes="junit-remote.ant" />
 	</target>
 </project>
\ No newline at end of file

Index: junit-slow.ant
===================================================================
RCS file: /cvsroot/junit/junit/build/experimental-use-of-antunit/junit-slow.ant,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- junit-slow.ant	10 Mar 2007 07:10:32 -0000	1.1
+++ junit-slow.ant	20 Mar 2007 14:12:23 -0000	1.2
@@ -1,14 +1,5 @@
 <project xmlns:au="antlib:org.apache.ant.antunit">
-	<property file="junit.properties" />
-
-	<!-- is called prior to the test -->
-	<target name="setUp">
-	</target>
-
-	<!-- is called after the test, even if that caused an error -->
-	<target name="tearDown">
-		<delete dir="${antdistdir}" />
-	</target>
+	<import file="macros.ant"/>
 
 	<target name="testTearDown">
 		<mkdir dir="${antdistdir}"/>