X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fdcp_decoder_test.cc;h=5d4d1e0cacbb2a2648513c56fac28352e747fe2d;hp=28538a2819dd3b845d78069f083275c4a563ec9b;hb=fb0e2ead59a442700c671270c7d57b5bffeaeab3;hpb=cb6729aa79b555b219974207fbe2ff0510f9d3ea

diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc
index 28538a281..5d4d1e0ca 100644
--- a/test/dcp_decoder_test.cc
+++ b/test/dcp_decoder_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,56 +18,54 @@
 
 */
 
+
 /** @file  test/dcp_decoder_test.cc
  *  @brief Test DCPDecoder class.
  *  @ingroup selfcontained
  */
 
-#include "lib/film.h"
+
+#include "lib/config.h"
+#include "lib/content_factory.h"
 #include "lib/dcp_content.h"
 #include "lib/dcp_decoder.h"
-#include "lib/content_factory.h"
-#include "lib/player.h"
 #include "lib/examine_content_job.h"
+#include "lib/film.h"
 #include "lib/job_manager.h"
-#include "lib/config.h"
+#include "lib/piece.h"
+#include "lib/player.h"
 #include "test.h"
+#include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
+
 using std::list;
 using std::string;
 using std::vector;
 using std::make_shared;
 using std::shared_ptr;
 
+
 /* Check that DCPDecoder reuses old data when it should */
 BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 {
 	/* Make some DCPs */
 
-	auto ov = new_test_film2 ("check_reuse_old_data_ov");
-	ov->examine_and_add_content (content_factory("test/data/flat_red.png").front());
-	BOOST_REQUIRE (!wait_for_jobs());
-	ov->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	auto ov = new_test_film2 ("check_reuse_old_data_ov", {content_factory("test/data/flat_red.png").front()});
+	make_and_verify_dcp (ov);
 
-	auto vf = new_test_film2 ("check_reuse_old_data_vf");
 	auto ov_content = make_shared<DCPContent>(ov->dir(ov->dcp_name(false)));
-	vf->examine_and_add_content (ov_content);
-	vf->examine_and_add_content (content_factory("test/data/L.wav").front());
-	BOOST_REQUIRE (!wait_for_jobs());
+	auto vf = new_test_film2 ("check_reuse_old_data_vf", {ov_content, content_factory("test/data/L.wav").front()});
 	ov_content->set_reference_video (true);
-	vf->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET});
 
 	auto encrypted = new_test_film2 ("check_reuse_old_data_decrypted");
 	encrypted->examine_and_add_content (content_factory("test/data/flat_red.png").front());
 	BOOST_REQUIRE (!wait_for_jobs());
 	encrypted->set_encrypted (true);
-	encrypted->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (encrypted);
 
 	dcp::DCP encrypted_dcp (encrypted->dir(encrypted->dcp_name()));
 	encrypted_dcp.read ();
@@ -78,7 +76,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 		encrypted_dcp.cpls().front()->file().get(),
 		dcp::LocalTime ("2030-07-21T00:00:00+00:00"),
 		dcp::LocalTime ("2031-07-21T00:00:00+00:00"),
-		dcp::MODIFIED_TRANSITIONAL_1,
+		dcp::Formulation::MODIFIED_TRANSITIONAL_1,
 		true, 0
 		);
 
@@ -90,7 +88,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	ov_content = make_shared<DCPContent>(ov->dir(ov->dcp_name(false)));
 	test->examine_and_add_content (ov_content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	auto player = make_shared<Player>(test);
+	auto player = make_shared<Player>(test, Image::Alignment::COMPACT);
 
 	auto decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
@@ -108,7 +106,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	auto vf_content = make_shared<DCPContent>(vf->dir(vf->dcp_name(false)));
 	test->examine_and_add_content (vf_content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	player.reset (new Player(test));
+	player = make_shared<Player>(test, Image::Alignment::COMPACT);
 
 	decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
@@ -126,7 +124,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	auto encrypted_content = make_shared<DCPContent>(encrypted->dir(encrypted->dcp_name(false)));
 	test->examine_and_add_content (encrypted_content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	player = make_shared<Player>(test);
+	player = make_shared<Player>(test, Image::Alignment::COMPACT);
 
 	decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);