Merge branch '1.0' into 1.0-seek

[dcpomatic.git] / test / util_test.cc

diff --git a/test/util_test.cc b/test/util_test.cc
index 864abab295640bf36d9d6be32cf9f34cfbd99304..5733c7d03d69070b2fa195e43665c1b337f146c7 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -51,5 +51,19 @@ BOOST_AUTO_TEST_CASE (md5_digest_test)
 
        p.clear ();
        p.push_back ("foobar");
-       BOOST_CHECK_THROW (md5_digest (p, shared_ptr<Job> ()), OpenFileError);
+       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)
+{
+       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 (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);
 }