Fix incorrect sign on boost test constants.

[dcpomatic.git] / test / import_dcp_test.cc

diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 83dd0c6de043b8b35803e6b65987e3d1109fae38..2f33f93f55c3f66c3dada323cdcbe9823a6397ee 100644 (file)
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
        BOOST_REQUIRE (!wait_for_jobs());
        film2->write_metadata ();
 
-       BOOST_CHECK_EQUAL (imported->markers().size(), 3);
+       BOOST_CHECK_EQUAL (imported->markers().size(), 3U);
 
        map<dcp::Marker, dcpomatic::ContentTime> markers = imported->markers();
        BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());
@@ -138,11 +138,11 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
        /* Load that film and check that the markers have been loaded */
        shared_ptr<Film> film3(new Film(boost::filesystem::path("build/test/import_dcp_markers_test2")));
        film3->read_metadata ();
-       BOOST_REQUIRE (film3->content().size() == 1);
+       BOOST_REQUIRE_EQUAL (film3->content().size(), 1U);
        shared_ptr<DCPContent> reloaded = dynamic_pointer_cast<DCPContent>(film3->content().front());
        BOOST_REQUIRE (reloaded);
 
-       BOOST_CHECK_EQUAL (reloaded->markers().size(), 3);
+       BOOST_CHECK_EQUAL (reloaded->markers().size(), 3U);
 
        markers = reloaded->markers();
        BOOST_REQUIRE(markers.find(dcp::FFOC) != markers.end());
@@ -170,7 +170,9 @@ BOOST_AUTO_TEST_CASE (import_dcp_metadata_test)
        ratings.push_back (dcp::Rating("MPAA", "NC-17"));
        film->set_ratings (ratings);
 
-       film->set_content_version ("Fred");
+       vector<string> cv;
+       cv.push_back ("Fred");
+       film->set_content_versions (cv);
 
        film->make_dcp ();
        BOOST_REQUIRE (!wait_for_jobs());
@@ -183,16 +185,16 @@ BOOST_AUTO_TEST_CASE (import_dcp_metadata_test)
        film2->write_metadata ();
 
        BOOST_CHECK (imported->ratings() == ratings);
-       BOOST_CHECK_EQUAL (imported->content_version(), "Fred");
+       BOOST_CHECK (imported->content_versions() == cv);
 
        /* Load that film and check that the metadata has been loaded */
        shared_ptr<Film> film3(new Film(boost::filesystem::path("build/test/import_dcp_metadata_test2")));
        film3->read_metadata ();
-       BOOST_REQUIRE (film3->content().size() == 1);
+       BOOST_REQUIRE_EQUAL (film3->content().size(), 1U);
        shared_ptr<DCPContent> reloaded = dynamic_pointer_cast<DCPContent>(film3->content().front());
        BOOST_REQUIRE (reloaded);
 
        BOOST_CHECK (reloaded->ratings() == ratings);
-       BOOST_CHECK_EQUAL (reloaded->content_version(), "Fred");
+       BOOST_CHECK (reloaded->content_versions() == cv);
 }