opencv_test package renamed to opencv.test

diff --git a/modules/java/android_test/.classpath b/modules/java/android_test/.classpath
index 927cc0b..96c151b 100644 (file)
--- a/modules/java/android_test/.classpath
+++ b/modules/java/android_test/.classpath
@@ -3,6 +3,6 @@
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="src" path="gen"/>
        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-       <classpathentry kind="src" path="OpenCVJavaAPI_src"/>
+       <classpathentry kind="src" path="OpenCV_src"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/modules/java/android_test/.project b/modules/java/android_test/.project
index 01fcaa8..15c971f 100644 (file)
--- a/modules/java/android_test/.project
+++ b/modules/java/android_test/.project
@@ -33,9 +33,9 @@
        </natures>
        <linkedResources>
                <link>
-                       <name>OpenCVJavaAPI_src</name>
+                       <name>OpenCV_src</name>
                        <type>2</type>
-                       <locationURI>_android_OpenCVJavaAPI_583dbd7b/src</locationURI>
+                       <locationURI>_android_OpenCV_8d28b05d/src</locationURI>
                </link>
        </linkedResources>
 </projectDescription>

diff --git a/modules/java/android_test/default.properties b/modules/java/android_test/default.properties
index c198130..b4a7e0f 100644 (file)
--- a/modules/java/android_test/default.properties
+++ b/modules/java/android_test/default.properties
@@ -9,4 +9,4 @@
 
 # Project target.
 target=android-8
-android.library.reference.1=../android/build
+android.library.reference.1=../../../android/build

diff --git a/modules/java/android_test/src/org/opencv_test/CoreTest.java b/modules/java/android_test/src/org/opencv_test/CoreTest.java
deleted file mode 100644 (file)
index 22c1537..0000000
--- a/modules/java/android_test/src/org/opencv_test/CoreTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.opencv_test;
-
-import org.opencv.core;
-
-
-public class CoreTest extends OpenCvTestCase {  
-        public void test_1() {
-                super.test_1("CORE");
-        }
-
-        public void test_Can_Call_add() {
-                core.add(gray128, gray128, dst);
-                assertMatEqual(gray255, dst);
-        }
-        
-        public void test_Can_Call_absdiff() {
-                core.absdiff(gray128, gray255, dst);            
-                assertMatEqual(gray127, dst);
-        }
-        
-        public void test_Can_Call_bitwise_and() {
-                core.bitwise_and(gray3, gray2, dst); 
-                assertMatEqual(gray2, dst);
-        }
-}

diff --git a/modules/java/android_test/src/org/opencv_test/ImgprocTest.java b/modules/java/android_test/src/org/opencv_test/ImgprocTest.java
deleted file mode 100644 (file)
index 152a78e..0000000
--- a/modules/java/android_test/src/org/opencv_test/ImgprocTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.opencv_test;
-
-import org.opencv.Mat;
-import org.opencv.Size;
-import org.opencv.imgproc;
-
-
-public class ImgprocTest extends OpenCvTestCase {
-        public void test_1() {
-                super.test_1("IMGPROC");
-        }
-        
-        //FIXME: this test crashes
-        //public void test_Can_Call_accumulate() {
-        //      dst = new Mat(gray1.rows(), gray1.cols(), Mat.CvType.CV_32FC1);
-        //      imgproc.accumulate(gray1, dst);
-        //      assertMatEqual(gray1, dst);
-        //}
-        
-        public void test_blur() {
-                Size sz = new Size(3, 3);
-                
-                imgproc.blur(gray0, dst, sz);
-                assertMatEqual(gray0, dst);
-                
-                imgproc.blur(gray255, dst, sz);
-                assertMatEqual(gray255, dst);
-        }
-        
-        public void test_boxFilter() {
-                Size sz = new Size(3, 3);
-                imgproc.boxFilter(gray0, dst, 8, sz);
-                assertMatEqual(gray0, dst);
-        }
-}

diff --git a/modules/java/android_test/src/org/opencv_test/MatTest.java b/modules/java/android_test/src/org/opencv_test/MatTest.java
deleted file mode 100644 (file)
index dba697f..0000000
--- a/modules/java/android_test/src/org/opencv_test/MatTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.opencv_test;
-
-import org.opencv.Mat;
-
-
-public class MatTest extends OpenCvTestCase {  
-        public void test_1() {
-                super.test_1("Mat");
-        }
-        
-        public void test_Can_Create_Gray_Mat() {
-                Mat m = new Mat(1, 1, Mat.CvType.CV_8UC1);
-            assertFalse(m.empty());
-        }
-        
-     public void test_Can_Create_RBG_Mat() {
-        Mat m = new Mat(1, 1, Mat.CvType.CV_8UC3);
-        assertFalse(m.empty());
-     }
-     
-     public void test_Can_Get_Cols() {
-        Mat m = new Mat(10, 10, Mat.CvType.CV_8UC1);
-         assertEquals(10, m.rows());
-     }
-     
-     public void test_Can_Get_Rows() {
-        Mat m = new Mat(10, 10, Mat.CvType.CV_8UC1);
-         assertEquals(10, m.rows());
-     }
-}

diff --git a/modules/java/android_test/src/org/opencv_test/OpenCvTestCase.java b/modules/java/android_test/src/org/opencv_test/OpenCvTestCase.java
deleted file mode 100644 (file)
index eacabd3..0000000
--- a/modules/java/android_test/src/org/opencv_test/OpenCvTestCase.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.opencv_test;
-
-import org.opencv.Mat;
-import org.opencv.core;
-
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-
-public class OpenCvTestCase extends AndroidTestCase {
-       
-       static String TAG = "OpenCV";
-       
-       static Mat gray0;
-       static Mat gray1;
-       static Mat gray2;
-       static Mat gray3;
-       static Mat gray127;
-       static Mat gray128;
-       static Mat gray255;
-        
-       static Mat dst;
-                
-       @Override
-       protected void setUp() throws Exception {
-           //Log.e(TAG, "setUp");                       
-           super.setUp();
-                
-               gray0   = new Mat(10, 10, Mat.CvType.CV_8UC1); gray0.setTo(0.0);
-               gray1   = new Mat(10, 10, Mat.CvType.CV_8UC1); gray1.setTo(1.0);
-               gray2   = new Mat(10, 10, Mat.CvType.CV_8UC1); gray2.setTo(2.0);
-               gray3   = new Mat(10, 10, Mat.CvType.CV_8UC1); gray3.setTo(3.0);
-               gray127 = new Mat(10, 10, Mat.CvType.CV_8UC1); gray127.setTo(127.0);
-               gray128 = new Mat(10, 10, Mat.CvType.CV_8UC1); gray128.setTo(128.0);             
-               gray255 = new Mat(10, 10, Mat.CvType.CV_8UC1); gray255.setTo(256.0);
-                
-               dst = new Mat(0, 0, Mat.CvType.CV_8UC1);
-               assertTrue(dst.empty());
-       }
-       
-       public static void assertMatEqual(Mat m1, Mat m2) {
-               assertTrue(MatDifference(m1, m2) == 0.0);
-       }
-        
-       static public double MatDifference(Mat m1, Mat m2) {
-           Mat cmp = new Mat(0, 0, Mat.CvType.CV_8UC1);
-               core.compare(m1, m2, cmp, core.CMP_EQ);
-               double num = 100.0 * (1.0 - Double.valueOf(core.countNonZero(cmp)) / Double.valueOf(cmp.rows() * cmp.cols()));
-                
-               return num;
-       }
-       
-        public void test_1(String label) {
-                Log.e(TAG, "================================================");
-                Log.e(TAG, "=============== " + label);
-                Log.e(TAG, "================================================");
-        }
-}