"Try harder" mode now tries 2D formats first. BlackPointEstimator more conservative...

[zxing.git] / core / build.xml

diff --git a/core/build.xml b/core/build.xml
index 970f70b..85e12e7 100644 (file)
--- a/core/build.xml
+++ b/core/build.xml
@@ -47,6 +47,13 @@
   </target>
 
   <target name="test" depends="init,build">
+    <fail message="Please build 'javase' first">
+      <condition>
+        <not>
+          <available file="../javase/javase.jar" type="file"/>
+        </not>
+      </condition>
+    </fail>
     <mkdir dir="build-test"/>
     <javac srcdir="test/src"
            destdir="build-test"
@@ -55,21 +62,24 @@
       <classpath>
         <pathelement location="build"/>
         <pathelement location="../javase/javase.jar"/>
+        <pathelement location="lib/junit.jar"/>
       </classpath>
     </javac>
-    <junit printsummary="on" haltonfailure="on" haltonerror="on">
+    <junit printsummary="on" haltonfailure="on" haltonerror="on" fork="true" dir=".">
       <formatter type="plain" usefile="false"/>
       <classpath>
         <pathelement location="build"/>
         <pathelement location="build-test"/>
-        <pathelement location="../javase/javase.jar"/>        
+        <pathelement location="../javase/javase.jar"/>
+        <pathelement location="lib/junit.jar"/>
       </classpath>
       <assertions>
         <enable/>
       </assertions>
       <batchtest>
         <fileset dir="test/src">
-          <include name="**/*.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="com/google/zxing/common/AbstractBlackBoxTestCase.java"/>
         </fileset>
       </batchtest>
     </junit>