diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-12-06 10:47:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-22 01:21:00 +0100 |
| commit | 30dfa051113792305f9704d5a76ffaf57c21063d (patch) | |
| tree | 4a4055b40bfb64ebf5b7509ef81a104db4a52e46 /test | |
| parent | 9cb23adda9ebe6a76992b68db78ccb638348dac1 (diff) | |
Use VerificationNote for non-fatal errors in DCP::read.
Diffstat (limited to 'test')
| -rw-r--r-- | test/exception_test.cc | 3 | ||||
| -rw-r--r-- | test/rewrite_subs.cc | 2 | ||||
| -rw-r--r-- | test/verify_test.cc | 10 |
3 files changed, 4 insertions, 11 deletions
diff --git a/test/exception_test.cc b/test/exception_test.cc index 2ae6cdca..43b1d021 100644 --- a/test/exception_test.cc +++ b/test/exception_test.cc @@ -43,7 +43,4 @@ BOOST_AUTO_TEST_CASE (exception_test) BOOST_CHECK_EQUAL (string (dcp::UnresolvedRefError ("foo").what()), "Unresolved reference to asset id foo"); BOOST_CHECK_EQUAL (string (dcp::NotEncryptedError ("foo").what()), "foo is not encrypted"); BOOST_CHECK_EQUAL (string (dcp::ProgrammingError ("foo", 42).what()), "Programming error at foo:42"); - BOOST_CHECK_EQUAL (string (dcp::MissingAssetError ("foo", dcp::MissingAssetError::MAIN_PICTURE).what()), "Missing asset foo for main picture"); - BOOST_CHECK_EQUAL (string (dcp::MissingAssetError ("foo", dcp::MissingAssetError::MAIN_SOUND).what()), "Missing asset foo for main sound"); - BOOST_CHECK_EQUAL (string (dcp::MissingAssetError ("foo", dcp::MissingAssetError::MAIN_SUBTITLE).what()), "Missing asset foo for main subtitle"); } diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc index fe21f651..d8ec4eea 100644 --- a/test/rewrite_subs.cc +++ b/test/rewrite_subs.cc @@ -57,7 +57,7 @@ main (int argc, char* argv[]) } DCP* dcp = new DCP (argv[1]); - dcp->read (true); + dcp->read (); list<shared_ptr<CPL> > cpls = dcp->cpls (); for (list<boost::shared_ptr<CPL> >::iterator i = cpls.begin(); i != cpls.end(); ++i) { diff --git a/test/verify_test.cc b/test/verify_test.cc index 98f37635..9b028729 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -233,9 +233,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::GENERAL_READ); - BOOST_REQUIRE (static_cast<bool>(notes.front().note())); - BOOST_REQUIRE_EQUAL (notes.front().note().get(), "Missing asset video.mxf"); + BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::Code::MISSING_ASSET); } /* Empty asset filename in ASSETMAP */ @@ -253,9 +251,7 @@ BOOST_AUTO_TEST_CASE (verify_test7) list<dcp::VerificationNote> notes = dcp::verify (directories, &stage, &progress); BOOST_REQUIRE_EQUAL (notes.size(), 1); - BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_ERROR); - BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::GENERAL_READ); - BOOST_REQUIRE (static_cast<bool>(notes.front().note())); - BOOST_REQUIRE_EQUAL (notes.front().note().get(), "Asset map path is empty for asset 1fab8bb0-cfaf-4225-ad6d-01768bc10470"); + BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_WARNING); + BOOST_CHECK_EQUAL (notes.front().code(), dcp::VerificationNote::Code::EMPTY_ASSET_PATH); } |