X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ffile_naming_test.cc;h=160fc08134416fc6a947e764cc94573df0f4c48e;hb=20c70c93a38551842721ddee2e08c7b33a7bb924;hp=f06fdfa42fa211f6fa2f85353e56cecce9b44153;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index f06fdfa42..160fc0813 100644
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -28,6 +28,7 @@
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/dcp_content_type.h"
+#include "lib/video_content.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/regex.hpp>
 
@@ -58,6 +59,7 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
 
 	shared_ptr<Film> film = new_test_film ("file_naming_test");
 	film->set_name ("file_naming_test");
+	film->set_video_frame_rate (24);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	shared_ptr<FFmpegContent> r (new FFmpegContent("test/data/flat_red.png"));
 	film->examine_and_add_content (r);
@@ -65,11 +67,22 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
 	film->examine_and_add_content (g);
 	shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
 	film->examine_and_add_content (b);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
+	r->set_video_frame_rate (24);
+	r->video->set_length (24);
+	g->set_position (film, dcpomatic::DCPTime::from_seconds(1));
+	g->set_video_frame_rate (24);
+	g->video->set_length (24);
+	b->set_position (film, dcpomatic::DCPTime::from_seconds(2));
+	b->set_video_frame_rate (24);
+	b->video->set_length (24);
 
 	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film->write_metadata ();
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	int got[3] = { 0, 0, 0 };
 	for (
@@ -104,11 +117,21 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
 	film->examine_and_add_content (g);
 	shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
 	film->examine_and_add_content (b);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
+	r->set_video_frame_rate (24);
+	r->video->set_length (24);
+	g->set_position (film, dcpomatic::DCPTime::from_seconds(1));
+	g->set_video_frame_rate (24);
+	g->video->set_length (24);
+	b->set_position (film, dcpomatic::DCPTime::from_seconds(2));
+	b->set_video_frame_rate (24);
+	b->video->set_length (24);
 
 	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	int got[3] = { 0, 0, 0 };
 	for (