Fix tests

build.xml

@@ -3,7 +3,7 @@
 
 
 	<property name="src.dir" value="src" />
-	<property name="testsrc.dir" value="src" />
+	<property name="testsrc.dir" value="test" />
 	<property name="build.dir" value="bin" />
 	<property name="test.dir" value="testbin" />
 	<property name="junit.dir" value="/tool/junit4" />
@@ -20,11 +20,7 @@
 	<!--this file was created by Eclipse Runnable JAR Export Wizard-->
 	<!--ANT 1.7 is required										-->
 	<target name="compile" depends="init">
-		<javac srcdir="${src.dir}" destdir="${build.dir}" target="1.5">
-			<classpath>
-				<pathelement location="${junit.dir}" />
-			</classpath>
-		</javac>
+		<javac srcdir="${src.dir}" destdir="${build.dir}" target="1.5" />
 	</target>
 	
 	<target name="create_run_jar" depends="compile">
@@ -38,28 +34,29 @@
 		</jar>
 	</target>
 
-	<target name="compile_tests" depends="compile">
+	<target name="compile_tests" depends="init">
 		<javac srcdir="${testsrc.dir}" destdir="${test.dir}">
 			<classpath>
-				<pathelement location="${junit.dir}" />
+				<fileset dir="${junit.dir}" includes="*.jar" />
 			</classpath>
 		</javac>
 	</target>
 
 
 	<target name="test" depends="compile_tests">
-		<mkdir dir="reports" />
-		<junit printsummary="yes" haltonfailure="no">
+		<junit printsummary="yes" haltonfailure="no" fork="yes">
 			<classpath>
-				<pathelement location="bin" />
-				<fileset dir="/tool/junit4" includes="*.jar" />
+				<pathelement location="${build.dir}" /> <!-- compiled production classes -->
+				<pathelement location="${test.dir}" />  <!-- compiled test classes -->
+				<fileset dir="${junit.dir}" includes="*.jar" /> <!-- JUnit jars -->
 			</classpath>
 			<batchtest fork="yes" todir="${reports.dir}">
 				<fileset dir="${test.dir}">
-					<include name="**/*Test.class" />
+					<include name="**/*.class" />
 				</fileset>
 			</batchtest>
 			<formatter type="xml" />
+            <formatter type="plain" />
 		</junit>
 	</target>
 </project>