Merge pull request #240 from emchristiansen:javatest2.4

modules/java/CMakeLists.txt

@@ -295,7 +295,12 @@ endif(ANDROID)
 add_dependencies(${lib_target} ${api_target})
 add_dependencies(${the_module} ${lib_target})
 
-#android test project
+# android test project
 if(ANDROID AND BUILD_TESTS)
   add_subdirectory(android_test)
 endif()
+
+# Desktop Java test project.
+if((NOT ANDROID) AND BUILD_TESTS)
+  add_subdirectory(java_test)
+endif()

modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java

 package org.opencv.test;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FileReader;
 import java.io.IOException;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
@@ -426,24 +428,19 @@ public class OpenCVTestCase extends TestCase {
     }
 
     protected static String readFile(String path) {
-        FileInputStream stream = null;
         try {
-            stream = new FileInputStream(new File(path));
-            FileChannel fc = stream.getChannel();
-            MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0,
-                    fc.size());
-            return Charset.defaultCharset().decode(bb).toString();
+        BufferedReader br = new BufferedReader(new FileReader(path));
+        String line;
+        StringBuffer result = new StringBuffer();
+        while ((line = br.readLine()) != null) {
+            result.append(line);
+            result.append("\n");
+        }
+        return result.toString();
         } catch (IOException e) {
             OpenCVTestRunner.Log("Failed to read file \"" + path
                     + "\". Exception is thrown: " + e);
             return null;
-        } finally {
-            if (stream != null)
-                try {
-                    stream.close();
-                } catch (IOException e) {
-                    OpenCVTestRunner.Log("Exception is thrown: " + e);
-                }
         }
     }
 

modules/java/android_test/src/org/opencv/test/core/TermCriteriaTest.java

@@ -77,7 +77,7 @@ public class TermCriteriaTest extends OpenCVTestCase {
 
     public void testToString() {
         String actual = tc2.toString();
-        String expected = "{ type: 2, maxCount: 4, epsilon: 0.001}";
+        String expected = "{ type: 2, maxCount: 4, epsilon: " + EPS + "}";
 
         assertEquals(expected, actual);
     }

modules/java/android_test/src/org/opencv/test/features2d/BRIEFDescriptorExtractorTest.java

@@ -26,10 +26,9 @@ public class BRIEFDescriptorExtractorTest extends OpenCVTestCase {
 
     @Override
     protected void setUp() throws Exception {
+        super.setUp();
         extractor = DescriptorExtractor.create(DescriptorExtractor.BRIEF);
         matSize = 100;
-
-        super.setUp();
     }
 
     public void testComputeListOfMatListOfListOfKeyPointListOfMat() {

modules/java/android_test/src/org/opencv/test/features2d/BruteForceDescriptorMatcherTest.java

@@ -80,6 +80,7 @@ public class BruteForceDescriptorMatcherTest extends OpenCVTestCase {
     }
 
     protected void setUp() throws Exception {
+        super.setUp();
         matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE);
         matSize = 100;
 
@@ -90,8 +91,6 @@ public class BruteForceDescriptorMatcherTest extends OpenCVTestCase {
                 new DMatch(3, 1, 0, 0.48435235f),
                 new DMatch(4, 0, 0, 1.0836693f)
                 };
-
-        super.setUp();
     }
 
     public void testAdd() {

modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingDescriptorMatcherTest.java

@@ -65,6 +65,7 @@ public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase {
     }
 
     protected void setUp() throws Exception {
+        super.setUp();
         matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE_HAMMING);
         matSize = 100;
 
@@ -73,7 +74,6 @@ public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase {
                 new DMatch(1, 2, 0, 42),
                 new DMatch(2, 1, 0, 40),
                 new DMatch(3, 3, 0, 53) };
-        super.setUp();
     }
 
     public void testAdd() {

modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingLUTDescriptorMatcherTest.java

@@ -65,6 +65,7 @@ public class BruteForceHammingLUTDescriptorMatcherTest extends OpenCVTestCase {
     }
 
     protected void setUp() throws Exception {
+        super.setUp();
         matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE_HAMMINGLUT);
         matSize = 100;
 
@@ -73,7 +74,6 @@ public class BruteForceHammingLUTDescriptorMatcherTest extends OpenCVTestCase {
                 new DMatch(1, 2, 0, 42),
                 new DMatch(2, 1, 0, 40),
                 new DMatch(3, 3, 0, 53) };
-        super.setUp();
     }
 
     public void testAdd() {

modules/java/android_test/src/org/opencv/test/features2d/BruteForceL1DescriptorMatcherTest.java

@@ -80,6 +80,7 @@ public class BruteForceL1DescriptorMatcherTest extends OpenCVTestCase {
     }
 
     protected void setUp() throws Exception {
+        super.setUp();
         matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE_L1);
         matSize = 100;
 
@@ -90,7 +91,6 @@ public class BruteForceL1DescriptorMatcherTest extends OpenCVTestCase {
                 new DMatch(3, 1, 0, 2.6545324f),
                 new DMatch(4, 0, 0, 6.1294870f)
                 };
-        super.setUp();
     }
 
     public void testAdd() {

modules/java/android_test/src/org/opencv/test/features2d/BruteForceSL2DescriptorMatcherTest.java

@@ -85,6 +85,7 @@ public class BruteForceSL2DescriptorMatcherTest extends OpenCVTestCase {
     }
 
     protected void setUp() throws Exception {
+        super.setUp();
         matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE_SL2);
         matSize = 100;
 
@@ -95,8 +96,6 @@ public class BruteForceSL2DescriptorMatcherTest extends OpenCVTestCase {
                 new DMatch(3, 1, 0, 0.23459719f),
                 new DMatch(4, 0, 0, 1.174339f)
                 };
-
-        super.setUp();
     }
 
     public void testAdd() {

modules/java/android_test/src/org/opencv/test/features2d/FASTFeatureDetectorTest.java

@@ -33,12 +33,10 @@ public class FASTFeatureDetectorTest extends OpenCVTestCase {
 
     @Override
     protected void setUp() throws Exception {
+        super.setUp();
         detector = FeatureDetector.create(FeatureDetector.FAST);
-
         truth = new KeyPoint[] { new KeyPoint(32, 27, 7, -1, 254, 0, -1), new KeyPoint(27, 32, 7, -1, 254, 0, -1), new KeyPoint(73, 68, 7, -1, 254, 0, -1),
                 new KeyPoint(68, 73, 7, -1, 254, 0, -1) };
-
-        super.setUp();
     }
 
     public void testCreate() {

modules/java/android_test/src/org/opencv/test/features2d/FlannBasedDescriptorMatcherTest.java

@@ -154,9 +154,9 @@ public class FlannBasedDescriptorMatcherTest extends OpenCVTestCase {
     }
 
     protected void setUp() throws Exception {
+        super.setUp();
         matcher = DescriptorMatcher.create(DescriptorMatcher.FLANNBASED);
         matSize = 100;
-
         truth = new DMatch[] {
                 new DMatch(0, 0, 0, 1.049694f),
                 new DMatch(1, 0, 0, 1.0984558f),
@@ -164,8 +164,6 @@ public class FlannBasedDescriptorMatcherTest extends OpenCVTestCase {
                 new DMatch(3, 1, 0, 0.48435235f),
                 new DMatch(4, 0, 0, 1.0836693f)
                 };
-
-        super.setUp();
     }
 
     public void testAdd() {

modules/java/android_test/src/org/opencv/test/features2d/ORBDescriptorExtractorTest.java

@@ -31,10 +31,9 @@ public class ORBDescriptorExtractorTest extends OpenCVTestCase {
 
     @Override
     protected void setUp() throws Exception {
+        super.setUp();
         extractor = DescriptorExtractor.create(DescriptorExtractor.ORB);
         matSize = 100;
-
-        super.setUp();
     }
 
     public void testComputeListOfMatListOfListOfKeyPointListOfMat() {
@@ -101,7 +100,9 @@ public class ORBDescriptorExtractorTest extends OpenCVTestCase {
         extractor.write(filename);
 
         String truth = "<?xml version=\"1.0\"?>\n<opencv_storage>\n<name>Feature2D.ORB</name>\n<WTA_K>2</WTA_K>\n<edgeThreshold>31</edgeThreshold>\n<firstLevel>0</firstLevel>\n<nFeatures>500</nFeatures>\n<nLevels>8</nLevels>\n<patchSize>31</patchSize>\n<scaleFactor>1.2000000476837158e+00</scaleFactor>\n<scoreType>0</scoreType>\n</opencv_storage>\n";
-        assertEquals(truth, readFile(filename));
+        String actual = readFile(filename);
+        actual = actual.replaceAll("e\\+000", "e+00"); // NOTE: workaround for different platforms double representation
+        assertEquals(truth, actual);
     }
 
     public void testWriteYml() {
@@ -110,7 +111,9 @@ public class ORBDescriptorExtractorTest extends OpenCVTestCase {
         extractor.write(filename);
 
         String truth = "%YAML:1.0\nname: \"Feature2D.ORB\"\nWTA_K: 2\nedgeThreshold: 31\nfirstLevel: 0\nnFeatures: 500\nnLevels: 8\npatchSize: 31\nscaleFactor: 1.2000000476837158e+00\nscoreType: 0\n";
-        assertEquals(truth, readFile(filename));
+        String actual = readFile(filename);
+        actual = actual.replaceAll("e\\+000", "e+00"); // NOTE: workaround for different platforms double representation
+        assertEquals(truth, actual);
     }
 
 }

modules/java/android_test/src/org/opencv/test/features2d/SIFTDescriptorExtractorTest.java

@@ -28,6 +28,7 @@ public class SIFTDescriptorExtractorTest extends OpenCVTestCase {
 
     @Override
     protected void setUp() throws Exception {
+        super.setUp();
         extractor = DescriptorExtractor.create(DescriptorExtractor.SIFT);
         keypoint = new KeyPoint(55.775577545166016f, 44.224422454833984f, 16, 9.754629f, 8617.863f, 1, -1);
         matSize = 100;
@@ -44,8 +45,6 @@ public class SIFTDescriptorExtractorTest extends OpenCVTestCase {
                    );
             }
         };
-
-        super.setUp();
     }
 
     public void testComputeListOfMatListOfListOfKeyPointListOfMat() {
@@ -88,7 +87,9 @@ public class SIFTDescriptorExtractorTest extends OpenCVTestCase {
         extractor.write(filename);
 
         String truth = "<?xml version=\"1.0\"?>\n<opencv_storage>\n<name>Feature2D.SIFT</name>\n<contrastThreshold>4.0000000000000001e-02</contrastThreshold>\n<edgeThreshold>10.</edgeThreshold>\n<nFeatures>0</nFeatures>\n<nOctaveLayers>3</nOctaveLayers>\n<sigma>1.6000000000000001e+00</sigma>\n</opencv_storage>\n";
-        assertEquals(truth, readFile(filename));
+        String actual = readFile(filename);
+        actual = actual.replaceAll("e([+-])0(\\d\\d)", "e$1$2"); // NOTE: workaround for different platforms double representation
+        assertEquals(truth, actual);
     }
 
     public void testWriteYml() {
@@ -97,7 +98,9 @@ public class SIFTDescriptorExtractorTest extends OpenCVTestCase {
         extractor.write(filename);
 
         String truth = "%YAML:1.0\nname: \"Feature2D.SIFT\"\ncontrastThreshold: 4.0000000000000001e-02\nedgeThreshold: 10.\nnFeatures: 0\nnOctaveLayers: 3\nsigma: 1.6000000000000001e+00\n";
-        assertEquals(truth, readFile(filename));
+        String actual = readFile(filename);
+        actual = actual.replaceAll("e([+-])0(\\d\\d)", "e$1$2"); // NOTE: workaround for different platforms double representation
+        assertEquals(truth, actual);
     }
 
 }

modules/java/android_test/src/org/opencv/test/features2d/STARFeatureDetectorTest.java

@@ -42,22 +42,10 @@ public class STARFeatureDetectorTest extends OpenCVTestCase {
     }
 
     protected void setUp() throws Exception {
+        super.setUp();
         detector = FeatureDetector.create(FeatureDetector.STAR);
-
         matSize = 200;
-
         truth = new KeyPoint[] {
-                /*
-                new KeyPoint(95, 80, 22, -1, 31.595734f, 0, -1),
-                new KeyPoint(105, 80, 22, -1, 31.595734f, 0, -1),
-                new KeyPoint(80, 95, 22, -1, 31.595734f, 0, -1),
-                new KeyPoint(120, 95, 22, -1, 31.595734f, 0, -1),
-                new KeyPoint(100, 100, 8, -1, -219.90825f, 0, -1),
-                new KeyPoint(80, 105, 22, -1, 31.595734f, 0, -1),
-                new KeyPoint(120, 105, 22, -1, 31.595734f, 0, -1),
-                new KeyPoint(95, 120, 22, -1, 31.595734f, 0, -1),
-                new KeyPoint(105, 120, 22, -1, 31.595734f, 0, -1)
-                */
                 new KeyPoint( 95,  80, 22, -1, 31.5957f, 0, -1),
                 new KeyPoint(105,  80, 22, -1, 31.5957f, 0, -1),
                 new KeyPoint( 80,  95, 22, -1, 31.5957f, 0, -1),
@@ -68,8 +56,6 @@ public class STARFeatureDetectorTest extends OpenCVTestCase {
                 new KeyPoint( 95, 120, 22, -1, 31.5957f, 0, -1),
                 new KeyPoint(105, 120, 22, -1, 31.5957f, 0, -1)
             };
-
-        super.setUp();
     }
 
     public void testCreate() {

modules/java/android_test/src/org/opencv/test/features2d/SURFDescriptorExtractorTest.java

@@ -26,10 +26,9 @@ public class SURFDescriptorExtractorTest extends OpenCVTestCase {
 
     @Override
     protected void setUp() throws Exception {
+        super.setUp();
         extractor = DescriptorExtractor.create(DescriptorExtractor.SURF);
         matSize = 100;
-
-        super.setUp();
     }
 
     public void testComputeListOfMatListOfListOfKeyPointListOfMat() {

modules/java/android_test/src/org/opencv/test/features2d/SURFFeatureDetectorTest.java

@@ -52,18 +52,15 @@ public class SURFFeatureDetectorTest extends OpenCVTestCase {
 
     @Override
     protected void setUp() throws Exception {
+        super.setUp();
         detector = FeatureDetector.create(FeatureDetector.SURF);
-
         matSize = 100;
-
         truth = new KeyPoint[] {
                 new KeyPoint(55.775578f, 55.775578f, 16, 80.245735f, 8617.8633f, 0, -1),
                 new KeyPoint(44.224422f, 55.775578f, 16, 170.24574f, 8617.8633f, 0, -1),
                 new KeyPoint(44.224422f, 44.224422f, 16, 260.24573f, 8617.8633f, 0, -1),
                 new KeyPoint(55.775578f, 44.224422f, 16, 350.24573f, 8617.8633f, 0, -1)
             };
-
-        super.setUp();
     }
 
     public void testCreate() {

modules/java/java_test/CMakeLists.txt

+ocv_check_dependencies(opencv_java ${OPENCV_MODULE_opencv_java_OPT_DEPS} ${OPENCV_MODULE_opencv_java_REQ_DEPS})
+
+if(NOT OCV_DEPENDENCIES_FOUND OR NOT ANT_EXECUTABLE)
+  return()
+endif()
+
+# TODO: This has the same name as the Android test project. That project should
+# probably be renamed.
+project(opencv_test_java)
+
+set(opencv_test_java_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/.build")
+
+set(android_source_dir "${CMAKE_CURRENT_SOURCE_DIR}/../android_test")
+
+set(java_source_dir ${CMAKE_CURRENT_SOURCE_DIR})
+
+# get project sources
+file(GLOB_RECURSE opencv_test_java_files RELATIVE "${android_source_dir}" "${android_source_dir}/res/*" "${android_source_dir}/src/*")
+ocv_list_filterout(opencv_test_java_files ".svn")
+ocv_list_filterout(opencv_test_java_files ".*#.*")
+# These are the files that need to be updated for pure Java.
+ocv_list_filterout(opencv_test_java_files ".*OpenCVTestCase.*")
+ocv_list_filterout(opencv_test_java_files ".*OpenCVTestRunner.*")
+# These files aren't for desktop Java.
+ocv_list_filterout(opencv_test_java_files ".*android.*")
+
+# These are files updated for pure Java.
+file(GLOB_RECURSE modified_files RELATIVE "${java_source_dir}" "${java_source_dir}/src/*")
+ocv_list_filterout(modified_files ".svn")
+ocv_list_filterout(modified_files ".*#.*")
+
+# These are extra jars needed to run the tests.
+file(GLOB_RECURSE lib_files RELATIVE "${java_source_dir}" "${java_source_dir}/lib/*")
+ocv_list_filterout(lib_files ".svn")
+ocv_list_filterout(lib_files ".*#.*")
+
+# copy sources out from the build tree
+set(opencv_test_java_file_deps "")
+foreach(f ${opencv_test_java_files})
+  add_custom_command(
+      OUTPUT "${opencv_test_java_bin_dir}/${f}"
+      COMMAND ${CMAKE_COMMAND} -E copy "${android_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}"
+      MAIN_DEPENDENCY "${android_source_dir}/${f}"
+      COMMENT "Copying ${f}")
+  list(APPEND opencv_test_java_file_deps "${android_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}")
+endforeach()
+
+# Overwrite select Android sources with Java-specific sources.
+# Also, copy over the libs we'll need for testing.
+foreach(f ${modified_files} ${lib_files})
+  add_custom_command(
+      OUTPUT "${opencv_test_java_bin_dir}/${f}"
+      COMMAND ${CMAKE_COMMAND} -E copy "${java_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}"
+      MAIN_DEPENDENCY "${java_source_dir}/${f}"
+      COMMENT "Copying ${f}")
+  list(APPEND opencv_test_java_file_deps "${java_source_dir}/${f}")
+endforeach()
+
+# Copy the OpenCV jar after it has been generated.
+add_custom_command(
+  OUTPUT "${opencv_test_java_bin_dir}/bin/${JAR_NAME}"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/bin/${JAR_NAME}" "${opencv_test_java_bin_dir}/bin/${JAR_NAME}"
+  COMMENT "Copying the OpenCV jar")
+add_custom_target(copy_opencv_jar ALL SOURCES "${opencv_test_java_bin_dir}/bin/${JAR_NAME}")
+# ${the_module} is the target for the Java jar.
+add_dependencies(copy_opencv_jar ${the_module})
+
+# Copy the ant build file.
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/build.xml" DESTINATION "${opencv_test_java_bin_dir}")
+
+# Create a script for running the Java tests and place it in build/bin.
+if(WIN32)
+  file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.cmd"   "cd ${opencv_test_java_bin_dir}\nset PATH=${EXECUTABLE_OUTPUT_PATH}/Release;%PATH%\nant -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Release buildAndTest")
+  file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java_D.cmd" "cd ${opencv_test_java_bin_dir}\nset PATH=${EXECUTABLE_OUTPUT_PATH}/Debug;%PATH%\nant   -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Debug   buildAndTest")
+else()
+  file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.sh" "cd ${opencv_test_java_bin_dir};\nant -DjavaLibraryPath=${LIBRARY_OUTPUT_PATH} buildAndTest;\ncd -")
+endif()
+
+add_custom_target(${PROJECT_NAME} ALL SOURCES ${opencv_test_java_file_deps})
+add_dependencies(opencv_tests ${PROJECT_NAME})

modules/java/java_test/build.xml

+<project>
+  <path id="master-classpath">
+    <fileset dir="lib">
+      <include name="*.jar"/>
+    </fileset>
+    <fileset dir="bin">
+      <include name="*.jar"/>
+    </fileset>
+  </path>
+
+  <target name="clean">
+    <delete dir="build"/>
+    <delete dir="testResults"/>
+  </target>
+
+  <target name="compile">
+    <mkdir dir="build/classes"/>
+
+    <javac sourcepath="" srcdir="src" destdir="build/classes" >
+      <include name="**/*.java"/>
+      <classpath refid="master-classpath"/>
+    </javac>
+  </target>
+
+  <target name="jar">
+    <mkdir dir="build/jar"/>
+    <jar destfile="build/jar/opencv-test.jar" basedir="build/classes">
+      <manifest>
+	<attribute name="Main-Class" value="org.opencv.test.OpenCVTestRunner"/>
+      </manifest>
+    </jar>
+  </target>
+
+  <target name="test">
+    <mkdir dir="testResults"/>
+    <junit printsummary="false" haltonfailure="false" haltonerror="false" showoutput="false" logfailedtests="true" maxmemory="256m">
+      <sysproperty key="java.library.path" path="${javaLibraryPath}"/>
+      <classpath refid="master-classpath"/>
+      <classpath>
+      	<pathelement location="build/classes"/>
+      </classpath>
+
+      <formatter type="xml"/>
+
+      <batchtest fork="yes" todir="testResults">
+	<zipfileset src="build/jar/opencv-test.jar" includes="**/*.class" excludes="**/OpenCVTest*">
+	 <exclude name="**/*$*.class"/>
+	</zipfileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="buildAndTest">
+    <antcall target="compile"/>
+    <antcall target="jar"/>
+    <antcall target="test"/>
+  </target>
+</project>
\ No newline at end of file

modules/java/java_test/src/org/opencv/test/OpenCVTestRunner.java

+package org.opencv.test;
+
+import java.io.File;
+import java.io.IOException;
+import junit.framework.Assert;
+
+import org.opencv.core.Mat;
+
+public class OpenCVTestRunner {
+    public static String LENA_PATH = "";
+    public static String CHESS_PATH = "";
+    public static String LBPCASCADE_FRONTALFACE_PATH = "";
+
+    private static String TAG = "opencv_test_java";
+
+
+    public static String getTempFileName(String extension)
+    {
+        if (!extension.startsWith("."))
+            extension = "." + extension;
+        try {
+            File tmp = File.createTempFile("OpenCV", extension);
+            String path = tmp.getAbsolutePath();
+            tmp.delete();
+            return path;
+        } catch (IOException e) {
+            Log("Failed to get temp file name. Exception is thrown: " + e);
+        }
+        return null;
+    }
+
+    static public void Log(String message) {
+        System.out.println(TAG + " :: " +  message);
+    }
+
+    static public void Log(Mat m) {
+        System.out.println(TAG + " :: " + m + "\n " + m.dump());
+    }
+
+    public static String getOutputFileName(String name)
+    {
+	return getTempFileName(name);
+    }
+}