X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fremake_id_test.cc;h=2a96a148887f90e71f4dac656d780cbd61220704;hb=20c70c93a38551842721ddee2e08c7b33a7bb924;hp=c92f0af435ee78f24df6d9dd7e1b5505a660a720;hpb=f41fba4a74411c5d5140fc56fa337ded198af91c;p=dcpomatic.git

diff --git a/test/remake_id_test.cc b/test/remake_id_test.cc
index c92f0af43..2a96a1488 100644
--- a/test/remake_id_test.cc
+++ b/test/remake_id_test.cc
@@ -20,7 +20,7 @@
 
 #include "lib/ffmpeg_content.h"
 #include "lib/content_factory.h"
-#include "lib/subtitle_content.h"
+#include "lib/text_content.h"
 #include "lib/job_manager.h"
 #include "lib/film.h"
 #include "lib/dcp_content.h"
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE (remake_id_test1)
 {
 	/* Make a DCP */
 	shared_ptr<Film> film = new_test_film2 ("remake_id_test1_1");
-	shared_ptr<Content> content = content_factory(film, "test/data/flat_red.png").front();
+	shared_ptr<Content> content = content_factory("test/data/flat_red.png").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	film->make_dcp ();
@@ -67,16 +67,17 @@ BOOST_AUTO_TEST_CASE (remake_id_test2)
 {
 	/* Make a DCP */
 	shared_ptr<Film> film = new_test_film2 ("remake_id_test2_1");
-	shared_ptr<Content> content = content_factory(film, "test/data/flat_red.png").front();
+	shared_ptr<Content> content = content_factory("test/data/flat_red.png").front();
 	film->examine_and_add_content (content);
 	film->set_encrypted (true);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	/* Remake it */
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs ());
+	/* Remove and remake it */
+	boost::filesystem::remove_all(film->dir(film->dcp_name()));
+	film->make_dcp();
+	BOOST_REQUIRE(!wait_for_jobs());
 
 	/* Find the CPL */
 	optional<boost::filesystem::path> cpl;
@@ -90,10 +91,10 @@ BOOST_AUTO_TEST_CASE (remake_id_test2)
 	/* Make a DKDM */
 	dcp::EncryptedKDM kdm = film->make_kdm (
 		Config::instance()->decryption_chain()->leaf(),
-		vector<dcp::Certificate>(),
+		vector<string>(),
 		*cpl,
-		dcp::LocalTime ("2012-01-01T01:00:00+00:00"),
-		dcp::LocalTime ("2112-01-01T01:00:00+00:00"),
+		dcp::LocalTime ("2030-01-01T01:00:00+00:00"),
+		dcp::LocalTime ("2031-01-01T01:00:00+00:00"),
 		dcp::MODIFIED_TRANSITIONAL_1,
 		true,
 		0
@@ -101,12 +102,12 @@ BOOST_AUTO_TEST_CASE (remake_id_test2)
 
 	/* Import the DCP into a new film */
 	shared_ptr<Film> film2 = new_test_film2("remake_id_test2_2");
-	shared_ptr<DCPContent> dcp_content(new DCPContent(film2, film->dir(film->dcp_name())));
-	film->examine_and_add_content(dcp_content);
+	shared_ptr<DCPContent> dcp_content(new DCPContent(film->dir(film->dcp_name())));
+	film2->examine_and_add_content(dcp_content);
 	BOOST_REQUIRE(!wait_for_jobs());
 	dcp_content->add_kdm(kdm);
 	JobManager::instance()->add(shared_ptr<Job>(new ExamineContentJob(film2, dcp_content)));
 	BOOST_REQUIRE(!wait_for_jobs());
-	film->make_dcp();
+	film2->make_dcp();
 	BOOST_REQUIRE(!wait_for_jobs());
 }