X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ffilm_metadata_test.cc;h=c41e8618900af948c77cd85e1f8e4fabb7bd410b;hb=4388fff5376a6e5a6dc8d33e244a1245a728335c;hp=0b4495b486989f3dc8b0adde516a7d936b9bf151;hpb=c45fd99b0b4a193edcebccc927793d48431a5a13;p=dcpomatic.git

diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 0b4495b48..c41e86189 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -17,6 +17,19 @@
 
 */
 
+#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::list;
+using boost::shared_ptr;
+
 BOOST_AUTO_TEST_CASE (film_metadata_test)
 {
 	string const test_film = "build/test/film_metadata_test";
@@ -25,52 +38,28 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 		boost::filesystem::remove_all (test_film);
 	}
 
-	BOOST_CHECK_THROW (new Film (test_film, true), OpenFileError);
-	
-	shared_ptr<Film> f (new Film (test_film, false));
-	f->_dci_date = boost::gregorian::from_undelimited_string ("20130211");
-	BOOST_CHECK (f->format() == 0);
+	shared_ptr<Film> f (new Film (test_film));
+	f->_isdcf_date = boost::gregorian::from_undelimited_string ("20130211");
+	BOOST_CHECK (f->container() == 0);
 	BOOST_CHECK (f->dcp_content_type() == 0);
-	BOOST_CHECK (f->filters ().empty());
 
 	f->set_name ("fred");
-	BOOST_CHECK_THROW (f->set_content ("jim"), OpenFileError);
 	f->set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
-	f->set_format (Format::from_nickname ("Flat"));
-	f->set_left_crop (1);
-	f->set_right_crop (2);
-	f->set_top_crop (3);
-	f->set_bottom_crop (4);
-	vector<Filter const *> f_filters;
-	f_filters.push_back (Filter::from_id ("pphb"));
-	f_filters.push_back (Filter::from_id ("unsharp"));
-	f->set_filters (f_filters);
-	f->set_trim_start (42);
-	f->set_trim_end (99);
-	f->set_dcp_ab (true);
+	f->set_container (Ratio::from_id ("185"));
+	f->set_j2k_bandwidth (200000000);
 	f->write_metadata ();
 
-	stringstream s;
-	s << "diff -u test/metadata.ref " << test_film << "/metadata";
-	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, true));
+	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->format(), Format::from_nickname ("Flat"));
-	BOOST_CHECK_EQUAL (g->crop().left, 1);
-	BOOST_CHECK_EQUAL (g->crop().right, 2);
-	BOOST_CHECK_EQUAL (g->crop().top, 3);
-	BOOST_CHECK_EQUAL (g->crop().bottom, 4);
-	vector<Filter const *> g_filters = g->filters ();
-	BOOST_CHECK_EQUAL (g_filters.size(), 2);
-	BOOST_CHECK_EQUAL (g_filters.front(), Filter::from_id ("pphb"));
-	BOOST_CHECK_EQUAL (g_filters.back(), Filter::from_id ("unsharp"));
-	BOOST_CHECK_EQUAL (g->trim_start(), 42);
-	BOOST_CHECK_EQUAL (g->trim_end(), 99);
-	BOOST_CHECK_EQUAL (g->dcp_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);
 }