Add "test" target - only run tests for Janeway so far

Anaaspet · Jan 17, 2013 · b353bf5 · b353bf5
1 parent dc9dad7
commit b353bf5
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 8 deletions.
diff --git a/Janeway/build.xml b/Janeway/build.xml
@@ -2,22 +2,50 @@
 <project name="Janeway" default="default">
 	<import file="../build-common.xml"/>
 
+	<path id="classpath">
+		<pathelement path="../Network/build"/>
+		<pathelement path="../Core/WPISuite-Interfaces/build"/>
+		<fileset dir="${core-lib}">
+			<include name="commons-codec-1.7.jar"/>
+		</fileset>
+		<pathelement path="build"/>
+	</path>
+
+	<path id="test-classpath">
+		<path refid="classpath"/>
+		<pathelement path="build-test"/>
+		<pathelement path="${junit-jar}"/>
+	</path>
+
 	<target name="compile">
 		<mkdir dir="build"/>
 		<javac srcdir="src" destdir="build" includeJavaRuntime="yes">
-			<classpath>
-				<pathelement path="../Network/build"/>
-				<pathelement path="../Core/WPISuite-Interfaces/build"/>
-				<fileset dir="${core-lib}">
-					<include name="commons-codec-1.7.jar"/>
-				</fileset>
-				<pathelement path="build"/>
-			</classpath>
+			<classpath refid="classpath"/>
+		</javac>
+	</target>
+
+	<target name="compile-test">
+		<mkdir dir="build-test"/>
+		<javac srcdir="test" destdir="build-test" includeJavaRuntime="yes">
+			<classpath refid="test-classpath"/>
 		</javac>
 	</target>
 
 	<target name="clean">
 		<delete dir="build"/>
+		<delete dir="build-test"/>
+	</target>
+
+	<target name="test" depends="compile, compile-test">
+		<junit printsummary="yes" haltonfailure="no">
+			<classpath refid="test-classpath"/>
+			<formatter type="plain" usefile="false"/>
+			<batchtest fork="yes">
+				<fileset dir="test">
+					<include name="**/*Test*.java"/>
+				</fileset>
+			</batchtest>
+		</junit>
 	</target>
 
 </project>
diff --git a/build-common.xml b/build-common.xml
@@ -3,6 +3,7 @@
 	<import file="dependencies.xml"/>
 
 	<property name="core-lib" location="${dependencies.basedir}/Core/WPISuite/WebContent/WEB-INF/lib"/>
+	<property name="junit-jar" location="${dependencies.basedir}/junit-4.8.2.jar"/>
 
 	<target name="clean" description="Deletes files created during the build">
 		<echo message="${ant.project.name} - build-common.clean - not implemented"/>
@@ -16,6 +17,11 @@
 		<echo message="${ant.project.name} - build-common.dist - not implemented"/>
 	</target>
 
+	<target name="test" depends="compile" description="Runs tests">
+		<echo message="${ant.project.name} - build-common.test - no tests"/>
+	</target>
+
+
 	<target name="clean.dependencies"
 		description="Deletes files created during the build (includes dependencies)">
 		<antcall target="depend.${ant.project.name}">

diff --git a/build.xml b/build.xml
@@ -19,4 +19,10 @@
 			<param name="dependency.target" value="dist"/>
 		</antcall>
 	</target>
+
+	<target name="test" description="Runs tests">
+		<antcall target="depend.all">
+			<param name="dependency.target" value="test"/>
+		</antcall>
+	</target>
 </project>
diff --git a/junit-4.8.2.jar b/junit-4.8.2.jar