updates protected code testing for gpu HOGDescriptor

diff --git a/tests/gpu/src/hog.cpp b/tests/gpu/src/hog.cpp
index 474f3bc..fd797e9 100644 (file)
--- a/tests/gpu/src/hog.cpp
+++ b/tests/gpu/src/hog.cpp
@@ -51,9 +51,9 @@ using namespace std;
     ts->set_failed_test_info(err); \\r
     return; }\r
 \r
-struct CV_GpuHogDetectionTest: public CvTest, public cv::gpu::HOGDescriptor\r
+struct CV_GpuHogDetectTestRunner: cv::gpu::HOGDescriptor\r
 {\r
-    CV_GpuHogDetectionTest(): CvTest("GPU-HOG-detect", "HOGDescriptorDetection") {}\r
+    CV_GpuHogDetectTestRunner(CvTS* ts_): ts(ts_) {}\r
 \r
     void run(int) \r
     {       \r
@@ -185,13 +185,25 @@ struct CV_GpuHogDetectionTest: public CvTest, public cv::gpu::HOGDescriptor
     std::ifstream f;\r
 #endif\r
 \r
-} gpu_hog_detection_test;\r
+    CvTS* ts;\r
+};\r
 \r
 \r
-struct CV_GpuHogGetDescriptorsTest: public CvTest, public cv::gpu::HOGDescriptor\r
+struct CV_GpuHogDetectTest: CvTest \r
 {\r
-    CV_GpuHogGetDescriptorsTest(): \r
-        CvTest("GPU-HOG-getDescriptors", "HOGDescriptorGetDescriptors"), HOGDescriptor(cv::Size(64, 128)) {}\r
+    CV_GpuHogDetectTest(): CvTest("GPU-HogDetectTest", "HOGDescriptor::detect") {}\r
+\r
+    void run(int i)\r
+    {\r
+        CV_GpuHogDetectTestRunner runner(ts);\r
+        runner.run(i);\r
+    }\r
+} CV_GpuHogDetectTest_inst;\r
+\r
+\r
+struct CV_GpuHogGetDescriptorsTestRunner: cv::gpu::HOGDescriptor\r
+{\r
+    CV_GpuHogGetDescriptorsTestRunner(CvTS* ts_): HOGDescriptor(cv::Size(64, 128)), ts(ts_) {}\r
 \r
     void run(int)\r
     {\r
@@ -303,5 +315,18 @@ struct CV_GpuHogGetDescriptorsTest: public CvTest, public cv::gpu::HOGDescriptor
     int blocks_per_win_x;\r
     int blocks_per_win_y;\r
     int block_hist_size;\r
-} gpu_hog_get_descriptors_test;\r
 \r
+    CvTS* ts;\r
+};\r
+\r
+\r
+struct CV_GpuHogGetDescriptorsTest: CvTest \r
+{\r
+    CV_GpuHogGetDescriptorsTest(): CvTest("GPU-HogGetDescriptorsTest", "HOGDescriptor::getDescriptors") {}\r
+\r
+    void run(int i)\r
+    {\r
+        CV_GpuHogGetDescriptorsTestRunner runner(ts);\r
+        runner.run(i);\r
+    }\r
+} CV_GpuHogGetDescriptorsTest_inst;
\ No newline at end of file