Fix DCP content font ID allocation to cope with DCPs that have multiple fonts

[dcpomatic.git] / test / writer_test.cc

diff --git a/test/writer_test.cc b/test/writer_test.cc
index d5cafe1fbfd33aa25f517910e02d50327a2d194f..7b2a2db005da70e80a7c1700c2c6f1e394dac30b 100644 (file)
--- a/test/writer_test.cc
+++ b/test/writer_test.cc
@@ -101,63 +101,3 @@ BOOST_AUTO_TEST_CASE (interrupt_writer)
        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");
-}
-