Merge branch 'master' into 2.0

[dcpomatic.git] / test / util_test.cc

diff --git a/test/util_test.cc b/test/util_test.cc
index f75fd0e70efd8b05e4654d4f650e7d10f121a7db..5733c7d03d69070b2fa195e43665c1b337f146c7 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -17,6 +17,14 @@
 
 */
 
+#include <boost/test/unit_test.hpp>
+#include "lib/util.h"
+#include "lib/exceptions.h"
+
+using std::string;
+using std::vector;
+using boost::shared_ptr;
+
 BOOST_AUTO_TEST_CASE (util_test)
 {
        string t = "Hello this is a string \"with quotes\" and indeed without them";
@@ -36,8 +44,26 @@ BOOST_AUTO_TEST_CASE (util_test)
 
 BOOST_AUTO_TEST_CASE (md5_digest_test)
 {
-       string const t = md5_digest ("test/data/md5.test");
+       vector<boost::filesystem::path> p;
+       p.push_back ("test/data/md5.test");
+       string const t = md5_digest (p, shared_ptr<Job> ());
        BOOST_CHECK_EQUAL (t, "15058685ba99decdc4398c7634796eb0");
 
-       BOOST_CHECK_THROW (md5_digest ("foobar"), OpenFileError);
+       p.clear ();
+       p.push_back ("foobar");
+       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);
 }