moved failed tests to blacklists

filter-generic - ticket 690
mhi-global - ticket 457

fixed issue 689

diff --git a/tests/cv/src/detectors_test.cpp b/tests/cv/src/detectors_test.cpp
index 15d7777..e714fc8 100644 (file)
--- a/tests/cv/src/detectors_test.cpp
+++ b/tests/cv/src/detectors_test.cpp
@@ -60,7 +60,7 @@ public:
     ~CV_DetectorsTest();    \r
 protected:    \r
     void run(int);  \r
-    template <class T> bool testDedector(const Mat& img, const T& detector, vector<KeyPoint>& expected);\r
+    template <class T> bool testDetector(const Mat& img, const T& detector, vector<KeyPoint>& expected);\r
 \r
     void LoadExpected(const string& file, vector<KeyPoint>& out);\r
 };\r
@@ -153,7 +153,7 @@ struct WrapPoint
 \r
 struct sortByR { bool operator()(const KeyPoint& kp1, const KeyPoint& kp2) { return norm(kp1.pt) < norm(kp2.pt); } };\r
 \r
-template <class T> bool CV_DetectorsTest::testDedector(const Mat& img, const T& detector, vector<KeyPoint>& exp)\r
+template <class T> bool CV_DetectorsTest::testDetector(const Mat& img, const T& detector, vector<KeyPoint>& exp)\r
 {\r
     vector<KeyPoint> orig_kpts;\r
     detector(img, orig_kpts);\r
@@ -205,7 +205,13 @@ template <class T> bool CV_DetectorsTest::testDedector(const Mat& img, const T&
     }\r
 \r
     sort(result.begin(), result.end(), sortByR());\r
-    sort(exp.begin(), exp.end(), sortByR());    \r
+    sort(exp.begin(), exp.end(), sortByR());\r
+\r
+    if (result.size() != exp.size())\r
+    {\r
+      ts->set_failed_test_info(CvTS::FAIL_INVALID_TEST_DATA);\r
+      return false;\r
+    }\r
 \r
     int foundCounter1 = 0;\r
     for(size_t i = 0; i < exp.size(); ++i)\r
@@ -292,14 +298,14 @@ void CV_DetectorsTest::run( int /*start_from*/ )
     if (exp.empty())\r
         return;\r
 \r
-    if (!testDedector(to_test, SurfNoMaskWrap(SURF(1536+512+512, 2)), exp))\r
+    if (!testDetector(to_test, SurfNoMaskWrap(SURF(1536+512+512, 2)), exp))\r
         return;\r
     \r
     LoadExpected(string(ts->get_data_path()) + "detectors/star.xml", exp);\r
     if (exp.empty())\r
         return;\r
 \r
-    if (!testDedector(to_test, StarDetector(45, 30, 10, 8, 5), exp))\r
+    if (!testDetector(to_test, StarDetector(45, 30, 10, 8, 5), exp))\r
         return;\r
 \r
     ts->set_failed_test_info( CvTS::OK);                  \r

diff --git a/tests/cv/src/tsysa.cpp b/tests/cv/src/tsysa.cpp
index fdc4de7..b6e1c6a 100644 (file)
--- a/tests/cv/src/tsysa.cpp
+++ b/tests/cv/src/tsysa.cpp
@@ -47,13 +47,9 @@ const char* blacklist[] =
 {
     "calibrate-camera-artificial",    //ticket 472
     "inpaint",                        //ticket 570
-    //"optflow-estimate-rigid",         //ticket 433
-    //"subdiv",                         //ticket 454
     "warp-resize",                    //ticket 429
-    //"warp-affine",                    //ticket 572
-    //"warp-perspective",               //ticket 575
-    //"_3d-fundam",                     //ticket 434
-    //"posit",                          //ticket 430
+    "filter-generic",                 //ticket 690
+    "mhi-global",                     //ticket 457
     0
 };