X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fwriter_test.cc;h=d5cafe1fbfd33aa25f517910e02d50327a2d194f;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=cb97cf78afb2209b4cccbf1dc342249e44bb5636;hpb=3b137ece1ab4bffe4c959047972c5d1317f8a79c;p=dcpomatic.git

diff --git a/test/writer_test.cc b/test/writer_test.cc
index cb97cf78a..d5cafe1fb 100644
--- a/test/writer_test.cc
+++ b/test/writer_test.cc
@@ -36,13 +36,14 @@
 
 using std::make_shared;
 using std::shared_ptr;
+using std::vector;
 
 
 BOOST_AUTO_TEST_CASE (test_write_odd_amount_of_silence)
 {
-	auto content = content_factory("test/data/flat_red.png").front();
-	auto film = new_test_film2 ("test_write_odd_amount_of_silence", {content});
-	content->video->set_length(24);
+	auto content = content_factory("test/data/flat_red.png");
+	auto film = new_test_film2 ("test_write_odd_amount_of_silence", content);
+	content[0]->video->set_length(24);
 	auto writer = make_shared<Writer>(film, shared_ptr<Job>());
 
 	auto audio = make_shared<AudioBuffers>(6, 48000);
@@ -53,14 +54,16 @@ BOOST_AUTO_TEST_CASE (test_write_odd_amount_of_silence)
 
 BOOST_AUTO_TEST_CASE (interrupt_writer)
 {
-	auto film = new_test_film2 ("test_interrupt_writer");
+	Cleanup cl;
 
-	auto content = content_factory("test/data/check_image0.png").front();
+	auto film = new_test_film2 ("test_interrupt_writer", {}, &cl);
+
+	auto content = content_factory("test/data/check_image0.png")[0];
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Add some dummy content to the film so that it has a reel of the right length */
-	auto constexpr frames = 24 * 60 * 60;
+	auto constexpr frames = 24 * 60;
 	content->video->set_length (frames);
 
 	/* Make a random J2K image */
@@ -93,7 +96,68 @@ BOOST_AUTO_TEST_CASE (interrupt_writer)
 	dcpomatic_sleep_seconds	(1);
 
 	thread.interrupt ();
+	thread.join ();
 
 	dcpomatic_sleep_seconds (1);
+	cl.run ();
+}
+
+
+BOOST_AUTO_TEST_CASE (writer_disambiguate_font_ids1)
+{
+	auto film = new_test_film2("writer_disambiguate_font_ids1", {});
+	Writer writer(film, {});
+
+	auto fonts = vector<shared_ptr<dcpomatic::Font>> {
+		make_shared<dcpomatic::Font>("a"),
+		make_shared<dcpomatic::Font>("b"),
+		make_shared<dcpomatic::Font>("c")
+	};
+
+	writer.write(fonts);
+
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[0]), "a");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[1]), "b");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[2]), "c");
+}
+
+
+BOOST_AUTO_TEST_CASE (writer_disambiguate_font_ids2)
+{
+	auto film = new_test_film2("writer_disambiguate_font_ids2", {});
+	Writer writer(film, {});
+
+	auto fonts = vector<shared_ptr<dcpomatic::Font>> {
+		make_shared<dcpomatic::Font>("a"),
+		make_shared<dcpomatic::Font>("a"),
+		make_shared<dcpomatic::Font>("a")
+	};
+
+	writer.write(fonts);
+
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[0]), "a");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[1]), "a_0");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[2]), "a_1");
+}
+
+
+BOOST_AUTO_TEST_CASE (writer_disambiguate_font_ids3)
+{
+	auto film = new_test_film2("writer_disambiguate_font_ids3", {});
+	Writer writer(film, {});
+
+	auto fonts = vector<shared_ptr<dcpomatic::Font>> {
+		make_shared<dcpomatic::Font>("a_2"),
+		make_shared<dcpomatic::Font>("a_1"),
+		make_shared<dcpomatic::Font>("a_1"),
+		make_shared<dcpomatic::Font>("b")
+	};
+
+	writer.write(fonts);
+
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[1]), "a_1");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[0]), "a_2");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[2]), "a_3");
+	BOOST_CHECK_EQUAL(writer._fonts.get(fonts[3]), "b");
 }