Java Tests: filtered VideoCapture tests

diff --git a/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java b/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
index 11f6fcb..d9fdca3 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
+++ b/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
@@ -26,7 +26,7 @@ import org.opencv.highgui.Highgui;
 public class OpenCVTestCase extends TestCase {
 
        //change to 'true' to unblock fail on fail("Not yet implemented")
-       protected static final boolean passNYI = true;
+       public static final boolean passNYI = true;
     
        protected static final int matSize = 10;
     protected static final double EPS = 0.001;

diff --git a/modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java b/modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java
index 714462a..50057a3 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java
+++ b/modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java
@@ -2,7 +2,9 @@ package org.opencv.test;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Iterator;
 
+import junit.framework.TestCase;
 import junit.framework.Assert;
 
 import org.opencv.android.Utils;
@@ -65,8 +67,19 @@ public class OpenCVTestRunner extends InstrumentationTestRunner {
          * The original idea about test order randomization is from
          * marek.defecinski blog.
          */
-        // List<TestCase> testCases = androidTestRunner.getTestCases();
-        // Collections.shuffle(testCases); //shuffle the tests order
+        //List<TestCase> testCases = androidTestRunner.getTestCases();
+        //Collections.shuffle(testCases); //shuffle the tests order
+
+        if(OpenCVTestCase.passNYI) {
+            // turn off problematic camera tests
+            Iterator<TestCase> it = androidTestRunner.getTestCases().iterator();
+            while (it.hasNext()) {
+                String name = it.next().toString();
+                if (name.contains("VideoCaptureTest"))
+                    it.remove();
+            }
+        }
+
 
         super.onStart();
     }