X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ffilm_metadata_test.cc;h=1f06aa538568b6a83f57f75d36410eea47a69c3e;hb=7f2cb335b6d48a23f48761104934e9b06d4ac464;hp=315461b2285c5f36a3a427ae87ce860ba009709f;hpb=90933dc804de225df47897ddd3a19c5a60ec67e0;p=dcpomatic.git

diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 315461b22..1f06aa538 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -17,6 +17,20 @@
 
 */
 
+#include <sstream>
+#include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/date_time.hpp>
+#include "lib/film.h"
+#include "lib/dcp_content_type.h"
+#include "lib/ratio.h"
+#include "test.h"
+
+using std::string;
+using std::stringstream;
+using std::list;
+using boost::shared_ptr;
+
 BOOST_AUTO_TEST_CASE (film_metadata_test)
 {
 	string const test_film = "build/test/film_metadata_test";
@@ -32,22 +46,21 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 
 	f->set_name ("fred");
 	f->set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
-	f->set_container (Container::from_id ("185"));
-	f->set_ab (true);
+	f->set_container (Ratio::from_id ("185"));
+	f->set_j2k_bandwidth (200000000);
 	f->write_metadata ();
 
-	stringstream s;
-	s << "diff -u test/metadata.xml.ref " << test_film << "/metadata.xml";
-	BOOST_CHECK_EQUAL (::system (s.str().c_str ()), 0);
+	list<string> ignore;
+	ignore.push_back ("Key");
+	check_xml ("test/data/metadata.xml.ref", test_film + "/metadata.xml", ignore);
 
 	shared_ptr<Film> g (new Film (test_film));
 	g->read_metadata ();
 
 	BOOST_CHECK_EQUAL (g->name(), "fred");
 	BOOST_CHECK_EQUAL (g->dcp_content_type(), DCPContentType::from_pretty_name ("Short"));
-	BOOST_CHECK_EQUAL (g->container(), Container::from_id ("185"));
-	BOOST_CHECK_EQUAL (g->ab(), true);
+	BOOST_CHECK_EQUAL (g->container(), Ratio::from_id ("185"));
 	
 	g->write_metadata ();
-	BOOST_CHECK_EQUAL (::system (s.str().c_str ()), 0);
+	check_xml ("test/data/metadata.xml.ref", test_film + "/metadata.xml", ignore);
 }