diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-06-10 01:05:43 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-06-11 09:52:28 +0200 |
| commit | a224ef26f48e1a9a9189c2b935abb06147b342bc (patch) | |
| tree | 86d3facabe1beb33d87fa99c35200abc9ac8cb4f /test/font_id_allocator_test.cc | |
| parent | f37099ba3e9157c3ef74ffcc87c34d3fc54ccfe5 (diff) | |
Simplify the FontIDAllocator a lot (#2827).
This is at the expense of forward compatibility, and the need to
re-examine subtitle content (losing custom fonts as we do so).
But it does mean that the code is simpler, and there's not this weird
growth of IDs where a DCP gets imported with some font, and then the ID
becomes 0_font, and if you do it again it's 0_0_font, and so on.
Diffstat (limited to 'test/font_id_allocator_test.cc')
| -rw-r--r-- | test/font_id_allocator_test.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/test/font_id_allocator_test.cc b/test/font_id_allocator_test.cc index 07110346b..19c4a2154 100644 --- a/test/font_id_allocator_test.cc +++ b/test/font_id_allocator_test.cc @@ -43,12 +43,12 @@ BOOST_AUTO_TEST_CASE(font_id_allocator_test_without_disambiguation) allocator.allocate(); - BOOST_CHECK(allocator.font_id(0, "asset1", "font") == "0_font"); - BOOST_CHECK(allocator.font_id(0, "asset1", "font2") == "0_font2"); - BOOST_CHECK(allocator.font_id(1, "asset2", "font") == "1_font"); - BOOST_CHECK(allocator.font_id(1, "asset2", "font2") == "1_font2"); - BOOST_CHECK(allocator.font_id(1, "asset3", "font3") == "1_font3"); - BOOST_CHECK(allocator.font_id(1, "asset3", "font4") == "1_font4"); + BOOST_CHECK_EQUAL(allocator.font_id(0, "asset1", "font"), "font"); + BOOST_CHECK_EQUAL(allocator.font_id(0, "asset1", "font2"), "font2"); + BOOST_CHECK_EQUAL(allocator.font_id(1, "asset2", "font"), "0_font"); + BOOST_CHECK_EQUAL(allocator.font_id(1, "asset2", "font2"), "0_font2"); + BOOST_CHECK_EQUAL(allocator.font_id(1, "asset3", "font3"), "font3"); + BOOST_CHECK_EQUAL(allocator.font_id(1, "asset3", "font4"), "font4"); } @@ -68,10 +68,9 @@ BOOST_AUTO_TEST_CASE(font_id_allocator_test_with_disambiguation) allocator.allocate(); - BOOST_CHECK(allocator.font_id(0, "asset1", "font") == "0_font"); - /* This should get a prefix that is higher than any reel index */ - BOOST_CHECK(allocator.font_id(0, "asset2", "font") == "2_font"); - BOOST_CHECK(allocator.font_id(1, "asset3", "font1") == "1_font1"); + BOOST_CHECK(allocator.font_id(0, "asset1", "font") == "font"); + BOOST_CHECK(allocator.font_id(0, "asset2", "font") == "0_font"); + BOOST_CHECK(allocator.font_id(1, "asset3", "font1") == "font1"); } |