From d21efc88c0c5549160a55cd25d6bc2098752cf75 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 30 Jun 2023 01:59:18 +0200 Subject: [PATCH] Clean up after some more tests. --- test/empty_caption_test.cc | 6 +++++- test/player_test.cc | 6 +++++- test/subtitle_font_id_test.cc | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/test/empty_caption_test.cc b/test/empty_caption_test.cc index f0449a3ce..3673cce5d 100644 --- a/test/empty_caption_test.cc +++ b/test/empty_caption_test.cc @@ -29,8 +29,10 @@ BOOST_AUTO_TEST_CASE (check_for_no_empty_text_nodes_in_failure_case) { + Cleanup cl; + auto content = content_factory("test/data/empty.srt"); - auto film = new_test_film2 ("check_for_no_empty_text_nodes_in_failure_case", content); + auto film = new_test_film2("check_for_no_empty_text_nodes_in_failure_case", content, &cl); auto text = content[0]->text.front(); text->set_type (TextType::CLOSED_CAPTION); text->set_dcp_track({"English", dcp::LanguageTag("en-GB")}); @@ -38,5 +40,7 @@ BOOST_AUTO_TEST_CASE (check_for_no_empty_text_nodes_in_failure_case) make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA }); + + cl.run(); } diff --git a/test/player_test.cc b/test/player_test.cc index 6db90f2dd..a72e5fc17 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -545,18 +545,22 @@ BOOST_AUTO_TEST_CASE (interleaved_subtitle_are_emitted_correctly) BOOST_AUTO_TEST_CASE(multiple_sound_files_bug) { + Cleanup cl; + Config::instance()->set_log_types(Config::instance()->log_types() | LogEntry::TYPE_DEBUG_PLAYER); auto A = content_factory(TestPaths::private_data() / "kook" / "1.wav").front(); auto B = content_factory(TestPaths::private_data() / "kook" / "2.wav").front(); auto C = content_factory(TestPaths::private_data() / "kook" / "3.wav").front(); - auto film = new_test_film2("multiple_sound_files_bug", { A, B, C }); + auto film = new_test_film2("multiple_sound_files_bug", { A, B, C }, &cl); C->set_position(film, DCPTime(3840000)); make_and_verify_dcp(film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA }); check_mxf_audio_file(TestPaths::private_data() / "kook" / "reference.mxf", dcp_file(film, "pcm_")); + + cl.run(); } diff --git a/test/subtitle_font_id_test.cc b/test/subtitle_font_id_test.cc index ef5ed0e8c..b4c28e53e 100644 --- a/test/subtitle_font_id_test.cc +++ b/test/subtitle_font_id_test.cc @@ -90,10 +90,14 @@ BOOST_AUTO_TEST_CASE(make_dcp_with_subs_from_interop_dcp) BOOST_AUTO_TEST_CASE(make_dcp_with_subs_from_smpte_dcp) { + Cleanup cl; + auto dcp = make_shared(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"); - auto film = new_test_film2("make_dcp_with_subs_from_smpte_dcp", { dcp }); + auto film = new_test_film2("make_dcp_with_subs_from_smpte_dcp", { dcp }, &cl); dcp->text.front()->set_use(true); make_and_verify_dcp(film); + + cl.run(); } -- 2.30.2