More verification of DCPs during tests.

1 files changed, 25 insertions, 23 deletions

diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc
index 9b987a703..86e6c3950 100644
--- a/test/vf_kdm_test.cc
+++ b/test/vf_kdm_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2017-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,11 +18,13 @@
 
 */
 
+
 /** @file  test/vf_kdm_test.cc
  *  @brief Test encrypted VF creation and import
  *  @ingroup feature
  */
 
+
 #include "test.h"
 #include "lib/film.h"
 #include "lib/dcp_subtitle_content.h"
@@ -36,63 +38,64 @@
 #include <dcp/cpl.h>
 #include <boost/test/unit_test.hpp>
 
-using std::vector;
-using std::string;
+
+using std::make_shared;
 using std::shared_ptr;
+using std::string;
+using std::vector;
+
 
 BOOST_AUTO_TEST_CASE (vf_kdm_test)
 {
 	/* Make an encrypted DCP from test.mp4 */
 
-	shared_ptr<Film> A = new_test_film ("vf_kdm_test_ov");
+	auto A = new_test_film ("vf_kdm_test_ov");
 	A->set_container (Ratio::from_id ("185"));
 	A->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	A->set_name ("frobozz");
 	A->set_interop (true);
 
-	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
+	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
 	A->examine_and_add_content (c);
 	A->set_encrypted (true);
 	BOOST_REQUIRE (!wait_for_jobs());
-	A->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (A, {dcp::VerificationNote::Code::INVALID_STANDARD});
 
 	dcp::DCP A_dcp ("build/test/vf_kdm_test_ov/" + A->dcp_name());
 	A_dcp.read ();
 
-	Config::instance()->set_decryption_chain (shared_ptr<dcp::CertificateChain> (new dcp::CertificateChain (openssl_path ())));
+	Config::instance()->set_decryption_chain (make_shared<dcp::CertificateChain>(openssl_path()));
 
-	dcp::EncryptedKDM A_kdm = A->make_kdm (
-		Config::instance()->decryption_chain()->leaf (),
+	auto A_kdm = A->make_kdm (
+		Config::instance()->decryption_chain()->leaf(),
 		vector<string>(),
 		A_dcp.cpls().front()->file().get(),
-		dcp::LocalTime ("2030-07-21T00:00:00+00:00"),
-		dcp::LocalTime ("2031-07-21T00:00:00+00:00"),
+		dcp::LocalTime("2030-07-21T00:00:00+00:00"),
+		dcp::LocalTime("2031-07-21T00:00:00+00:00"),
 		dcp::Formulation::MODIFIED_TRANSITIONAL_1,
 		true, 0
 		);
 
 	/* Import A into a new project, with the required KDM, and make a VF that refers to it */
 
-	shared_ptr<Film> B = new_test_film ("vf_kdm_test_vf");
-	B->set_container (Ratio::from_id ("185"));
-	B->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
+	auto B = new_test_film ("vf_kdm_test_vf");
+	B->set_container (Ratio::from_id("185"));
+	B->set_dcp_content_type (DCPContentType::from_isdcf_name("TLR"));
 	B->set_name ("frobozz");
 	B->set_interop (true);
 
-	shared_ptr<DCPContent> d (new DCPContent ("build/test/vf_kdm_test_ov/" + A->dcp_name()));
+	auto d = make_shared<DCPContent>("build/test/vf_kdm_test_ov/" + A->dcp_name());
 	d->add_kdm (A_kdm);
 	d->set_reference_video (true);
 	B->examine_and_add_content (d);
 	B->set_encrypted (true);
 	BOOST_REQUIRE (!wait_for_jobs());
-	B->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (B, {dcp::VerificationNote::Code::INVALID_STANDARD, dcp::VerificationNote::Code::EXTERNAL_ASSET});
 
 	dcp::DCP B_dcp ("build/test/vf_kdm_test_vf/" + B->dcp_name());
 	B_dcp.read ();
 
-	dcp::EncryptedKDM B_kdm = B->make_kdm (
+	auto B_kdm = B->make_kdm (
 		Config::instance()->decryption_chain()->leaf (),
 		vector<string>(),
 		B_dcp.cpls().front()->file().get(),
@@ -106,19 +109,18 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	   This KDM should decrypt assets from the OV too.
 	*/
 
-	shared_ptr<Film> C = new_test_film ("vf_kdm_test_check");
+	auto C = new_test_film ("vf_kdm_test_check");
 	C->set_container (Ratio::from_id ("185"));
 	C->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	C->set_name ("frobozz");
 	C->set_interop (true);
 
-	shared_ptr<DCPContent> e (new DCPContent ("build/test/vf_kdm_test_vf/" + B->dcp_name()));
+	auto e = make_shared<DCPContent>("build/test/vf_kdm_test_vf/" + B->dcp_name());
 	e->add_kdm (B_kdm);
 	e->add_ov ("build/test/vf_kdm_test_ov/" + A->dcp_name());
 	C->examine_and_add_content (e);
 	BOOST_REQUIRE (!wait_for_jobs());
-	C->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (C, {dcp::VerificationNote::Code::INVALID_STANDARD});
 
 	/* Should be 1s red, 1s green, 1s blue */
 	check_dcp ("test/data/vf_kdm_test_check", "build/test/vf_kdm_test_check/" + C->dcp_name());