X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ffilm_metadata_test.cc;h=423bc4cccd7467c1532fe9d5190b1e2977199fba;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=cc29f4472193255f0e5acc2020b5bf7df802975b;hpb=308488324dbc4d8b709d3fb1dc9fee0479346c21;p=dcpomatic.git

diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index cc29f4472..423bc4ccc 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -21,7 +21,6 @@
  *  @brief Test some basic reading/writing of film metadata.
  */
 
-#include <sstream>
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/date_time.hpp>
@@ -31,24 +30,23 @@
 #include "test.h"
 
 using std::string;
-using std::stringstream;
 using std::list;
 using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (film_metadata_test)
 {
-	shared_ptr<Film> f = new_test_film ("film_metadata_test");
+	shared_ptr<Film> film = new_test_film ("film_metadata_test");
 	boost::filesystem::path dir = test_film_dir ("film_metadata_test");
 
-	f->_dci_date = boost::gregorian::from_undelimited_string ("20130211");
-	BOOST_CHECK (f->container() == 0);
-	BOOST_CHECK (f->dcp_content_type() == 0);
+	film->_isdcf_date = boost::gregorian::from_undelimited_string ("20130211");
+	BOOST_CHECK (film->container() == Ratio::from_id ("185"));
+	BOOST_CHECK (film->dcp_content_type() == 0);
 
-	f->set_name ("fred");
-	f->set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
-	f->set_container (Ratio::from_id ("185"));
-	f->set_j2k_bandwidth (200000000);
-	f->write_metadata ();
+	film->set_name ("fred");
+	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
+	film->set_container (Ratio::from_id ("185"));
+	film->set_j2k_bandwidth (200000000);
+	film->write_metadata ();
 
 	list<string> ignore;
 	ignore.push_back ("Key");
@@ -60,7 +58,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	BOOST_CHECK_EQUAL (g->name(), "fred");
 	BOOST_CHECK_EQUAL (g->dcp_content_type(), DCPContentType::from_pretty_name ("Short"));
 	BOOST_CHECK_EQUAL (g->container(), Ratio::from_id ("185"));
-	
+
 	g->write_metadata ();
 	check_xml ("test/data/metadata.xml.ref", dir.string() + "/metadata.xml", ignore);
 }