X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fsubtitle_charset_test.cc;h=8233bf023c9b7b1df9d74c4aa232b8ce09860bc7;hp=b15e3e70e403100e14d0b6aa329e89bab951b7a3;hb=fb0e2ead59a442700c671270c7d57b5bffeaeab3;hpb=27b83475435dda4e84a90cf59a52f150905c4ab1

diff --git a/test/subtitle_charset_test.cc b/test/subtitle_charset_test.cc
index b15e3e70e..8233bf023 100644
--- a/test/subtitle_charset_test.cc
+++ b/test/subtitle_charset_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,35 +18,35 @@
 
 */
 
-#include "test.h"
+
 #include "lib/content.h"
-#include "lib/film.h"
 #include "lib/content_factory.h"
-#include "lib/text_caption_file.h"
-#include "lib/text_caption_file_content.h"
+#include "lib/film.h"
+#include "lib/string_text_file.h"
+#include "lib/string_text_file_content.h"
+#include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
+
 
 /** Test parsing of UTF16 CR/LF input */
 BOOST_AUTO_TEST_CASE (subtitle_charset_test1)
 {
-	shared_ptr<Film> film = new_test_film2 ("subtitle_charset_test1");
-	shared_ptr<Content> content = content_factory (film, private_data / "PADDINGTON soustitresVFdef.srt").front ();
-	film->examine_and_add_content (content);
-	BOOST_REQUIRE (!wait_for_jobs ());
+	auto content = content_factory (TestPaths::private_data() / "PADDINGTON soustitresVFdef.srt").front();
+	auto film = new_test_film2 ("subtitle_charset_test1", { content });
 }
 
+
 /** Test parsing of OSX input */
 BOOST_AUTO_TEST_CASE (subtitle_charset_test2)
 {
-	shared_ptr<Film> film = new_test_film2 ("subtitle_charset_test2");
-	shared_ptr<Content> content = content_factory (film, "test/data/osx.srt").front ();
-	film->examine_and_add_content (content);
-	BOOST_REQUIRE (!wait_for_jobs ());
-	shared_ptr<TextCaptionFile> ts = dynamic_pointer_cast<TextCaptionFile> (content);
+	auto content = content_factory ("test/data/osx.srt").front();
+	auto film = new_test_film2 ("subtitle_charset_test2", { content });
+	auto ts = dynamic_pointer_cast<StringTextFileContent> (content);
 	BOOST_REQUIRE (ts);
 	/* Make sure we got the subtitle data from the file */
-	BOOST_REQUIRE_EQUAL (content->full_length().get(), 6052032);
+	BOOST_REQUIRE_EQUAL (content->full_length(film).get(), 6052032);
 }