X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ffilm_metadata_test.cc;h=01cff5b06c46fbb993eb397f68bdefc9a1329a0e;hb=bd0ddc4da8fa288130dbadd34f84de0ed3368d01;hp=324787f194070e7d622d7915b8449014e2716945;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;p=dcpomatic.git

diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 324787f19..01cff5b06 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,28 +17,28 @@
 
 */
 
-#include <sstream>
+/** @file  test/film_metadata_test.cc
+ *  @brief Test some basic reading/writing of film metadata.
+ */
+
 #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";
-	
-	if (boost::filesystem::exists (test_film)) {
-		boost::filesystem::remove_all (test_film);
-	}
+	shared_ptr<Film> f = new_test_film ("film_metadata_test");
+	boost::filesystem::path dir = test_film_dir ("film_metadata_test");
 
-	shared_ptr<Film> f (new Film (test_film));
-	f->_dci_date = boost::gregorian::from_undelimited_string ("20130211");
+	f->_isdcf_date = boost::gregorian::from_undelimited_string ("20130211");
 	BOOST_CHECK (f->container() == 0);
 	BOOST_CHECK (f->dcp_content_type() == 0);
 
@@ -48,11 +48,11 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	f->set_j2k_bandwidth (200000000);
 	f->write_metadata ();
 
-	stringstream s;
-	s << "diff -u test/data/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", dir.string() + "/metadata.xml", ignore);
 
-	shared_ptr<Film> g (new Film (test_film));
+	shared_ptr<Film> g (new Film (dir));
 	g->read_metadata ();
 
 	BOOST_CHECK_EQUAL (g->name(), "fred");
@@ -60,5 +60,5 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	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", dir.string() + "/metadata.xml", ignore);
 }