diff --git a/test/unit/numerics/enumeration.cpp b/test/unit/numerics/enumeration.cpp index 07813aabf..3c15993e6 100644 --- a/test/unit/numerics/enumeration.cpp +++ b/test/unit/numerics/enumeration.cpp @@ -1,36 +1,16 @@ #include "catch.hpp" #include +#include #include -namespace mapnik { - - enum _test_enumeration_enum : std::uint8_t - { - TEST_ONE, - TEST_TWO, - _test_enumeration_enum_MAX - }; - - DEFINE_ENUM( _test_enumeration_e, _test_enumeration_enum ); - - static const char * _test_enumeration_strings[] = { - "test_one", - "test_two", - "" - }; - - IMPLEMENT_ENUM( _test_enumeration_e, _test_enumeration_strings ) - -} - TEST_CASE("enumeration") { - mapnik::_test_enumeration_e e(mapnik::TEST_ONE); - CHECK( e.as_string() == "test_one" ); - // test the << operator, which calls `as_string` internally - // this is not used in mapnik, but kept for back compat + mapnik::line_cap_e e(mapnik::ROUND_CAP); + CHECK( e.as_string() == "round" ); + // note: test the << operator, which calls `as_string` internally + // is not used in mapnik, but kept for back compat std::stringstream s; s << e; - CHECK( s.str() == "test_one" ); + CHECK( s.str() == "round" ); } \ No newline at end of file