X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fsubtitle_metadata_test.cc;h=91372d2a521cbd0924229fe98e90711b93e8a64b;hp=a60d0675cdb04db0b258352380955cf04b636692;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=60adc5a3312a9412b8988a0e2e82724779b5b84e

diff --git a/test/subtitle_metadata_test.cc b/test/subtitle_metadata_test.cc
index a60d0675c..91372d2a5 100644
--- a/test/subtitle_metadata_test.cc
+++ b/test/subtitle_metadata_test.cc
@@ -27,50 +27,30 @@
 #include "lib/film.h"
 #include "test.h"
 #include <boost/filesystem.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/test/unit_test.hpp>
 
 
+using std::make_shared;
+using std::shared_ptr;
 using std::vector;
-using boost::shared_ptr;
 
 
 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));
+	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(), "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));
-	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");
 }