refactor: Move RGB to HSL tests to color_convert_rgb.cpp

boostorg · Jun 25, 2022 · 57c616d · 57c616d
1 parent d50d856
commit 57c616d
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 32 deletions.
diff --git a/test/extension/toolbox/Jamfile b/test/extension/toolbox/Jamfile
@@ -25,6 +25,7 @@ run color_convert_hsl.cpp ;
 run color_convert_hsv.cpp ;
 run color_convert_lab.cpp ;
 run color_convert_luminance.cpp ;
+run color_convert_rgb.cpp ;
 run color_convert_xyz.cpp ;
 run indexed_image.cpp ;
 

diff --git a/test/extension/toolbox/color_convert_hsl.cpp b/test/extension/toolbox/color_convert_hsl.cpp
@@ -17,18 +17,7 @@
 
 namespace gil = boost::gil;
 
-void test_rgb_to_hsl()
-{
-    gil::rgb8_pixel_t p{128, 0, 128};
-    gil::hsl32f_pixel_t h;
-    gil::color_convert(p, h);
-
-    BOOST_TEST_GT(gil::get_color(h, gil::hsl_color_space::hue_t()), 0.8);        // 0.83333331
-    BOOST_TEST_EQ(gil::get_color(h, gil::hsl_color_space::saturation_t()), 1.0); // 1.00000000
-    BOOST_TEST_GT(gil::get_color(h, gil::hsl_color_space::lightness_t()), 0.25); // 0.25098040
-}
-
-void test_hsl_to_rgb()
+void test_basic_hsl_to_rgb()
 {
     gil::rgb8_pixel_t p(64, 0, 64);
     gil::hsl32f_pixel_t h;
@@ -59,29 +48,10 @@ void test_image_assign_hsl()
     }
 }
 
-void test_copy_pixels_rgb_to_hsl()
-{
-    gil::rgb8_image_t rgb_img(320, 240);
-    gil::rgb8_pixel_t rgb_pix(64, 32, 64);
-    gil::fill_pixels(view(rgb_img), rgb_pix);
-    gil::hsl32f_image_t hsl_img(view(rgb_img).dimensions());
-    gil::copy_pixels(gil::color_converted_view<gil::hsl32f_pixel_t>(view(rgb_img)), view(hsl_img));
-
-    auto view = gil::view(hsl_img);
-    for (auto it = view.begin(), end = view.end(); it != end; ++it)
-    {
-        gil::rgb8_pixel_t p;
-        gil::color_convert(*it, p);
-        BOOST_TEST_EQ(p, rgb_pix);
-    }
-}
-
 int main()
 {
-    test_rgb_to_hsl();
-    test_hsl_to_rgb();
+    test_basic_hsl_to_rgb();
     test_image_assign_hsl();
-    test_copy_pixels_rgb_to_hsl();
 
     return ::boost::report_errors();
 }
diff --git a/test/extension/toolbox/color_convert_rgb.cpp b/test/extension/toolbox/color_convert_rgb.cpp
@@ -0,0 +1,56 @@
+//
+// Copyright 2013 Christian Henning
+// Copyright 2020 Mateusz Loskot <[email protected]>
+//
+// Distributed under the Boost Software License, Version 1.0
+// See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt
+//
+#include <boost/gil.hpp>
+#include <boost/gil/extension/toolbox/color_spaces/hsl.hpp>
+
+#include <boost/core/lightweight_test.hpp>
+
+#include <cstdint>
+#include <tuple>
+
+#include "test_utility_with_tolerance.hpp"
+
+namespace gil = boost::gil;
+
+
+void test_basic_rgb_to_hsl()
+{
+    gil::rgb8_pixel_t p{128, 0, 128};
+    gil::hsl32f_pixel_t h;
+    gil::color_convert(p, h);
+
+    BOOST_TEST_GT(gil::get_color(h, gil::hsl_color_space::hue_t()), 0.8);         // 0.83333331
+    BOOST_TEST_EQ(gil::get_color(h, gil::hsl_color_space::saturation_t()), 1.0);  // 1.00000000
+    BOOST_TEST_GT(gil::get_color(h, gil::hsl_color_space::lightness_t()), 0.25);  // 0.25098040
+}
+
+void test_copy_pixels_rgb_to_hsl()
+{
+    gil::rgb8_image_t rgb_img(320, 240);
+    gil::rgb8_pixel_t rgb_pix(64, 32, 64);
+    gil::fill_pixels(view(rgb_img), rgb_pix);
+    gil::hsl32f_image_t hsl_img(view(rgb_img).dimensions());
+    gil::copy_pixels(gil::color_converted_view<gil::hsl32f_pixel_t>(view(rgb_img)), view(hsl_img));
+
+    auto view = gil::view(hsl_img);
+    for (auto it = view.begin(), end = view.end(); it != end; ++it)
+    {
+        gil::rgb8_pixel_t p;
+        gil::color_convert(*it, p);
+        BOOST_TEST_EQ(p, rgb_pix);
+    }
+}
+
+int main()
+{
+    test_basic_rgb_to_hsl();
+    test_copy_pixels_rgb_to_hsl();
+
+    return ::boost::report_errors();
+}