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

diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 423bc4ccc..854d3e6ea 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -1,24 +1,26 @@
 /*
     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 <boost/test/unit_test.hpp>
@@ -43,20 +45,22 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	BOOST_CHECK (film->dcp_content_type() == 0);
 
 	film->set_name ("fred");
-	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Short"));
+	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 ();