diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-09-02 22:43:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-09-02 22:43:19 +0200 |
| commit | d9b957d7da123e4b6e5f2449f5d45c12fce225f8 (patch) | |
| tree | 46fb87683ff357aff3b886a5e6201a9bb390d3a9 /test | |
| parent | feff11732f33487a5bec6fb568f43f86c1a0ab0b (diff) | |
Replace ContentKind enum with a class.
Diffstat (limited to 'test')
| -rw-r--r-- | test/stream_operators.cc | 2 | ||||
| -rw-r--r-- | test/stream_operators.h | 1 | ||||
| -rw-r--r-- | test/util_test.cc | 26 |
3 files changed, 15 insertions, 14 deletions
diff --git a/test/stream_operators.cc b/test/stream_operators.cc index 5e4f88e6..20470c1d 100644 --- a/test/stream_operators.cc +++ b/test/stream_operators.cc @@ -81,7 +81,7 @@ dcp::operator<< (std::ostream& s, Effect e) ostream& dcp::operator<< (ostream& s, ContentKind c) { - s << content_kind_to_string(c); + s << c.name(); return s; } diff --git a/test/stream_operators.h b/test/stream_operators.h index 691e3daa..d51fa007 100644 --- a/test/stream_operators.h +++ b/test/stream_operators.h @@ -32,6 +32,7 @@ */ +#include "content_kind.h" #include "rating.h" #include "types.h" #include "verify.h" diff --git a/test/util_test.cc b/test/util_test.cc index 8ca7df44..c31d1d2b 100644 --- a/test/util_test.cc +++ b/test/util_test.cc @@ -73,21 +73,21 @@ BOOST_AUTO_TEST_CASE (base64_decode_test) } } -/** Test dcp::content_kind_from_string */ +/** Test ContentKind::from_name */ BOOST_AUTO_TEST_CASE (content_kind_test) { - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("feature"), dcp::ContentKind::FEATURE); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Feature"), dcp::ContentKind::FEATURE); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("FeaturE"), dcp::ContentKind::FEATURE); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("Short"), dcp::ContentKind::SHORT); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("trailer"), dcp::ContentKind::TRAILER); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("test"), dcp::ContentKind::TEST); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("transitional"), dcp::ContentKind::TRANSITIONAL); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("rating"), dcp::ContentKind::RATING); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("teaser"), dcp::ContentKind::TEASER); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("policy"), dcp::ContentKind::POLICY); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("psa"), dcp::ContentKind::PUBLIC_SERVICE_ANNOUNCEMENT); - BOOST_CHECK_EQUAL (dcp::content_kind_from_string ("advertisement"), dcp::ContentKind::ADVERTISEMENT); + BOOST_CHECK_EQUAL(dcp::ContentKind::from_name("feature"), dcp::ContentKind::FEATURE); + BOOST_CHECK_EQUAL(dcp::ContentKind::from_name("Feature"), dcp::ContentKind::FEATURE); + BOOST_CHECK_EQUAL(dcp::ContentKind::from_name("FeaturE"), dcp::ContentKind::FEATURE); + BOOST_CHECK_EQUAL(dcp::ContentKind::from_name("Short"), dcp::ContentKind::SHORT); + BOOST_CHECK_EQUAL(dcp::ContentKind::from_name("trailer"), dcp::ContentKind::TRAILER); + BOOST_CHECK_EQUAL(dcp::ContentKind::from_name("test"), dcp::ContentKind::TEST); + BOOST_CHECK_EQUAL(dcp::ContentKind::from_name("transitional"), dcp::ContentKind::TRANSITIONAL); + BOOST_CHECK_EQUAL(dcp::ContentKind::from_name("rating"), dcp::ContentKind::RATING); + BOOST_CHECK_EQUAL(dcp::ContentKind::from_name("teaser"), dcp::ContentKind::TEASER); + BOOST_CHECK_EQUAL(dcp::ContentKind::from_name("policy"), dcp::ContentKind::POLICY); + BOOST_CHECK_EQUAL(dcp::ContentKind::from_name("psa"), dcp::ContentKind::PUBLIC_SERVICE_ANNOUNCEMENT); + BOOST_CHECK_EQUAL(dcp::ContentKind::from_name("advertisement"), dcp::ContentKind::ADVERTISEMENT); } /** Test dcp::relative_to_root */ |