X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fmarkers_test.cc;h=844f25660a34d82d4c7aea3330632f90fa197ec1;hb=9dbf21fd28991898e61020de0809497999282562;hp=a0f6482a8abc5d930d448843255860fdd85fa96f;hpb=0e3aa9dd0494d5799fa3b18be943fe14c7bbf0f3;p=dcpomatic.git

diff --git a/test/markers_test.cc b/test/markers_test.cc
index a0f6482a8..844f25660 100644
--- a/test/markers_test.cc
+++ b/test/markers_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -49,8 +49,7 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test1)
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->set_interop (false);
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (film);
 
 	dcp::DCP dcp (String::compose("build/test/%1/%2", name, film->dcp_name()));
 	dcp.read ();
@@ -63,7 +62,7 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test1)
 
 	auto ffoc = markers->get (dcp::Marker::FFOC);
 	BOOST_REQUIRE (ffoc);
-	BOOST_CHECK (*ffoc == dcp::Time (0, 0, 0, 0, 24));
+	BOOST_CHECK (*ffoc == dcp::Time(0, 0, 0, 1, 24));
 	auto lfoc = markers->get (dcp::Marker::LFOC);
 	BOOST_REQUIRE (lfoc);
 	BOOST_CHECK (*lfoc == dcp::Time(0, 0, 9, 23, 24));
@@ -81,8 +80,12 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test2)
 	film->set_interop (false);
 	film->set_marker (dcp::Marker::FFOC, dcpomatic::DCPTime::from_seconds(1));
 	film->set_marker (dcp::Marker::LFOC, dcpomatic::DCPTime::from_seconds(9));
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (
+		film,
+		{
+			dcp::VerificationNote::Code::INCORRECT_FFOC,
+			dcp::VerificationNote::Code::INCORRECT_LFOC
+		});
 
 	dcp::DCP dcp (String::compose("build/test/%1/%2", name, film->dcp_name()));
 	dcp.read ();