diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-14 22:13:31 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-14 22:16:07 +0000 |
| commit | e2a4e0f08c9e8cc82fb20f1cd358897fae46c9ee (patch) | |
| tree | e936e7abbaeb3a07806499f194861525752ab25f /test/kdm_test.cc | |
| parent | 4a5ef0b4dc6310c5eb7a35fb1c79541bf856b9a8 (diff) | |
Use a bool instead of an int for disable-forensic-picture and
a optional<int> instead of an int with a magic -1 for
disable-forensic-audio.
Diffstat (limited to 'test/kdm_test.cc')
| -rw-r--r-- | test/kdm_test.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/test/kdm_test.cc b/test/kdm_test.cc index 76a7457c..53aabd87 100644 --- a/test/kdm_test.cc +++ b/test/kdm_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> This file is part of libdcp. @@ -31,6 +31,7 @@ using std::list; using std::string; using std::vector; using boost::shared_ptr; +using boost::optional; /** Check reading and decryption of a KDM */ BOOST_AUTO_TEST_CASE (kdm_test) @@ -132,7 +133,7 @@ BOOST_AUTO_TEST_CASE (kdm_key_type_scope) } static cxml::ConstNodePtr -kdm_forensic_test (cxml::Document& doc, int picture, int audio) +kdm_forensic_test (cxml::Document& doc, bool picture, optional<int> audio) { dcp::DecryptedKDM decrypted ( dcp::EncryptedKDM ( @@ -163,7 +164,7 @@ kdm_forensic_test (cxml::Document& doc, int picture, int audio) BOOST_AUTO_TEST_CASE (kdm_forensic_test1) { cxml::Document doc; - cxml::ConstNodePtr forensic = kdm_forensic_test(doc, -1, -1); + cxml::ConstNodePtr forensic = kdm_forensic_test(doc, true, 0); BOOST_REQUIRE (forensic); list<cxml::NodePtr> flags = forensic->node_children("ForensicMarkFlag"); BOOST_REQUIRE_EQUAL (flags.size(), 2); @@ -175,7 +176,7 @@ BOOST_AUTO_TEST_CASE (kdm_forensic_test1) BOOST_AUTO_TEST_CASE (kdm_forensic_test2) { cxml::Document doc; - cxml::ConstNodePtr forensic = kdm_forensic_test(doc, -1, 0); + cxml::ConstNodePtr forensic = kdm_forensic_test(doc, true, optional<int>()); BOOST_REQUIRE (forensic); list<cxml::NodePtr> flags = forensic->node_children("ForensicMarkFlag"); BOOST_REQUIRE_EQUAL (flags.size(), 1); @@ -186,7 +187,7 @@ BOOST_AUTO_TEST_CASE (kdm_forensic_test2) BOOST_AUTO_TEST_CASE (kdm_forensic_test3) { cxml::Document doc; - cxml::ConstNodePtr forensic = kdm_forensic_test(doc, 0, -1); + cxml::ConstNodePtr forensic = kdm_forensic_test(doc, false, 0); BOOST_REQUIRE (forensic); list<cxml::NodePtr> flags = forensic->node_children("ForensicMarkFlag"); BOOST_REQUIRE_EQUAL (flags.size(), 1); @@ -197,7 +198,7 @@ BOOST_AUTO_TEST_CASE (kdm_forensic_test3) BOOST_AUTO_TEST_CASE (kdm_forensic_test4) { cxml::Document doc; - cxml::ConstNodePtr forensic = kdm_forensic_test(doc, -1, 3); + cxml::ConstNodePtr forensic = kdm_forensic_test(doc, true, 3); BOOST_REQUIRE (forensic); list<cxml::NodePtr> flags = forensic->node_children("ForensicMarkFlag"); BOOST_REQUIRE_EQUAL (flags.size(), 2); @@ -209,6 +210,6 @@ BOOST_AUTO_TEST_CASE (kdm_forensic_test4) BOOST_AUTO_TEST_CASE (kdm_forensic_test5) { cxml::Document doc; - cxml::ConstNodePtr forensic = kdm_forensic_test(doc, 0, 0); + cxml::ConstNodePtr forensic = kdm_forensic_test(doc, false, optional<int>()); BOOST_CHECK (!forensic); } |