X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ffilm_metadata_test.cc;h=854d3e6eae376be76164468f01d03703d4987d35;hp=70f29b998933d355df2b793797ad36d38c9a0205;hb=54af50c3b8e9082f9751e809d63540c51197a4a1;hpb=04533b9cf34ce8089113015715083ee9c5b2b001

diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 70f29b998..854d3e6ea 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -1,27 +1,28 @@
 /*
     Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 /** @file  test/film_metadata_test.cc
  *  @brief Test some basic reading/writing of film metadata.
+ *  @ingroup specific
  */
 
-#include <sstream>
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/date_time.hpp>
@@ -31,36 +32,37 @@
 #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->_isdcf_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_isdcf_name ("SHR"));
+	film->set_container (Ratio::from_id ("185"));
+	film->set_j2k_bandwidth (200000000);
+	film->set_interop (false);
+	film->write_metadata ();
 
 	list<string> ignore;
 	ignore.push_back ("Key");
+	ignore.push_back ("ContextID");
 	check_xml ("test/data/metadata.xml.ref", dir.string() + "/metadata.xml", ignore);
 
 	shared_ptr<Film> g (new Film (dir));
 	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->dcp_content_type(), DCPContentType::from_isdcf_name ("SHR"));
 	BOOST_CHECK_EQUAL (g->container(), Ratio::from_id ("185"));
-	
+
 	g->write_metadata ();
 	check_xml ("test/data/metadata.xml.ref", dir.string() + "/metadata.xml", ignore);
 }