Removed OS conditions from highgui tests

diff --git a/modules/highgui/test/test_framecount.cpp b/modules/highgui/test/test_framecount.cpp
index cdf0590..095fe31 100644 (file)
--- a/modules/highgui/test/test_framecount.cpp
+++ b/modules/highgui/test/test_framecount.cpp
@@ -55,9 +55,6 @@ public:
 
 void CV_FramecountTest::run(int)
 {
-#if defined WIN32 || (defined __linux__ && !defined ANDROID)
-#if !defined HAVE_GSTREAMER || defined HAVE_GSTREAMER_APP
-
     const int time_sec = 5, fps = 25;
 
     const string ext[] = {"avi", "mov", "mp4", "mpg", "wmv"};
@@ -126,9 +123,6 @@ void CV_FramecountTest::run(int)
 
     ts->printf(cvtest::TS::LOG, "\nSuccessfull experiments: %d (%d%%)\n", n-failed, (n - failed)*100/n);
     ts->printf(cvtest::TS::LOG, "Failed experiments: %d (%d%%)\n", failed, failed*100/n);
-
-#endif
-#endif
 }
 
 TEST(HighguiFramecount, regression) {CV_FramecountTest test; test.safe_run();}

diff --git a/modules/highgui/test/test_positioning.cpp b/modules/highgui/test/test_positioning.cpp
index 358145a..249dce3 100644 (file)
--- a/modules/highgui/test/test_positioning.cpp
+++ b/modules/highgui/test/test_positioning.cpp
@@ -209,24 +209,12 @@ void CV_VideoPositioningTest::run_test(int method)
 
 void CV_VideoProgressivePositioningTest::run(int) 
 {
-#if defined WIN32 || (defined __linux__ && !defined ANDROID)
-#if !defined HAVE_GSTREAMER || defined HAVE_GSTREAMER_APP
-
        run_test(PROGRESSIVE);
-
-#endif
-#endif
 }
 
 void CV_VideoRandomPositioningTest::run(int)
 {
-#if defined WIN32 || (defined __linux__ && !defined ANDROID)
-#if !defined HAVE_GSTREAMER || defined HAVE_GSTREAMER_APP
-
        run_test(RANDOM);
-
-#endif
-#endif
 }
 
 TEST (HighguiPositioning, progressive) { CV_VideoProgressivePositioningTest test; test.safe_run(); }

diff --git a/modules/highgui/test/test_video_io.cpp b/modules/highgui/test/test_video_io.cpp
index 029361e..f39f523 100644 (file)
--- a/modules/highgui/test/test_video_io.cpp
+++ b/modules/highgui/test/test_video_io.cpp
@@ -633,9 +633,6 @@ void CV_SpecificImageTest::run(int)
 
 void CV_VideoTest::run(int)
 {
-#if defined WIN32 || (defined __linux__ && !defined ANDROID)
-#if !defined HAVE_GSTREAMER || defined HAVE_GSTREAMER_APP
-
     const char codecs[][4] = { {'I', 'Y', 'U', 'V'},
                                {'X', 'V', 'I', 'D'},
                                {'M', 'P', 'G', '2'},
@@ -649,16 +646,10 @@ void CV_VideoTest::run(int)
     {
         VideoTest(ts->get_data_path(), CV_FOURCC(codecs[i][0], codecs[i][1], codecs[i][2], codecs[i][3]));
     }
-
-#endif
-#endif
 }
 
 void CV_SpecificVideoFileTest::run(int)
 {
-#if defined WIN32 || (defined __linux__ && !defined ANDROID)
-#if !defined HAVE_GSTREAMER || defined HAVE_GSTREAMER_APP
-
     const char codecs[][4] = { {'M', 'P', 'G', '2'},
                                {'X', 'V', 'I', 'D'},
                                {'M', 'J', 'P', 'G'},
@@ -670,16 +661,10 @@ void CV_SpecificVideoFileTest::run(int)
     {
         SpecificVideoFileTest(ts->get_data_path(), codecs[i]);
     }
-
-#endif
-#endif
 }
 
 void CV_SpecificVideoCameraTest::run(int)
 {
-#if defined WIN32 || (defined __linux__ && !defined ANDROID)
-#if !defined HAVE_GSTREAMER || defined HAVE_GSTREAMER_APP
-
     const char codecs[][4] = { {'M', 'P', 'G', '2'},
                                {'X', 'V', 'I', 'D'},
                                {'M', 'J', 'P', 'G'},
@@ -691,9 +676,6 @@ void CV_SpecificVideoCameraTest::run(int)
     {
         SpecificVideoCameraTest(ts->get_data_path(), codecs[i]);
     }
-
-#endif
-#endif
 }
 
 TEST(Highgui_Image, regression) { CV_ImageTest test; test.safe_run(); }