summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-05-20 20:00:07 +0200
committerCarl Hetherington <cth@carlh.net>2024-05-20 20:00:07 +0200
commit19b6cd41712d38cb5b1c97659c8a1cc86e784812 (patch)
tree71238f5628e44e2777c473418b8a4ebcf2a56e79
parentfe45c58741952eca798e71ad75267a3a4b7e97b9 (diff)
Cleanup, and try to make a test use less disk space.
-rw-r--r--test/subtitle_font_id_change_test.cc6
-rw-r--r--test/subtitle_reel_number_test.cc11
-rw-r--r--test/subtitle_timing_test.cc1
3 files changed, 11 insertions, 7 deletions
diff --git a/test/subtitle_font_id_change_test.cc b/test/subtitle_font_id_change_test.cc
index 385dd1aae..5d4ba60e8 100644
--- a/test/subtitle_font_id_change_test.cc
+++ b/test/subtitle_font_id_change_test.cc
@@ -95,7 +95,9 @@ BOOST_AUTO_TEST_CASE(subtitle_font_id_change_test2)
BOOST_AUTO_TEST_CASE(subtitle_font_id_change_test3)
{
- auto film = new_test_film2("subtitle_font_id_change_test3");
+ Cleanup cl;
+
+ auto film = new_test_film2("subtitle_font_id_change_test3", {}, &cl);
boost::filesystem::remove(film->file("metadata.xml"));
boost::filesystem::copy_file("test/data/subtitle_font_id_change_test3.xml", film->file("metadata.xml"));
{
@@ -126,6 +128,8 @@ BOOST_AUTO_TEST_CASE(subtitle_font_id_change_test3)
BOOST_CHECK_EQUAL(*font->file(), "test/data/Inconsolata-VF.ttf");
make_and_verify_dcp(film, { dcp::VerificationNote::Code::INVALID_STANDARD });
+
+ cl.run();
}
diff --git a/test/subtitle_reel_number_test.cc b/test/subtitle_reel_number_test.cc
index a48057577..fcc2f40b0 100644
--- a/test/subtitle_reel_number_test.cc
+++ b/test/subtitle_reel_number_test.cc
@@ -42,13 +42,10 @@ using std::string;
/* Check that ReelNumber is setup correctly when making multi-reel subtitled DCPs */
BOOST_AUTO_TEST_CASE (subtitle_reel_number_test)
{
- auto film = new_test_film ("subtitle_reel_number_test");
- film->set_container (Ratio::from_id ("185"));
- film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
- film->set_name ("frobozz");
+ Cleanup cl;
+
auto content = make_shared<StringTextFileContent>("test/data/subrip5.srt");
- film->examine_and_add_content (content);
- BOOST_REQUIRE (!wait_for_jobs ());
+ auto film = new_test_film2("subtitle_reel_number_test", { content }, &cl);
content->only_text()->set_use (true);
content->only_text()->set_burn (false);
content->only_text()->set_language(dcp::LanguageTag("de"));
@@ -72,4 +69,6 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_number_test)
++n;
}
}
+
+ cl.run();
}
diff --git a/test/subtitle_timing_test.cc b/test/subtitle_timing_test.cc
index 8bb18f304..710a95282 100644
--- a/test/subtitle_timing_test.cc
+++ b/test/subtitle_timing_test.cc
@@ -55,6 +55,7 @@ BOOST_AUTO_TEST_CASE (test_subtitle_timing_with_frame_rate_change)
sub->text.front()->set_language(dcp::LanguageTag("en"));
auto film = new_test_film2(name, { picture, sub }, &cl);
+ film->set_video_bit_rate(VideoEncoding::JPEG2000, 10000000);
picture->set_video_frame_rate(film, content_frame_rate);
auto const dcp_frame_rate = film->video_frame_rate();