Changeset 379 for trunk

Timestamp:

01/31/12 12:11:37 (13 years ago)

Author:

sherbold

Message:

• adapted build.xml ant file to run JUnit tests located in EventBenchConsoleTest? project

File:

• trunk/JavaCommons/build.xml (modified) (8 diffs)

trunk/JavaCommons/build.xml

@@ -105 +105 @@
         <property name="coverage.instrumented.javahelperlib" value="${coverage.instrumented}/javahelperlib" />
         <property name="coverage.instrumented.eventbenchcore" value="${coverage.instrumented}/eventbenchcore" />
+        <property name="coverage.instrumented.eventbenchconsole" value="${coverage.instrumented}/eventbenchconsole" />
         <path id="emma.classpath">
                 <pathelement location="lib-test/emma.jar" />
@@ -124 +125 @@
         </path>
 
+        <!-- JUnit Test EventBenchConsole Properties -->
+        <property name="test.location.eventbenchconsole" value="${build.location}/eventbenchconsole-test" />
+        <property name="EventBenchConsoleTest.location" value="../EventBenchConsoleTest" />
+        <property name="test.eventbenchconsole.main-class" value="de.ugoe.cs.eventbench.jfc.TestAll" />
+        <property name="test.eventbenchconsole.results" value="${test.location.results}/eventbenchconsole" />
+        <path id="EventBenchConsoleJUnitCompile.classpath">
+                <pathelement location="${test.location.eventbenchconsole}" />
+                <path refid="EventBenchConsole.classpath" />
+                <path refid="EventBenchCore.classpath" />
+                <path refid="JUnit.classpath" />
+        </path>
+        <path id="EventBenchConsoleJUnitExecute.classpath">
+                <pathelement location="${coverage.instrumented.eventbenchconsole}" />
+                <path refid="EventBenchConsoleJUnitCompile.classpath" />
+                <path refid="emma.classpath" />
+        </path>
+        
         <!-- JUnit Test EventBenchCore Properties -->
         <property name="test.location.eventbenchcore" value="${build.location}/eventbenchcore-test" />
@@ -131 +149 @@
         <path id="EventBenchCoreJUnitCompile.classpath">
                 <pathelement location="${test.location.eventbenchcore}" />
-                <!--<pathelement location="${coverage.instrumented.eventbenchcore}" /> -->
                 <path refid="EventBenchCore.classpath" />
                 <path refid="JUnit.classpath" />
@@ -196 +213 @@
                 <mkdir dir="${test.location.data}" />
                 <mkdir dir="${test.location.output}" />
+        </target>
+        <target depends="init.junit" name="init.eventbenchconsole-test">
+                <mkdir dir="${test.location.eventbenchconsole}" />
         </target>
         <target depends="init.junit" name="init.eventbenchcore-test">
@@ -375 +395 @@
 
         <!-- JUnit Targets -->
+        <target depends="init.eventbenchconsole-test, emma.instrument.eventbenchconsole"
+                name="build.eventbenchconsole-test">
+                <javac debug="true" debuglevel="${debuglevel}" destdir="${test.location.eventbenchconsole}"
+                        source="${source}" target="${target}" includeantruntime="false">
+                        <src path="${EventBenchConsoleTest.location}/src" />
+                        <classpath refid="EventBenchConsoleJUnitCompile.classpath" />
+                </javac>
+        </target>
         <target depends="init.eventbenchcore-test, emma.instrument.eventbenchcore"
                 name="build.eventbenchcore-test">
@@ -392 +420 @@
         </target>
 
+        <target depends="emma.instrument.eventbenchconsole,build.eventbenchconsole-test"
+                        name="junit.eventbenchconsole">
+                        <junit fork="on" printsummary="yes" haltonfailure="no">
+                                <classpath refid="EventBenchConsoleJUnitExecute.classpath" />
+                                <test name="${test.eventbenchconsole.main-class}" haltonfailure="no"
+                                        outfile="${test.eventbenchconsole.results}">
+                                        <formatter type="xml" />
+                                </test>
+                                <jvmarg
+                                        value="-Demma.coverage.out.file=${coverage.location}/eventbenchconsole.emma" />
+                                <jvmarg value="-Demma.coverage.out.merge=true" />
+                        </junit>
+                </target>
         <target depends="emma.instrument.eventbenchcore,build.eventbenchcore-test"
                 name="junit.eventbenchcore">
@@ -419 +460 @@
         </target>
 
-        <target depends="junit.javahelperlib,junit.eventbenchcore" name="junit" />
+        <target depends="junit.javahelperlib,junit.eventbenchcore,junit.eventbenchconsole" name="junit" />
 
         <!-- Emma Targets -->
@@ -434 +475 @@
                 </emma>
         </target>
+        <target depends="build.eventbenchconsole, init.emma" name="emma.instrument.eventbenchconsole">
+                        <emma enabled="true">
+                                <instr instrpath="${build.location.eventbenchconsole}" destdir="${coverage.instrumented.eventbenchconsole}"
+                                        metadatafile="${coverage.location}/eventbenchconsole.emma" merge="true" />
+                        </emma>
+                </target>
         <target depends="junit" name="emma.report">
                 <emma enabled="true">