X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsubtitle_metadata_test.cc;h=91372d2a521cbd0924229fe98e90711b93e8a64b;hb=865316f0129c85cdd0248b87502fe97dec94b3f0;hp=f79aa08f8b29d1874b39ff61dcd6a17169e4ccdb;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/test/subtitle_metadata_test.cc b/test/subtitle_metadata_test.cc
index f79aa08f8..91372d2a5 100644
--- a/test/subtitle_metadata_test.cc
+++ b/test/subtitle_metadata_test.cc
@@ -30,46 +30,27 @@
 #include <boost/test/unit_test.hpp>
 
 
-using std::vector;
+using std::make_shared;
 using std::shared_ptr;
+using std::vector;
 
 
 BOOST_AUTO_TEST_CASE (subtitle_metadata_test1)
 {
 	using namespace boost::filesystem;
 
-	path p = test_film_dir ("subtitle_metadata_test1");
+	auto p = test_film_dir ("subtitle_metadata_test1");
 	if (exists (p)) {
 		remove_all (p);
 	}
 	create_directory (p);
 
 	copy_file ("test/data/subtitle_metadata1.xml", p / "metadata.xml");
-	shared_ptr<Film> film(new Film(p));
-	film->read_metadata();
-
-	vector<dcp::LanguageTag> langs = film->subtitle_languages ();
-	BOOST_REQUIRE (!langs.empty());
-	BOOST_CHECK_EQUAL (langs.front().to_string(), "de-DE");
-}
-
-
-BOOST_AUTO_TEST_CASE (subtitle_metadata_test2)
-{
-	using namespace boost::filesystem;
-
-	path p = test_film_dir ("subtitle_metadata_test2");
-	if (exists (p)) {
-		remove_all (p);
-	}
-	create_directory (p);
-
-	copy_file ("test/data/subtitle_metadata2.xml", p / "metadata.xml");
-	shared_ptr<Film> film(new Film(p));
+	auto film = make_shared<Film>(p);
 	film->read_metadata();
 
-	vector<dcp::LanguageTag> langs = film->subtitle_languages ();
-	BOOST_REQUIRE (!langs.empty());
-	BOOST_CHECK_EQUAL (langs.front().to_string(), "fr");
+	auto langs = film->subtitle_languages ();
+	BOOST_REQUIRE (langs.first);
+	BOOST_CHECK_EQUAL (langs.first->to_string(), "de-DE");
 }