Use the same ContextID whenever encrypting the picture asset for a project;

this ensures that resumption of encodes works.  Before this, a random ContextID
would be created for each run (#980).

1 files changed, 22 insertions, 17 deletions

diff --git a/test/recover_test.cc b/test/recover_test.cc
index dfd3f790f..a16e19639 100644
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -78,25 +78,27 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
 	BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
 }
 
-BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
+BOOST_AUTO_TEST_CASE (recover_test_3d)
 {
-	shared_ptr<Film> film = new_test_film ("recover_test_2d_encrypted");
+	shared_ptr<Film> film = new_test_film ("recover_test_3d");
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name ("recover_test");
-	film->set_encrypted (true);
+	film->set_three_d (true);
 
-	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd24.m2ts"));
+	shared_ptr<ImageContent> content (new ImageContent (film, "test/data/3d_test"));
+	content->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
 	film->make_dcp ();
 	wait_for_jobs ();
 
-	boost::filesystem::path const video = "build/test/recover_test_2d_encrypted/video/185_2K_9284c41c42044ef9b4c14482730cdffe_24_100000000_P_S_0_1200000.mxf";
+	boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_961f053444e90c5ddbf978eb0ebfa772_24_100000000_P_S_3D_0_96000.mxf";
+
 	boost::filesystem::copy_file (
 		video,
-		"build/test/recover_test_2d_encrypted/original.mxf"
+		"build/test/recover_test_3d/original.mxf"
 		);
 
 	boost::filesystem::resize_file (video, 2 * 1024 * 1024);
@@ -104,34 +106,35 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
 	film->make_dcp ();
 	wait_for_jobs ();
 
-	shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d_encrypted/original.mxf"));
-	shared_ptr<dcp::MonoPictureAsset> B (new dcp::MonoPictureAsset (video));
+	shared_ptr<dcp::StereoPictureAsset> A (new dcp::StereoPictureAsset ("build/test/recover_test_3d/original.mxf"));
+	shared_ptr<dcp::StereoPictureAsset> B (new dcp::StereoPictureAsset (video));
 
 	dcp::EqualityOptions eq;
 	BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
 }
 
-BOOST_AUTO_TEST_CASE (recover_test_3d)
+
+BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
 {
-	shared_ptr<Film> film = new_test_film ("recover_test_3d");
+	shared_ptr<Film> film = new_test_film ("recover_test_2d_encrypted");
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name ("recover_test");
-	film->set_three_d (true);
+	film->set_encrypted (true);
 
-	shared_ptr<ImageContent> content (new ImageContent (film, "test/data/3d_test"));
-	content->video->set_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
+	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd24.m2ts"));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
 
 	film->make_dcp ();
 	wait_for_jobs ();
 
-	boost::filesystem::path const video = "build/test/recover_test_3d/video/185_2K_961f053444e90c5ddbf978eb0ebfa772_24_100000000_P_S_3D_0_96000.mxf";
+	boost::filesystem::path const video =
+		"build/test/recover_test_2d_encrypted/video/185_2K_517799e697fdd13033f9f7e836e7dc43_24_100000000_E_S_0_1200000.mxf";
 
 	boost::filesystem::copy_file (
 		video,
-		"build/test/recover_test_3d/original.mxf"
+		"build/test/recover_test_2d_encrypted/original.mxf"
 		);
 
 	boost::filesystem::resize_file (video, 2 * 1024 * 1024);
@@ -139,8 +142,10 @@ BOOST_AUTO_TEST_CASE (recover_test_3d)
 	film->make_dcp ();
 	wait_for_jobs ();
 
-	shared_ptr<dcp::StereoPictureAsset> A (new dcp::StereoPictureAsset ("build/test/recover_test_3d/original.mxf"));
-	shared_ptr<dcp::StereoPictureAsset> B (new dcp::StereoPictureAsset (video));
+	shared_ptr<dcp::MonoPictureAsset> A (new dcp::MonoPictureAsset ("build/test/recover_test_2d_encrypted/original.mxf"));
+	A->set_key (film->key ());
+	shared_ptr<dcp::MonoPictureAsset> B (new dcp::MonoPictureAsset (video));
+	B->set_key (film->key ());
 
 	dcp::EqualityOptions eq;
 	BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));