update source to Ceph Pacific 16.2.2

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

diff --git a/ceph/src/boost/libs/gil/test/core/channel/algorithm_channel_arithmetic.cpp b/ceph/src/boost/libs/gil/test/core/channel/algorithm_channel_arithmetic.cpp
index 5eaecddf1c357883f24ef55c68375527c7e0e2b5..ef8ec658c08d82f107f63cf1fe45586785014c59 100644 (file)
--- a/ceph/src/boost/libs/gil/test/core/channel/algorithm_channel_arithmetic.cpp
+++ b/ceph/src/boost/libs/gil/test/core/channel/algorithm_channel_arithmetic.cpp
@@ -1,18 +1,20 @@
 //
 // 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
 // http://www.boost.org/LICENSE_1_0.txt
 //
 #include <boost/gil/channel_algorithm.hpp>
+
+#include <boost/core/lightweight_test.hpp>
+
 #include <type_traits>
 #include <utility>
 
-#define BOOST_TEST_MODULE test_algorithm_channel_arithmetic
-#include "unit_test.hpp"
 #include "test_fixture.hpp"
+#include "test_utility_output_stream.hpp"
 
 namespace gil = boost::gil;
 namespace fixture = boost::gil::test::fixture;
@@ -33,30 +35,30 @@ void test_channel_arithmetic_mutable(std::true_type)
     f.min_v_++;
     --f.min_v_;
     f.min_v_--;
-    BOOST_TEST(v == f.min_v_);
+    BOOST_TEST_EQ(v, f.min_v_);
 
     f.min_v_ += one;
     f.min_v_ -= one;
-    BOOST_TEST(v == f.min_v_);
+    BOOST_TEST_EQ(v, f.min_v_);
 
     f.min_v_ *= one;
     f.min_v_ /= one;
-    BOOST_TEST(v == f.min_v_);
+    BOOST_TEST_EQ(v, f.min_v_);
 
     f.min_v_ = one; // assignable to scalar
-    BOOST_TEST(f.min_v_ == one);
+    BOOST_TEST_EQ(f.min_v_, one);
     f.min_v_ = v; // and to value type
-    BOOST_TEST(f.min_v_ == v);
+    BOOST_TEST_EQ(f.min_v_, v);
 
     // test swap
     channel_value_t v1 = f.min_v_;
     channel_value_t v2 = f.max_v_;
     std::swap(f.min_v_, f.max_v_);
-    BOOST_TEST(f.min_v_ > f.max_v_);
+    BOOST_TEST_GT(f.min_v_, f.max_v_);
     channel_value_t v3 = f.min_v_;
     channel_value_t v4 = f.max_v_;
-    BOOST_TEST(v1 == v4);
-    BOOST_TEST(v2 == v3);
+    BOOST_TEST_EQ(v1, v4);
+    BOOST_TEST_EQ(v2, v3);
 }
 
 template <typename ChannelFixtureBase>
@@ -64,10 +66,10 @@ void test_channel_arithmetic()
 {
     using fixture_t = fixture::channel<ChannelFixtureBase>;
     fixture_t f;
-    BOOST_TEST(f.min_v_ * 1 == f.min_v_);
-    BOOST_TEST(f.min_v_ / 1 == f.min_v_);
-    BOOST_TEST((f.min_v_ + 1) + 1 == f.min_v_ + 2);
-    BOOST_TEST((f.max_v_ - 1) - 1 == f.max_v_ - 2);
+    BOOST_TEST_EQ(f.min_v_ * 1, f.min_v_);
+    BOOST_TEST_EQ(f.min_v_ / 1, f.min_v_);
+    BOOST_TEST_EQ((f.min_v_ + 1) + 1, f.min_v_ + 2);
+    BOOST_TEST_EQ((f.max_v_ - 1) - 1, f.max_v_ - 2);
 
     using is_mutable_t = std::integral_constant
         <
@@ -77,38 +79,92 @@ void test_channel_arithmetic()
     test_channel_arithmetic_mutable<ChannelFixtureBase>(is_mutable_t{});
 }
 
-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_arithmetic<fixture_t>();
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(channel_reference, Channel, fixture::channel_byte_types)
+    template <typename Channel>
+    void operator()(Channel const &)
+    {
+        using channel_t = Channel;
+        using fixture_t = fixture::channel_value<channel_t>;
+        test_channel_arithmetic<fixture_t>();
+    }
+    static void run()
+    {
+        boost::mp11::mp_for_each<fixture::channel_byte_types>(test_channel_value{});
+    }
+};
+
+struct test_channel_reference
 {
-    using fixture_t = fixture::channel_reference<Channel&>;
-    test_channel_arithmetic<fixture_t>();
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(
-    channel_reference_const, Channel, fixture::channel_byte_types)
+    template <typename Channel>
+    void operator()(Channel const &)
+    {
+        using channel_t = Channel;
+        using fixture_t = fixture::channel_reference<channel_t &>;
+        test_channel_arithmetic<fixture_t>();
+    }
+    static void run()
+    {
+        boost::mp11::mp_for_each<fixture::channel_byte_types>(test_channel_reference{});
+    }
+};
+
+struct test_channel_reference_const
 {
-    using fixture_t = fixture::channel_reference<Channel const&>;
-    test_channel_arithmetic<fixture_t>();
-}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE(
-    packed_channel_reference, BitField, fixture::channel_bitfield_types)
+    template <typename Channel>
+    void operator()(Channel const &)
+    {
+        using channel_t = Channel;
+        using fixture_t = fixture::channel_reference<channel_t const &>;
+        test_channel_arithmetic<fixture_t>();
+    }
+    static void run()
+    {
+        boost::mp11::mp_for_each<fixture::channel_byte_types>(test_channel_reference_const{});
+    }
+};
+
+struct test_packed_channel_reference
+{
+    template <typename BitField>
+    void operator()(BitField const &)
+    {
+        using bitfield_t = BitField;
+        using channels565_t = fixture::packed_channels565<bitfield_t>;
+        test_channel_arithmetic<typename channels565_t::fixture_0_5_t>();
+        test_channel_arithmetic<typename channels565_t::fixture_5_6_t>();
+        test_channel_arithmetic<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
 {
-    using channels565_t = fixture::packed_channels565<BitField>;
-    test_channel_arithmetic<typename channels565_t::fixture_0_5_t>();
-    test_channel_arithmetic<typename channels565_t::fixture_5_6_t >();
-    test_channel_arithmetic<typename channels565_t::fixture_11_5_t>();
-}
 
-BOOST_AUTO_TEST_CASE_TEMPLATE(
-    packed_dynamic_channel_reference, BitField, fixture::channel_bitfield_types)
+    template <typename BitField>
+    void operator()(BitField const &)
+    {
+        using bitfield_t = BitField;
+        using channels565_t = fixture::packed_dynamic_channels565<bitfield_t>;
+        test_channel_arithmetic<typename channels565_t::fixture_5_t>();
+        test_channel_arithmetic<typename channels565_t::fixture_6_t>();
+    }
+    static void run()
+    {
+        boost::mp11::mp_for_each<fixture::channel_bitfield_types>(test_packed_dynamic_channel_reference{});
+    }
+};
+
+int main()
 {
-    using channels565_t = fixture::packed_dynamic_channels565<BitField>;
-    test_channel_arithmetic<typename channels565_t::fixture_5_t>();
-    test_channel_arithmetic<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();
+
+    return ::boost::report_errors();
 }