diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-12-14 20:47:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-14 20:47:48 +0100 |
| commit | e0a5800a2603db542d7189ae433e4e5d923f2831 (patch) | |
| tree | 6789b093b7fac0cc15271d5639a41302e45da67d /test/verify_test.cc | |
| parent | 09f642570122be890af01f253f4f9d5ccb996886 (diff) | |
Revert "Remove erroneous Code:: namespace from the VerificationNote enum."
This reverts commit 049a815e8b07b1f186b15f6eb4d3a6d81fecbf25.
Diffstat (limited to 'test/verify_test.cc')
| -rw-r--r-- | test/verify_test.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/test/verify_test.cc b/test/verify_test.cc index a4281004..9ac19ada 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -259,7 +259,7 @@ asset_map (int n) } static -void check_after_replace (int n, boost::function<boost::filesystem::path (int)> file, string from, string to, dcp::VerificationNote code1) +void check_after_replace (int n, boost::function<boost::filesystem::path (int)> file, string from, string to, dcp::VerificationNote::Code code1) { vector<boost::filesystem::path> directories = setup (n); @@ -277,7 +277,7 @@ void check_after_replace (int n, boost::function<boost::filesystem::path (int)> } static -void check_after_replace (int n, boost::function<boost::filesystem::path (int)> file, string from, string to, dcp::VerificationNote code1, dcp::VerificationNote code2) +void check_after_replace (int n, boost::function<boost::filesystem::path (int)> file, string from, string to, dcp::VerificationNote::Code code1, dcp::VerificationNote::Code code2) { vector<boost::filesystem::path> directories = setup (n); @@ -300,9 +300,9 @@ void check_after_replace ( int n, boost::function<boost::filesystem::path (int)> file, string from, string to, - dcp::VerificationNote code1, - dcp::VerificationNote code2, - dcp::VerificationNote code3 + dcp::VerificationNote::Code code1, + dcp::VerificationNote::Code code2, + dcp::VerificationNote::Code code3 ) { vector<boost::filesystem::path> directories = setup (n); @@ -346,7 +346,7 @@ BOOST_AUTO_TEST_CASE (verify_test6) BOOST_REQUIRE_EQUAL (notes.size(), 1); BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_ERROR); - BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::MISSING_ASSET); + BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::Code::MISSING_ASSET); } static @@ -362,7 +362,7 @@ BOOST_AUTO_TEST_CASE (verify_test7) check_after_replace ( 7, &assetmap, "<Path>video.mxf</Path>", "<Path></Path>", - dcp::VerificationNote::EMPTY_ASSET_PATH + dcp::VerificationNote::Code::EMPTY_ASSET_PATH ); } @@ -372,9 +372,9 @@ BOOST_AUTO_TEST_CASE (verify_test8) check_after_replace ( 8, &cpl, "http://www.smpte-ra.org/schemas/429-7/2006/CPL", "http://www.digicine.com/PROTO-ASDCP-CPL-20040511#", - dcp::VerificationNote::MISMATCHED_STANDARD, - dcp::VerificationNote::XML_VALIDATION_ERROR, - dcp::VerificationNote::CPL_HASH_INCORRECT + dcp::VerificationNote::Code::MISMATCHED_STANDARD, + dcp::VerificationNote::Code::XML_VALIDATION_ERROR, + dcp::VerificationNote::Code::CPL_HASH_INCORRECT ); } @@ -385,7 +385,7 @@ BOOST_AUTO_TEST_CASE (verify_test9) check_after_replace ( 9, &cpl, "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375b", "<Id>urn:uuid:81fb54df-e1bf-4647-8788-ea7ba154375", - dcp::VerificationNote::XML_VALIDATION_ERROR + dcp::VerificationNote::Code::XML_VALIDATION_ERROR ); } @@ -395,8 +395,8 @@ BOOST_AUTO_TEST_CASE (verify_test10) check_after_replace ( 10, &cpl, "<IssueDate>", "<IssueDate>x", - dcp::VerificationNote::XML_VALIDATION_ERROR, - dcp::VerificationNote::CPL_HASH_INCORRECT + dcp::VerificationNote::Code::XML_VALIDATION_ERROR, + dcp::VerificationNote::Code::CPL_HASH_INCORRECT ); } @@ -406,7 +406,7 @@ BOOST_AUTO_TEST_CASE (verify_test11) check_after_replace ( 11, &pkl, "<Id>urn:uuid:ae8", "<Id>urn:uuid:xe8", - dcp::VerificationNote::XML_VALIDATION_ERROR + dcp::VerificationNote::Code::XML_VALIDATION_ERROR ); } @@ -416,6 +416,6 @@ BOOST_AUTO_TEST_CASE (verify_test12) check_after_replace ( 12, &asset_map, "<Id>urn:uuid:74e", "<Id>urn:uuid:x4e", - dcp::VerificationNote::XML_VALIDATION_ERROR + dcp::VerificationNote::Code::XML_VALIDATION_ERROR ); } |
