update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / libs / gil / test / core / channel / algorithm_channel_relation.cpp

diff --git a/ceph/src/boost/libs/gil/test/core/channel/algorithm_channel_relation.cpp b/ceph/src/boost/libs/gil/test/core/channel/algorithm_channel_relation.cpp
index be3bd2d3e42ad8621dafa0289581cac6ee34a8fb..bad3a1d4bc52124c40594882b945fedce073be80 100644 (file)
--- a/ceph/src/boost/libs/gil/test/core/channel/algorithm_channel_relation.cpp
+++ b/ceph/src/boost/libs/gil/test/core/channel/algorithm_channel_relation.cpp
@@ -1,6 +1,6 @@
 //
 // Copyright 2005-2007 Adobe Systems Incorporated
-// Copyright 2018 Mateusz Loskot <mateusz at loskot dot net>
+// Copyright 2018-2020 Mateusz Loskot <mateusz at loskot dot net>
 //
 // Distributed under the Boost Software License, Version 1.0
 // See accompanying file LICENSE_1_0.txt or copy at
@@ -8,8 +8,10 @@
 //
 #include <boost/gil/channel_algorithm.hpp>
 
-#define BOOST_TEST_MODULE test_algorithm_channel_relation
-#include "unit_test.hpp"
+#include <boost/core/lightweight_test.hpp>
+
+#include <cstdint>
+
 #include "test_fixture.hpp"
 
 namespace gil = boost::gil;
@@ -23,44 +25,103 @@ void test_channel_relation()
     channel_value_t const one = 1;
 
     fixture_t f;
-    BOOST_TEST(f.min_v_ <= f.max_v_);
-    BOOST_TEST(f.max_v_ >= f.min_v_);
-    BOOST_TEST(f.min_v_ < f.max_v_);
-    BOOST_TEST(f.max_v_ > f.min_v_);
-    BOOST_TEST(f.max_v_ != f.min_v_);
-    BOOST_TEST(f.min_v_ == f.min_v_);
-    BOOST_TEST(f.min_v_ != one); // comparable to integral
+    BOOST_TEST_LE(f.min_v_, f.max_v_);
+    BOOST_TEST_GE(f.max_v_, f.min_v_);
+    BOOST_TEST_LT(f.min_v_, f.max_v_);
+    BOOST_TEST_GT(f.max_v_, f.min_v_);
+    BOOST_TEST_NE(f.max_v_, f.min_v_);
+    BOOST_TEST_EQ(f.min_v_, f.min_v_);
+    BOOST_TEST_NE(f.min_v_, one); // comparable to integral
 }
 
-BOOST_AUTO_TEST_CASE_TEMPLATE(channel_value, Channel, fixture::channel_byte_types)
+struct test_channel_value
 {
-    using fixture_t = fixture::channel_value<Channel>;
-    test_channel_relation<fixture_t>();
-}
+    template <typename Channel>
+    void operator()(Channel const &)
+    {
+        using channel_t = Channel;
+        using fixture_t = fixture::channel_value<channel_t>;
+        test_channel_relation<fixture_t>();
+    }
+    static void run()
+    {
+        boost::mp11::mp_for_each<fixture::channel_byte_types>(test_channel_value{});
+    }
+};
 
-BOOST_AUTO_TEST_CASE_TEMPLATE(channel_reference, Channel, fixture::channel_byte_types)
+struct test_channel_reference
 {
-    using fixture_t = fixture::channel_reference<Channel&>;
-    test_channel_relation<fixture_t>();
-}
+    template <typename Channel>
+    void operator()(Channel const &)
+    {
+        using channel_t = Channel;
+        using fixture_t = fixture::channel_reference<channel_t&>;
+        test_channel_relation<fixture_t>();
+    }
+    static void run()
+    {
+        boost::mp11::mp_for_each<fixture::channel_byte_types>(test_channel_reference{});
+    }
+};
 
-BOOST_AUTO_TEST_CASE_TEMPLATE(channel_reference_const, Channel, fixture::channel_byte_types)
+struct test_channel_reference_const
 {
-    using fixture_t = fixture::channel_reference<Channel const&>;
-    test_channel_relation<fixture_t>();
-}
+    template <typename Channel>
+    void operator()(Channel const &)
+    {
+        using channel_t = Channel;
+        using fixture_t = fixture::channel_reference<channel_t const&>;
+        test_channel_relation<fixture_t>();
+    }
+    static void run()
+    {
+        boost::mp11::mp_for_each<fixture::channel_byte_types>(test_channel_reference_const{});
+    }
+};
 
-BOOST_AUTO_TEST_CASE_TEMPLATE(packed_channel_reference, BitField, fixture::channel_bitfield_types)
+struct test_packed_channel_reference
 {
-    using channels565_t = fixture::packed_channels565<BitField>;
-    test_channel_relation<typename channels565_t::fixture_0_5_t>();
-    test_channel_relation<typename channels565_t::fixture_5_6_t >();
-    test_channel_relation<typename channels565_t::fixture_11_5_t>();
-}
+    template <typename BitField>
+    void operator()(BitField const &)
+    {
+        using bitfield_t = BitField;
+        using channels565_t = fixture::packed_channels565<bitfield_t>;
+        test_channel_relation<typename channels565_t::fixture_0_5_t>();
+        test_channel_relation<typename channels565_t::fixture_5_6_t>();
+        test_channel_relation<typename channels565_t::fixture_11_5_t>();
+    }
+    static void run()
+    {
+        boost::mp11::mp_for_each<fixture::channel_bitfield_types>(test_packed_channel_reference{});
+    }
+};
+
+struct test_packed_dynamic_channel_reference
+{
+    template <typename BitField>
+    void operator()(BitField const &)
+    {
+        using bitfield_t = BitField;
+        using channels565_t = fixture::packed_dynamic_channels565<bitfield_t>;
+        test_channel_relation<typename channels565_t::fixture_5_t>();
+        test_channel_relation<typename channels565_t::fixture_6_t>();
+    }
+    static void run()
+    {
+        boost::mp11::mp_for_each<fixture::channel_bitfield_types>(test_packed_dynamic_channel_reference{});
+    }
+};
 
-BOOST_AUTO_TEST_CASE_TEMPLATE(packed_dynamic_channel_reference, BitField, fixture::channel_bitfield_types)
+int main()
 {
-    using channels565_t = fixture::packed_dynamic_channels565<BitField>;
-    test_channel_relation<typename channels565_t::fixture_5_t>();
-    test_channel_relation<typename channels565_t::fixture_6_t>();
+    test_channel_value::run();
+    test_channel_reference::run();
+    test_channel_reference_const::run();
+    test_packed_channel_reference::run();
+    test_packed_dynamic_channel_reference::run();
+
+    // TODO: packed_channel_reference_const ?
+    // TODO: packed_dynamic_channel_reference_const ?
+
+    return ::boost::report_errors();
 }