Update test_fld.cpp

Author: sturkmen72

modules/ximgproc/test/test_fld.cpp

@@ -7,7 +7,7 @@ namespace opencv_test { namespace {
 
 const Size img_size(320, 240);
 const int FLD_TEST_SEED = 0x134679;
-const int EPOCHS = 10;
+const int EPOCHS = 5;
 
 class FLDBase : public testing::Test
 {
@@ -44,6 +44,7 @@ class ximgproc_ED: public FLDBase
         {
             detector = createEdgeDrawing();
         }
+        string filename = cvtest::TS::ptr()->get_data_path() + "cv/imgproc/beads.jpg";
     protected:
         Ptr<EdgeDrawing> detector;
 
@@ -275,16 +276,18 @@ TEST_F(ximgproc_ED, rotatedRect)
     ASSERT_EQ(EPOCHS, passedtests);
 }
 
-TEST_F(ximgproc_ED, ManySmallCircles)
+TEST_F(ximgproc_ED, detectLinesAndEllipses)
 {
-    string picture_name = "cv/imgproc/beads.jpg";
+    Mat gray_image;
+    vector<Vec6d> ellipses;
 
-    string filename = cvtest::TS::ptr()->get_data_path() + picture_name;
-    test_image = imread(filename, IMREAD_GRAYSCALE);
+    test_image = imread(filename);
     EXPECT_FALSE(test_image.empty()) << "Invalid test image: " << filename;
 
-    vector<Vec6d> ellipses;
-    detector->detectEdges(test_image);
+    cvtColor(test_image, test_image, COLOR_BGR2BGRA);
+    cvtColor(test_image, gray_image, COLOR_BGR2GRAY);
+
+    detector->detectEdges(gray_image);
     detector->detectEllipses(ellipses);
     detector->detectLines(lines);
 
@@ -295,50 +298,30 @@ TEST_F(ximgproc_ED, ManySmallCircles)
     EXPECT_GE(lines.size(), lines_size);
     EXPECT_LE(lines.size(), lines_size + 2);
     EXPECT_EQ(ellipses.size(), ellipses_size);
-}
-
-TEST_F(ximgproc_ED, ManySmallCirclesPF)
-{
-    string picture_name = "cv/imgproc/beads.jpg";
-
-    string filename = cvtest::TS::ptr()->get_data_path() + picture_name;
-    test_image = imread(filename, IMREAD_GRAYSCALE);
-    EXPECT_FALSE(test_image.empty()) << "Invalid test image: " << filename;
 
     detector->params.PFmode = true;
-    vector<Vec6d> ellipses;
-    detector->detectEdges(test_image);
+
+    detector->detectEdges(gray_image);
     detector->detectEllipses(ellipses);
     detector->detectLines(lines);
 
-    size_t segments_size = 2717;
-    size_t lines_size = 6197;
-    size_t ellipses_size = 2446;
+    segments_size = 2717;
+    lines_size = 6197;
+    ellipses_size = 2446;
     EXPECT_EQ(detector->getSegments().size(), segments_size);
     EXPECT_GE(lines.size(), lines_size);
     EXPECT_LE(lines.size(), lines_size + 2);
     EXPECT_EQ(ellipses.size(), ellipses_size);
-}
-
-TEST_F(ximgproc_ED, ManySmallCirclesColor)
-{
-    string picture_name = "cv/imgproc/beads.jpg";
-
-    string filename = cvtest::TS::ptr()->get_data_path() + picture_name;
-    test_image = imread(filename);
-    EXPECT_FALSE(test_image.empty()) << "Invalid test image: " << filename;
-
-    cvtColor(test_image, test_image, COLOR_BGR2BGRA);
 
     detector->params.MinLineLength = 10;
-    vector<Vec6d> ellipses;
+
     detector->detectEdges(test_image);
     detector->detectEllipses(ellipses);
     detector->detectLines(lines);
     detector->detectEllipses(ellipses);
-    size_t segments_size = 6230;
-    size_t lines_size = 11133;
-    size_t ellipses_size = 2431;
+    segments_size = 6230;
+    lines_size = 11133;
+    ellipses_size = 2431;
     EXPECT_EQ(detector->getSegments().size(), segments_size);
     EXPECT_GE(lines.size(), lines_size);
     EXPECT_LE(lines.size(), lines_size + 2);