X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ffilm_metadata_test.cc;h=1f06aa538568b6a83f57f75d36410eea47a69c3e;hb=ab024ff6eff0b5dceff800189b1ad9f3f7a546f8;hp=324787f194070e7d622d7915b8449014e2716945;hpb=59404039618db5d70a2f8fc0cb8c49ae4f8ce527;p=dcpomatic.git diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc index 324787f19..1f06aa538 100644 --- a/test/film_metadata_test.cc +++ b/test/film_metadata_test.cc @@ -24,9 +24,11 @@ #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) @@ -48,9 +50,9 @@ 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 ignore; + ignore.push_back ("Key"); + check_xml ("test/data/metadata.xml.ref", test_film + "/metadata.xml", ignore); shared_ptr g (new Film (test_film)); g->read_metadata (); @@ -60,5 +62,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", test_film + "/metadata.xml", ignore); }