Merge pull request opencv#3198 from mshabunin:java_test_fix

Author: Andrey Pavlenko

cmake/OpenCVDetectPython.cmake

@@ -233,7 +233,7 @@ find_python(3.4 "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR
     PYTHON3_NUMPY_INCLUDE_DIRS PYTHON3_NUMPY_VERSION)
 
 # Use Python 2 as default Python interpreter
-if(PYTHON2LIBS_FOUND)
+if(PYTHON2INTERP_FOUND)
     set(PYTHON_DEFAULT_AVAILABLE "TRUE")
     set(PYTHON_DEFAULT_EXECUTABLE "${PYTHON2_EXECUTABLE}")
 endif()

modules/java/CMakeLists.txt

@@ -8,7 +8,7 @@ if(IOS OR NOT PYTHON_DEFAULT_AVAILABLE OR NOT ANT_EXECUTABLE OR NOT (JNI_FOUND O
 endif()
 
 set(the_description "The java bindings")
-ocv_add_module(java BINDINGS opencv_core opencv_imgproc OPTIONAL opencv_objdetect opencv_features2d opencv_video opencv_imgcodecs opencv_videoio opencv_calib3d opencv_photo opencv_xfeatures2d)
+ocv_add_module(java BINDINGS opencv_core opencv_imgproc OPTIONAL opencv_objdetect opencv_features2d opencv_video opencv_imgcodecs opencv_videoio opencv_calib3d opencv_photo)
 ocv_module_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/generator/src/cpp")
 
 if(NOT ANDROID)

modules/java/android_test/CMakeLists.txt

@@ -11,6 +11,8 @@ set(opencv_test_java_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/.build")
 # get project sources
 file(GLOB_RECURSE opencv_test_java_files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/res/*" "${CMAKE_CURRENT_SOURCE_DIR}/src/*")
 ocv_list_filterout(opencv_test_java_files ".svn")
+# opencv_ml is broken
+ocv_list_filterout(opencv_test_java_files "/ml/")
 
 # copy sources out from the build tree
 set(opencv_test_java_file_deps "")

modules/java/android_test/src/org/opencv/test/calib3d/Calib3dTest.java

@@ -11,6 +11,7 @@
 import org.opencv.core.Scalar;
 import org.opencv.core.Size;
 import org.opencv.test.OpenCVTestCase;
+import org.opencv.imgproc.Imgproc;
 
 public class Calib3dTest extends OpenCVTestCase {
 
@@ -162,7 +163,7 @@ public void testEstimateAffine3DMatMatMatMatDoubleDouble() {
     public void testFilterSpecklesMatDoubleIntDouble() {
         gray_16s_1024.copyTo(dst);
         Point center = new Point(gray_16s_1024.rows() / 2., gray_16s_1024.cols() / 2.);
-        Core.circle(dst, center, 1, Scalar.all(4096));
+        Imgproc.circle(dst, center, 1, Scalar.all(4096));
 
         assertMatNotEqual(gray_16s_1024, dst);
         Calib3d.filterSpeckles(dst, 1024.0, 100, 0.);
@@ -199,7 +200,7 @@ public void testFindCirclesGridMatSizeMat() {
         for (int i = 0; i < 5; i++)
             for (int j = 0; j < 5; j++) {
                 Point pt = new Point(size * (2 * i + 1) / 10, size * (2 * j + 1) / 10);
-                Core.circle(img, pt, 10, new Scalar(0), -1);
+                Imgproc.circle(img, pt, 10, new Scalar(0), -1);
             }
 
         assertTrue(Calib3d.findCirclesGrid(img, new Size(5, 5), centers));
@@ -224,7 +225,7 @@ public void testFindCirclesGridMatSizeMatInt() {
         for (int i = 0; i < 3; i++)
             for (int j = 0; j < 5; j++) {
                 Point pt = new Point(offsetx + (2 * i + j % 2) * step, offsety + step * j);
-                Core.circle(img, pt, 10, new Scalar(0), -1);
+                Imgproc.circle(img, pt, 10, new Scalar(0), -1);
             }
 
         assertTrue(Calib3d.findCirclesGrid(img, new Size(3, 5), centers, Calib3d.CALIB_CB_CLUSTERING

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

@@ -19,6 +19,7 @@
 import org.opencv.core.Size;
 import org.opencv.core.TermCriteria;
 import org.opencv.test.OpenCVTestCase;
+import org.opencv.imgproc.Imgproc;
 
 public class CoreTest extends OpenCVTestCase {
 
@@ -455,12 +456,12 @@ public void testFillConvexPolyMatListOfPointScalarIntInt() {
         // current implementation of fixed-point version of fillConvexPoly
         // requires image to be at least 2-pixel wider in each direction than
         // contour
-        Imgproc.fillConvexPoly(gray0, polyline1, colorWhite, Imgproc.line_8, 0);
+        Imgproc.fillConvexPoly(gray0, polyline1, colorWhite, Imgproc.LINE_8, 0);
 
         assertTrue(0 < Core.countNonZero(gray0));
         assertTrue(gray0.total() > Core.countNonZero(gray0));
 
-        Imgproc.fillConvexPoly(gray0, polyline2, colorBlack, Imgproc.line_8, 1);
+        Imgproc.fillConvexPoly(gray0, polyline2, colorBlack, Imgproc.LINE_8, 1);
 
         assertEquals("see http://code.opencv.org/issues/1284", 0, Core.countNonZero(gray0));
     }
@@ -503,11 +504,11 @@ public void testFillPolyMatListOfListOfPointScalarIntIntPoint() {
         List<MatOfPoint> polylines2 = new ArrayList<MatOfPoint>();
         polylines2.add(polyline2);
 
-        Imgproc.fillPoly(gray0, polylines1, new Scalar(1), Imgproc.line_8, 0, new Point(0, 0));
+        Imgproc.fillPoly(gray0, polylines1, new Scalar(1), Imgproc.LINE_8, 0, new Point(0, 0));
 
         assertTrue(0 < Core.countNonZero(gray0));
 
-        Imgproc.fillPoly(gray0, polylines2, new Scalar(0), Imgproc.line_8, 0, new Point(1, 1));
+        Imgproc.fillPoly(gray0, polylines2, new Scalar(0), Imgproc.LINE_8, 0, new Point(1, 1));
 
         assertEquals(0, Core.countNonZero(gray0));
     }
@@ -877,11 +878,11 @@ public void testLineMatPointPointScalarIntIntInt() {
         Point point1_4 = new Point(3 * 4, 4 * 4);
         Point point2_4 = new Point(nPoints * 4, nPoints * 4);
 
-        Imgproc.line(gray0, point2, point1, colorWhite, 2, Imgproc.line_8, 0);
+        Imgproc.line(gray0, point2, point1, colorWhite, 2, Imgproc.LINE_8, 0);
 
         assertFalse(0 == Core.countNonZero(gray0));
 
-        Imgproc.line(gray0, point2_4, point1_4, colorBlack, 2, Imgproc.line_8, 2);
+        Imgproc.line(gray0, point2_4, point1_4, colorBlack, 2, Imgproc.LINE_8, 2);
 
         assertEquals(0, Core.countNonZero(gray0));
     }
@@ -1616,8 +1617,8 @@ public void testRectangleMatPointPointScalarIntInt() {
         Point topLeft = new Point(0, 0);
         Scalar color = new Scalar(128);
 
-        Imgproc.rectangle(gray0, bottomRight, topLeft, color, 2, Imgproc.line_AA, 0);
-        Imgproc.rectangle(gray0, bottomRight, topLeft, colorBlack, 2, Imgproc.line_4, 0);
+        Imgproc.rectangle(gray0, bottomRight, topLeft, color, 2, Imgproc.LINE_AA, 0);
+        Imgproc.rectangle(gray0, bottomRight, topLeft, colorBlack, 2, Imgproc.LINE_4, 0);
 
         assertTrue(0 != Core.countNonZero(gray0));
     }
@@ -1628,11 +1629,11 @@ public void testRectangleMatPointPointScalarIntIntInt() {
         Point topLeft = new Point(0, 0);
         Scalar color = new Scalar(128);
 
-        Imgproc.rectangle(gray0, bottomRight1, topLeft, color, 2, Imgproc.line_8, 1);
+        Imgproc.rectangle(gray0, bottomRight1, topLeft, color, 2, Imgproc.LINE_8, 1);
 
         assertTrue(0 != Core.countNonZero(gray0));
 
-        Imgproc.rectangle(gray0, bottomRight2, topLeft, colorBlack, 2, Imgproc.line_8, 0);
+        Imgproc.rectangle(gray0, bottomRight2, topLeft, colorBlack, 2, Imgproc.LINE_8, 0);
 
         assertEquals(0, Core.countNonZero(gray0));
     }

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

@@ -10,6 +10,7 @@
 import org.opencv.core.KeyPoint;
 import org.opencv.test.OpenCVTestCase;
 import org.opencv.test.OpenCVTestRunner;
+import org.opencv.imgproc.Imgproc;
 
 public class BRIEFDescriptorExtractorTest extends OpenCVTestCase {
 

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

@@ -18,6 +18,7 @@
 import org.opencv.core.KeyPoint;
 import org.opencv.test.OpenCVTestCase;
 import org.opencv.test.OpenCVTestRunner;
+import org.opencv.imgproc.Imgproc;
 
 public class BruteForceDescriptorMatcherTest extends OpenCVTestCase {
 

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

@@ -17,6 +17,7 @@
 import org.opencv.features2d.FeatureDetector;
 import org.opencv.test.OpenCVTestCase;
 import org.opencv.test.OpenCVTestRunner;
+import org.opencv.imgproc.Imgproc;
 
 public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase {
 

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

@@ -16,6 +16,7 @@
 import org.opencv.features2d.FeatureDetector;
 import org.opencv.test.OpenCVTestCase;
 import org.opencv.test.OpenCVTestRunner;
+import org.opencv.imgproc.Imgproc;
 
 public class BruteForceHammingLUTDescriptorMatcherTest extends OpenCVTestCase {
 

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

@@ -17,6 +17,7 @@
 import org.opencv.core.KeyPoint;
 import org.opencv.test.OpenCVTestCase;
 import org.opencv.test.OpenCVTestRunner;
+import org.opencv.imgproc.Imgproc;
 
 public class BruteForceL1DescriptorMatcherTest extends OpenCVTestCase {