New DCPTime/ContentTime types.

[dcpomatic.git] / test / util_test.cc

diff --git a/test/util_test.cc b/test/util_test.cc
index 37dee00c90fcd0ef5714de481ee0830a74362e1c..3373bf86b59e468bed2b97736987f858cd477b54 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -54,18 +54,18 @@ BOOST_AUTO_TEST_CASE (md5_digest_test)
        BOOST_CHECK_THROW (md5_digest (p, shared_ptr<Job> ()), std::runtime_error);
 }
 
-/* Straightforward test of time_round_up_test */
-BOOST_AUTO_TEST_CASE (time_round_up_test)
+/* Straightforward test of DCPTime::round_up */
+BOOST_AUTO_TEST_CASE (dcptime_round_up_test)
 {
-       BOOST_CHECK_EQUAL (time_round_up (0, 2), 0);
-       BOOST_CHECK_EQUAL (time_round_up (1, 2), 2);
-       BOOST_CHECK_EQUAL (time_round_up (2, 2), 2);
-       BOOST_CHECK_EQUAL (time_round_up (3, 2), 4);
+       BOOST_CHECK_EQUAL (DCPTime (0).round_up (DCPTime::HZ / 2), 0);
+       BOOST_CHECK_EQUAL (DCPTime (1).round_up (DCPTime::HZ / 2), 2);
+       BOOST_CHECK_EQUAL (DCPTime (2).round_up (DCPTime::HZ / 2), 2);
+       BOOST_CHECK_EQUAL (DCPTime (3).round_up (DCPTime::HZ / 2), 4);
        
-       BOOST_CHECK_EQUAL (time_round_up (0, 42), 0);
-       BOOST_CHECK_EQUAL (time_round_up (1, 42), 42);
-       BOOST_CHECK_EQUAL (time_round_up (42, 42), 42);
-       BOOST_CHECK_EQUAL (time_round_up (43, 42), 84);
+       BOOST_CHECK_EQUAL (DCPTime (0).round_up (DCPTime::HZ / 42), 0);
+       BOOST_CHECK_EQUAL (DCPTime (1).round_up (DCPTime::HZ / 42), 42);
+       BOOST_CHECK_EQUAL (DCPTime (42).round_up (DCPTime::HZ / 42), 42);
+       BOOST_CHECK_EQUAL (DCPTime (43).round_up (DCPTime::HZ / 42), 84);
 }