Index: /trunk/JavaCommons/build.xml
===================================================================
--- /trunk/JavaCommons/build.xml	(revision 274)
+++ /trunk/JavaCommons/build.xml	(revision 275)
@@ -96,4 +96,34 @@
 	<path id="JFCMonitor.classpath" />
 
+	<!-- JUnit Test General Properties -->
+
+	<property name="test.location.results" value="test-results" />
+	<path id="JUnit.classpath">
+		<pathelement location="lib-test/junit-4.10.jar" />
+		<pathelement location="lib-test/junit-addons-1.4.jar" />
+	</path>
+
+	<!-- JUnit Test EventBenchCore Properties -->
+	<property name="test.location.eventbenchcore" value="${build.location}/eventbenchcore-test" />
+	<property name="EventBenchCoreTest.location" value="../EventBenchCoreTest" />
+	<property name="test.eventbenchcore.main-class" value="de.ugoe.cs.eventbench.TestAll" />
+	<property name="test.eventbenchcore.results" value="${test.location.results}/eventbenchcore" />
+	<path id="EventBenchCoreTest.classpath">
+		<pathelement location="${test.location.eventbenchcore}" />
+		<path refid="EventBenchCore.classpath" />
+		<path refid="JUnit.classpath" />
+	</path>
+
+	<!-- JUnit Test JavaHelperLib Properties -->
+	<property name="test.location.javahelperlib" value="${build.location}/javahelperlib-test" />
+	<property name="JavaHelperLibTest.location" value="../JavaHelperLibTest" />
+	<property name="test.javahelperlib.main-class" value="de.ugoe.cs.util.TestAll" />
+	<property name="test.javahelperlib.results" value="${test.location.results}/javahelperlib" />
+	<path id="JavaHelperLibTest.classpath">
+		<pathelement location="${test.location.javahelperlib}" />
+		<path refid="JavaHelperLib.classpath" />
+		<path refid="JUnit.classpath" />
+	</path>
+
 	<!-- Initialization Targets -->
 	<target name="init.build">
@@ -164,5 +194,5 @@
 		</javac>
 	</target>
-	
+
 	<!-- Distribution Targets -->
 	<target depends="build,init.dist,javadoc" name="dist">
@@ -229,5 +259,5 @@
 		</copy>
 	</target>
-	
+
 	<!-- Javadoc Targets -->
 	<target name="javadoc" description="o Create Javadocs (Requires Javadoc 1.4+)">
@@ -264,3 +294,54 @@
 		</javadoc>
 	</target>
+
+	<!-- JUnit Targets -->
+	<target depends="init.build" name="init.junit">
+		<mkdir dir="${test.location.results}" />
+	</target>
+	<target depends="init.junit" name="init.eventbenchcore-test">
+		<mkdir dir="${test.location.eventbenchcore}" />
+	</target>
+	<target depends="init.junit" name="init.javahelperlib-test">
+		<mkdir dir="${test.location.javahelperlib}" />
+	</target>
+
+	<target depends="init.eventbenchcore-test" name="build.eventbenchcore-test">
+		<javac debug="true" debuglevel="${debuglevel}" destdir="${test.location.eventbenchcore}"
+			source="${source}" target="${target}" includeantruntime="false">
+			<src path="${EventBenchCoreTest.location}/src" />
+			<classpath refid="EventBenchCoreTest.classpath" />
+		</javac>
+	</target>
+	<target depends="init.javahelperlib-test" name="build.javahelperlib-test">
+		<javac debug="true" debuglevel="${debuglevel}" destdir="${test.location.javahelperlib}"
+			source="${source}" target="${target}" includeantruntime="false">
+			<src path="${JavaHelperLibTest.location}/src" />
+			<classpath refid="JavaHelperLibTest.classpath" />
+		</javac>
+	</target>
+
+	<target depends="build.eventbenchcore,build.eventbenchcore-test"
+		name="junit.eventbenchcore">
+		<junit fork="on" printsummary="yes" haltonfailure="no">
+			<classpath refid="EventBenchCoreTest.classpath" />
+			<test name="${test.eventbenchcore.main-class}" haltonfailure="no"
+				outfile="${test.eventbenchcore.results}">
+				<formatter type="xml" />
+			</test>
+		</junit>
+	</target>
+	<target depends="build.javahelperlib,build.javahelperlib-test"
+		name="junit.javahelperlib">
+		<junit fork="on" printsummary="yes" haltonfailure="no">
+			<classpath refid="JavaHelperLibTest.classpath" />
+			<test name="${test.javahelperlib.main-class}" haltonfailure="no"
+				outfile="${test.javahelperlib.results}">
+				<formatter type="xml" />
+			</test>
+		</junit>
+	</target>
+	
+	<target depends="junit.eventbenchcore,junit.javahelperlib" name="junit" />
+	
+	<target depends="dist,junit" name="distAndTest" />
 </project>