fix bugs in tests, set device for each test case

Signed-off-by: yao <bitwangyaoyao@gmail.com>

modules/ocl/test/test_blend.cpp

@@ -33,7 +33,7 @@ void blendLinearGold(const cv::Mat& img1, const cv::Mat& img2, const cv::Mat& we
 
 PARAM_TEST_CASE(Blend, cv::Size, MatType/*, UseRoi*/)
 {
-    //cv::gpu::DeviceInfo devInfo;
+    std::vector<cv::ocl::Info> oclinfo;
     cv::Size size;
     int type;
     bool useRoi;
@@ -45,7 +45,8 @@ PARAM_TEST_CASE(Blend, cv::Size, MatType/*, UseRoi*/)
         type = GET_PARAM(1);
         /*useRoi = GET_PARAM(3);*/
 
-        //cv::gpu::setDevice(devInfo.deviceID());
+        int devnums = getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE);
+        CV_Assert(devnums > 0);
     }
 };
 

modules/ocl/test/test_columnsum.cpp

@@ -60,11 +60,14 @@ PARAM_TEST_CASE(ColumnSum, cv::Size, bool )
     cv::Size size;
     cv::Mat src;
 	bool useRoi;
+	std::vector<cv::ocl::Info> oclinfo;
 
     virtual void SetUp()
     {
         size = GET_PARAM(0);
 		useRoi = GET_PARAM(1);
+        int devnums = getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE);
+        CV_Assert(devnums > 0);
     }
 };
 

modules/ocl/test/test_match_template.cpp

@@ -60,6 +60,7 @@ PARAM_TEST_CASE(MatchTemplate8U, cv::Size, TemplateSize, Channels, TemplateMetho
     cv::Size templ_size;
     int cn;
     int method;
+	std::vector<cv::ocl::Info> oclinfo;
 
     virtual void SetUp()
     {
@@ -67,6 +68,8 @@ PARAM_TEST_CASE(MatchTemplate8U, cv::Size, TemplateSize, Channels, TemplateMetho
         templ_size = GET_PARAM(1);
         cn = GET_PARAM(2);
         method = GET_PARAM(3);
+        int devnums = getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE);
+        CV_Assert(devnums > 0);
     }
 };
 
@@ -109,6 +112,7 @@ PARAM_TEST_CASE(MatchTemplate32F, cv::Size, TemplateSize, Channels, TemplateMeth
     cv::Size templ_size;
     int cn;
     int method;
+	std::vector<cv::ocl::Info> oclinfo;
 
     virtual void SetUp()
     {
@@ -116,6 +120,8 @@ PARAM_TEST_CASE(MatchTemplate32F, cv::Size, TemplateSize, Channels, TemplateMeth
         templ_size = GET_PARAM(1);
         cn = GET_PARAM(2);
         method = GET_PARAM(3);
+        int devnums = getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE);
+        CV_Assert(devnums > 0);
     }
 };
 

modules/ocl/test/test_pyrdown.cpp

@@ -119,8 +119,8 @@ PARAM_TEST_CASE(PyrDown, MatType, bool)
 
         val = cv::Scalar(rng.uniform(-10.0, 10.0), rng.uniform(-10.0, 10.0), rng.uniform(-10.0, 10.0), rng.uniform(-10.0, 10.0));
 
-        //int devnums = getDevice(oclinfo);
-        //CV_Assert(devnums > 0);
+        int devnums = getDevice(oclinfo);
+        CV_Assert(devnums > 0);
         //if you want to use undefault device, set it here
         //setDevice(oclinfo[0]);
     }

modules/ocl/test/test_pyrup.cpp

@@ -49,22 +49,16 @@
 #ifdef HAVE_OPENCL
 
 
-
-
-
-
-
-
-
-
-
 PARAM_TEST_CASE(PyrUp,cv::Size,int)
 {
 	cv::Size size;
 	int type;
+	std::vector<cv::ocl::Info> oclinfo;
 
 	virtual void SetUp()
 	{
+		int devnums = cv::ocl::getDevice(oclinfo, OPENCV_DEFAULT_OPENCL_DEVICE);
+		CV_Assert(devnums > 0);
 		size = GET_PARAM(0);
 		type = GET_PARAM(1);
 	}