Java API: fixing more tests

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DENSEFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DENSEFeatureDetectorTest.java
index a5e7be5..cced3c8 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/DENSEFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DENSEFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class DENSEFeatureDetectorTest extends TestCase {\r
+public class DENSEFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicDENSEFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicDENSEFeatureDetectorTest.java
index bd1a7a5..56bb041 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicDENSEFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicDENSEFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class DynamicDENSEFeatureDetectorTest extends TestCase {\r
+public class DynamicDENSEFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicFASTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicFASTFeatureDetectorTest.java
index 770d4a5..3b40f04 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicFASTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicFASTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class DynamicFASTFeatureDetectorTest extends TestCase {\r
+public class DynamicFASTFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicGFTTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicGFTTFeatureDetectorTest.java
index 83194bf..70718c4 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicGFTTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicGFTTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class DynamicGFTTFeatureDetectorTest extends TestCase {\r
+public class DynamicGFTTFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicHARRISFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicHARRISFeatureDetectorTest.java
index 51fb0fb..22c6c29 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicHARRISFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicHARRISFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class DynamicHARRISFeatureDetectorTest extends TestCase {\r
+public class DynamicHARRISFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicMSERFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicMSERFeatureDetectorTest.java
index 202807c..ea9af1b 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicMSERFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicMSERFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class DynamicMSERFeatureDetectorTest extends TestCase {\r
+public class DynamicMSERFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicORBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicORBFeatureDetectorTest.java
index a0f1ab8..c20e678 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicORBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicORBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class DynamicORBFeatureDetectorTest extends TestCase {\r
+public class DynamicORBFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIFTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIFTFeatureDetectorTest.java
index 56f5a7c..087e3df 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIFTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIFTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class DynamicSIFTFeatureDetectorTest extends TestCase {\r
+public class DynamicSIFTFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIMPLEBLOBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIMPLEBLOBFeatureDetectorTest.java
index 942124e..7de2dbe 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIMPLEBLOBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSIMPLEBLOBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class DynamicSIMPLEBLOBFeatureDetectorTest extends TestCase {\r
+public class DynamicSIMPLEBLOBFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSTARFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSTARFeatureDetectorTest.java
index d4e687f..5dca31a 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSTARFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSTARFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class DynamicSTARFeatureDetectorTest extends TestCase {\r
+public class DynamicSTARFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSURFFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSURFFeatureDetectorTest.java
index 34a767c..d83fa7c 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/DynamicSURFFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/DynamicSURFFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class DynamicSURFFeatureDetectorTest extends TestCase {\r
+public class DynamicSURFFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GFTTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GFTTFeatureDetectorTest.java
index 09661c6..98b3a83 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/GFTTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GFTTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class GFTTFeatureDetectorTest extends TestCase {\r
+public class GFTTFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridDENSEFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridDENSEFeatureDetectorTest.java
index 056d893..3a3200f 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridDENSEFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridDENSEFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class GridDENSEFeatureDetectorTest extends TestCase {\r
+public class GridDENSEFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridFASTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridFASTFeatureDetectorTest.java
index c4c6959..c826ef8 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridFASTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridFASTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class GridFASTFeatureDetectorTest extends TestCase {\r
+public class GridFASTFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridGFTTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridGFTTFeatureDetectorTest.java
index 9181f97..a64da49 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridGFTTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridGFTTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class GridGFTTFeatureDetectorTest extends TestCase {\r
+public class GridGFTTFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridHARRISFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridHARRISFeatureDetectorTest.java
index 86c7677..7bbc57f 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridHARRISFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridHARRISFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class GridHARRISFeatureDetectorTest extends TestCase {\r
+public class GridHARRISFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridMSERFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridMSERFeatureDetectorTest.java
index c761049..656c835 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridMSERFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridMSERFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class GridMSERFeatureDetectorTest extends TestCase {\r
+public class GridMSERFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridORBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridORBFeatureDetectorTest.java
index c987333..53f419d 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridORBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridORBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class GridORBFeatureDetectorTest extends TestCase {\r
+public class GridORBFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridSIFTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridSIFTFeatureDetectorTest.java
index 46d2a08..d44881d 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridSIFTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridSIFTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class GridSIFTFeatureDetectorTest extends TestCase {\r
+public class GridSIFTFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridSIMPLEBLOBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridSIMPLEBLOBFeatureDetectorTest.java
index 62a5dd3..b493235 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridSIMPLEBLOBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridSIMPLEBLOBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class GridSIMPLEBLOBFeatureDetectorTest extends TestCase {\r
+public class GridSIMPLEBLOBFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridSTARFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridSTARFeatureDetectorTest.java
index d78dc24..36b99de 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridSTARFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridSTARFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class GridSTARFeatureDetectorTest extends TestCase {\r
+public class GridSTARFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/GridSURFFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/GridSURFFeatureDetectorTest.java
index 012d825..cc5a823 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/GridSURFFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/GridSURFFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class GridSURFFeatureDetectorTest extends TestCase {\r
+public class GridSURFFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/HARRISFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/HARRISFeatureDetectorTest.java
index 5e7fd7d..d8acb1f 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/HARRISFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/HARRISFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class HARRISFeatureDetectorTest extends TestCase {\r
+public class HARRISFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/MSERFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/MSERFeatureDetectorTest.java
index 98ae4d7..9655f1d 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/MSERFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/MSERFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class MSERFeatureDetectorTest extends TestCase {\r
+public class MSERFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/ORBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/ORBFeatureDetectorTest.java
index b4c23d8..eedcc21 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/ORBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/ORBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class ORBFeatureDetectorTest extends TestCase {\r
+public class ORBFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/OpponentBRIEFDescriptorExtractorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/OpponentBRIEFDescriptorExtractorTest.java
index b158124..ade2f7d 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/OpponentBRIEFDescriptorExtractorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/OpponentBRIEFDescriptorExtractorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class OpponentBRIEFDescriptorExtractorTest extends TestCase {\r
+public class OpponentBRIEFDescriptorExtractorTest extends OpenCVTestCase {\r
 \r
     public void testComputeListOfMatListOfListOfKeyPointListOfMat() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/OpponentORBDescriptorExtractorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/OpponentORBDescriptorExtractorTest.java
index 1ee5432..88e2d9f 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/OpponentORBDescriptorExtractorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/OpponentORBDescriptorExtractorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class OpponentORBDescriptorExtractorTest extends TestCase {\r
+public class OpponentORBDescriptorExtractorTest extends OpenCVTestCase {\r
 \r
     public void testComputeListOfMatListOfListOfKeyPointListOfMat() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/OpponentSIFTDescriptorExtractorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/OpponentSIFTDescriptorExtractorTest.java
index de20c14..d473ad6 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/OpponentSIFTDescriptorExtractorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/OpponentSIFTDescriptorExtractorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class OpponentSIFTDescriptorExtractorTest extends TestCase {\r
+public class OpponentSIFTDescriptorExtractorTest extends OpenCVTestCase {\r
 \r
     public void testComputeListOfMatListOfListOfKeyPointListOfMat() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/OpponentSURFDescriptorExtractorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/OpponentSURFDescriptorExtractorTest.java
index e427128..db18095 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/OpponentSURFDescriptorExtractorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/OpponentSURFDescriptorExtractorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class OpponentSURFDescriptorExtractorTest extends TestCase {\r
+public class OpponentSURFDescriptorExtractorTest extends OpenCVTestCase {\r
 \r
     public void testComputeListOfMatListOfListOfKeyPointListOfMat() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidDENSEFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidDENSEFeatureDetectorTest.java
index cadabed..5862f22 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidDENSEFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidDENSEFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class PyramidDENSEFeatureDetectorTest extends TestCase {\r
+public class PyramidDENSEFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidFASTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidFASTFeatureDetectorTest.java
index 5527940..8c2f4ed 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidFASTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidFASTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class PyramidFASTFeatureDetectorTest extends TestCase {\r
+public class PyramidFASTFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidGFTTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidGFTTFeatureDetectorTest.java
index 13c45f1..de529ea 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidGFTTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidGFTTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class PyramidGFTTFeatureDetectorTest extends TestCase {\r
+public class PyramidGFTTFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidHARRISFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidHARRISFeatureDetectorTest.java
index 94ef841..d287803 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidHARRISFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidHARRISFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class PyramidHARRISFeatureDetectorTest extends TestCase {\r
+public class PyramidHARRISFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidMSERFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidMSERFeatureDetectorTest.java
index c8891f7..61f5593 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidMSERFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidMSERFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class PyramidMSERFeatureDetectorTest extends TestCase {\r
+public class PyramidMSERFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidORBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidORBFeatureDetectorTest.java
index a507e51..056601d 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidORBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidORBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class PyramidORBFeatureDetectorTest extends TestCase {\r
+public class PyramidORBFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIFTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIFTFeatureDetectorTest.java
index 27aa5f6..922845e 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIFTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIFTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class PyramidSIFTFeatureDetectorTest extends TestCase {\r
+public class PyramidSIFTFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIMPLEBLOBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIMPLEBLOBFeatureDetectorTest.java
index 9f640f0..2581876 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIMPLEBLOBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSIMPLEBLOBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class PyramidSIMPLEBLOBFeatureDetectorTest extends TestCase {\r
+public class PyramidSIMPLEBLOBFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSTARFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSTARFeatureDetectorTest.java
index ea82636..121235b 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSTARFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSTARFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class PyramidSTARFeatureDetectorTest extends TestCase {\r
+public class PyramidSTARFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSURFFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSURFFeatureDetectorTest.java
index d212d0e..4fe70ed 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/PyramidSURFFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/PyramidSURFFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class PyramidSURFFeatureDetectorTest extends TestCase {\r
+public class PyramidSURFFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/SIFTFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/SIFTFeatureDetectorTest.java
index dc381ca..6b02d7b 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/SIFTFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/SIFTFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class SIFTFeatureDetectorTest extends TestCase {\r
+public class SIFTFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/features2d/SIMPLEBLOBFeatureDetectorTest.java b/modules/java/android_test/src/org/opencv/test/features2d/SIMPLEBLOBFeatureDetectorTest.java
index c27f8c3..98aca45 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/features2d/SIMPLEBLOBFeatureDetectorTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/SIMPLEBLOBFeatureDetectorTest.java
@@ -1,8 +1,8 @@
 package org.opencv.test.features2d;\r
 \r
-import junit.framework.TestCase;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-public class SIMPLEBLOBFeatureDetectorTest extends TestCase {\r
+public class SIMPLEBLOBFeatureDetectorTest extends OpenCVTestCase {\r
 \r
     public void testCreate() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLPTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLPTest.java
index 709b631..f046d2d 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLPTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLPTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvANN_MLP;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvANN_MLPTest extends TestCase {\r
+public class CvANN_MLPTest extends OpenCVTestCase {\r
 \r
     public void testClear() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLP_TrainParamsTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLP_TrainParamsTest.java
index dd4a8f3..7c5beca 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLP_TrainParamsTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvANN_MLP_TrainParamsTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvANN_MLP_TrainParams;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvANN_MLP_TrainParamsTest extends TestCase {\r
+public class CvANN_MLP_TrainParamsTest extends OpenCVTestCase {\r
 \r
     public void testCvANN_MLP_TrainParams() {\r
         new CvANN_MLP_TrainParams();\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvBoostParamsTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvBoostParamsTest.java
index 3d815bc..6cd9205 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvBoostParamsTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvBoostParamsTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvBoostParams;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvBoostParamsTest extends TestCase {\r
+public class CvBoostParamsTest extends OpenCVTestCase {\r
 \r
     public void testCvBoostParams() {\r
         new CvBoostParams();\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvBoostTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvBoostTest.java
index 466d64a..9895c95 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvBoostTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvBoostTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvBoost;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvBoostTest extends TestCase {\r
+public class CvBoostTest extends OpenCVTestCase {\r
 \r
     public void testClear() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvDTreeParamsTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvDTreeParamsTest.java
index e767aae..c7bbda0 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvDTreeParamsTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvDTreeParamsTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvDTreeParams;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvDTreeParamsTest extends TestCase {\r
+public class CvDTreeParamsTest extends OpenCVTestCase {\r
 \r
     public void testCvDTreeParams() {\r
         new CvDTreeParams();\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvDTreeTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvDTreeTest.java
index f6a5baa..df6da72 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvDTreeTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvDTreeTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvDTree;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvDTreeTest extends TestCase {\r
+public class CvDTreeTest extends OpenCVTestCase {\r
 \r
     public void testClear() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvERTreesTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvERTreesTest.java
index 0a59dfe..9b5e645 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvERTreesTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvERTreesTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvERTrees;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvERTreesTest extends TestCase {\r
+public class CvERTreesTest extends OpenCVTestCase {\r
 \r
     public void testCvERTrees() {\r
         new CvERTrees();\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesParamsTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesParamsTest.java
index ca266d1..ff6b54e 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesParamsTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesParamsTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvGBTreesParams;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvGBTreesParamsTest extends TestCase {\r
+public class CvGBTreesParamsTest extends OpenCVTestCase {\r
 \r
     public void testCvGBTreesParams() {\r
         new CvGBTreesParams();\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesTest.java
index 2bbb38d..e45b4ed 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvGBTreesTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvGBTrees;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvGBTreesTest extends TestCase {\r
+public class CvGBTreesTest extends OpenCVTestCase {\r
 \r
     public void testClear() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvKNearestTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvKNearestTest.java
index 1f7bd37..46a2ca5 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvKNearestTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvKNearestTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvKNearest;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvKNearestTest extends TestCase {\r
+public class CvKNearestTest extends OpenCVTestCase {\r
 \r
     public void testCvKNearest() {\r
         new CvKNearest();\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvNormalBayesClassifierTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvNormalBayesClassifierTest.java
index d184a79..ca818cd 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvNormalBayesClassifierTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvNormalBayesClassifierTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvNormalBayesClassifier;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvNormalBayesClassifierTest extends TestCase {\r
+public class CvNormalBayesClassifierTest extends OpenCVTestCase {\r
 \r
     public void testClear() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvParamGridTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvParamGridTest.java
index 39334d1..09a1304 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvParamGridTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvParamGridTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvParamGrid;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvParamGridTest extends TestCase {\r
+public class CvParamGridTest extends OpenCVTestCase {\r
 \r
     public void testCvParamGrid() {\r
         new CvParamGrid();\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvRTParamsTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvRTParamsTest.java
index fb12e9a..2b7ca4a 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvRTParamsTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvRTParamsTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvRTParams;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvRTParamsTest extends TestCase {\r
+public class CvRTParamsTest extends OpenCVTestCase {\r
 \r
     public void testCvRTParams() {\r
         new CvRTParams();\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvRTreesTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvRTreesTest.java
index dcb88ef..d98a279 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvRTreesTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvRTreesTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvRTrees;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvRTreesTest extends TestCase {\r
+public class CvRTreesTest extends OpenCVTestCase {\r
 \r
     public void testClear() {\r
         fail("Not yet implemented");\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvSVMParamsTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvSVMParamsTest.java
index a1b4c92..c59f1ac 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvSVMParamsTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvSVMParamsTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvSVMParams;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvSVMParamsTest extends TestCase {\r
+public class CvSVMParamsTest extends OpenCVTestCase {\r
 \r
     public void testCvSVMParams() {\r
         new CvSVMParams();\r

diff --git a/modules/java/android_test/src/org/opencv/test/ml/CvSVMTest.java b/modules/java/android_test/src/org/opencv/test/ml/CvSVMTest.java
index 4982ee8..7ea7dc3 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/ml/CvSVMTest.java
+++ b/modules/java/android_test/src/org/opencv/test/ml/CvSVMTest.java
@@ -1,10 +1,9 @@
 package org.opencv.test.ml;\r
 \r
 import org.opencv.ml.CvSVM;\r
+import org.opencv.test.OpenCVTestCase;\r
 \r
-import junit.framework.TestCase;\r
-\r
-public class CvSVMTest extends TestCase {\r
+public class CvSVMTest extends OpenCVTestCase {\r
 \r
     public void testClear() {\r
         fail("Not yet implemented");\r