X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fhints_test.cc;h=ce7e87b9c90e323947010cbe58dbd92ce3e4ea6d;hb=HEAD;hp=51374b274d74546faa5dc18e7f39f8ebda510c53;hpb=bdf29b6d0a2cdb392a9d4fd1c214ff108ec84c90;p=dcpomatic.git

diff --git a/test/hints_test.cc b/test/hints_test.cc
index 51374b274..949ba18c0 100644
--- a/test/hints_test.cc
+++ b/test/hints_test.cc
@@ -21,6 +21,7 @@
 
 #include "lib/audio_content.h"
 #include "lib/config.h"
+#include "lib/constants.h"
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/cross.h"
@@ -28,7 +29,6 @@
 #include "lib/font.h"
 #include "lib/hints.h"
 #include "lib/text_content.h"
-#include "lib/util.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
@@ -63,6 +63,7 @@ get_hints (shared_ptr<Film> film)
 	hints.start ();
 	hints.join ();
 	while (signal_manager->ui_idle()) {}
+	hints.rethrow();
 	return current_hints;
 }
 
@@ -72,7 +73,7 @@ void
 check (TextType type, string name, optional<string> expected_hint = optional<string>())
 {
 	auto film = new_test_film2 (name);
-	auto content = content_factory("test/data/" + name + ".srt").front();
+	auto content = content_factory("test/data/" + name + ".srt")[0];
 	content->text.front()->set_type (type);
 	content->text.front()->set_language (dcp::LanguageTag("en-US"));
 	film->examine_and_add_content (content);
@@ -83,7 +84,11 @@ check (TextType type, string name, optional<string> expected_hint = optional<str
 		BOOST_REQUIRE_EQUAL (hints.size(), 1U);
 		BOOST_CHECK_EQUAL (hints[0], *expected_hint);
 	} else {
-		BOOST_CHECK (hints.empty());
+		string message;
+		for (auto hint: hints) {
+			message += hint + "\n";
+		}
+		BOOST_CHECK_MESSAGE(hints.empty(), "Found: " << message);
 	}
 }
 
@@ -148,6 +153,12 @@ BOOST_AUTO_TEST_CASE (hint_many_subtitle_lines)
 }
 
 
+BOOST_AUTO_TEST_CASE(hint_many_subtitle_lines2)
+{
+	check(TextType::OPEN_SUBTITLE, "hint_many_subtitle_lines2");
+}
+
+
 BOOST_AUTO_TEST_CASE (hint_subtitle_too_long)
 {
 	check (
@@ -173,16 +184,25 @@ BOOST_AUTO_TEST_CASE (hint_subtitle_mxf_too_big)
 	string const name = "hint_subtitle_mxf_too_big";
 
 	auto film = new_test_film2 (name);
-	auto content = content_factory("test/data/" + name + ".srt").front();
-	content->text.front()->set_type (TextType::OPEN_SUBTITLE);
-	content->text.front()->set_language (dcp::LanguageTag("en-US"));
-	for (int i = 1; i < 512; ++i) {
-		auto font = make_shared<dcpomatic::Font>(String::compose("font_%1", i));
-		font->set_file ("test/data/LiberationSans-Regular.ttf");
-		content->text.front()->add_font(font);
+
+	for (int i = 0; i < 4; ++i) {
+		dcp::File fake_font("build/test/hint_subtitle_mxf_too_big.ttf", "w");
+		for (int i = 0; i < 512; ++i) {
+			std::vector<uint8_t> rubbish(65536);
+			fake_font.write(rubbish.data(), 1, rubbish.size());
+		}
+		fake_font.close();
+
+		auto content = content_factory(String::compose("test/data/%1%2.xml", name, i))[0];
+		content->text[0]->set_type(TextType::OPEN_SUBTITLE);
+		content->text[0]->set_language(dcp::LanguageTag("en-US"));
+		film->examine_and_add_content(content);
+		BOOST_REQUIRE (!wait_for_jobs());
+		auto const font = content->text[0]->get_font(String::compose("0_font_%1", i));
+		BOOST_REQUIRE(font);
+		font->set_file("build/test/hint_subtitle_mxf_too_big.ttf");
 	}
-	film->examine_and_add_content (content);
-	BOOST_REQUIRE (!wait_for_jobs());
+
 	auto hints = get_hints (film);
 
 	BOOST_REQUIRE_EQUAL (hints.size(), 1U);
@@ -200,18 +220,18 @@ BOOST_AUTO_TEST_CASE (hint_closed_caption_xml_too_big)
 
 	auto film = new_test_film2 (name);
 
-	auto ccap = fopen_boost (String::compose("build/test/%1.srt", name), "w");
+	dcp::File ccap(String::compose("build/test/%1.srt", name), "w");
 	BOOST_REQUIRE (ccap);
 	for (int i = 0; i < 2048; ++i) {
-		fprintf(ccap, "%d\n", i + 1);
+		fprintf(ccap.get(), "%d\n", i + 1);
 		int second = i * 2;
 		int minute = second % 60;
-		fprintf(ccap, "00:%02d:%02d,000 --> 00:%02d:%02d,000\n", minute, second, minute, second + 1);
-		fprintf(ccap, "Here are some closed captions.\n\n");
+		fprintf(ccap.get(), "00:%02d:%02d,000 --> 00:%02d:%02d,000\n", minute, second, minute, second + 1);
+		fprintf(ccap.get(), "Here are some closed captions.\n\n");
 	}
-	fclose (ccap);
+	ccap.close();
 
-	auto content = content_factory("build/test/" + name + ".srt").front();
+	auto content = content_factory("build/test/" + name + ".srt")[0];
 	content->text.front()->set_type (TextType::CLOSED_CAPTION);
 	content->text.front()->set_language (dcp::LanguageTag("en-US"));
 	film->examine_and_add_content (content);
@@ -230,7 +250,7 @@ BOOST_AUTO_TEST_CASE (hint_closed_caption_xml_too_big)
 BOOST_AUTO_TEST_CASE (hints_destroyed_while_running)
 {
 	auto film = new_test_film2 ("hints_destroyed_while_running");
-	auto content = content_factory(TestPaths::private_data() / "boon_telly.mkv").front();
+	auto content = content_factory(TestPaths::private_data() / "boon_telly.mkv")[0];
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -244,7 +264,7 @@ BOOST_AUTO_TEST_CASE (hints_destroyed_while_running)
 
 BOOST_AUTO_TEST_CASE (hints_audio_with_no_language)
 {
-	auto content = content_factory("test/data/sine_440.wav").front();
+	auto content = content_factory("test/data/sine_440.wav")[0];
 	auto film = new_test_film2 ("hints_audio_with_no_language", { content });
 	content->audio->set_gain (-6);
 
@@ -271,7 +291,7 @@ BOOST_AUTO_TEST_CASE (hints_certificate_validity)
 		hints[0],
 		"The certificate chain that DCP-o-matic uses for signing DCPs and KDMs has a validity period "
 		"that is too long.  This will cause problems playing back DCPs on some systems. "
-		"You are advised to re-create the signing certificate chain by clicking the "
+		"It is advisable to re-create the signing certificate chain by clicking the "
 		"\"Re-make certificates and key...\" button in the Keys page of Preferences."
 		);
 }