Replace dcp::Data with dcp::ArrayData

[dcpomatic.git] / test / digest_test.cc

diff --git a/test/digest_test.cc b/test/digest_test.cc
index a3fd6c81b89e0ed5bc948b046783ee2e595783e6..5fee9e7346bd9c02ff978383570c1672b7f9a941 100644 (file)
--- a/test/digest_test.cc
+++ b/test/digest_test.cc
@@ -70,16 +70,15 @@ BOOST_AUTO_TEST_CASE (digest_test)
        film->examine_and_add_content (g);
        film->examine_and_add_content (b);
        film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
-       wait_for_jobs ();
+       BOOST_REQUIRE (!wait_for_jobs());
 
-       Config::instance()->set_master_encoding_threads (4);
+       BOOST_CHECK (Config::instance()->master_encoding_threads() > 1);
        film->make_dcp ();
-       wait_for_jobs ();
-       Config::instance()->set_master_encoding_threads (1);
+       BOOST_REQUIRE (!wait_for_jobs());
 
        dcp::DCP dcp (film->dir (film->dcp_name ()));
        dcp.read ();
-       BOOST_CHECK_EQUAL (dcp.cpls().size(), 1);
+       BOOST_CHECK_EQUAL (dcp.cpls().size(), 1U);
        list<shared_ptr<dcp::Reel> > reels = dcp.cpls().front()->reels ();
 
        list<shared_ptr<dcp::Reel> >::const_iterator i = reels.begin ();