X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Futil_test.cc;h=5eb3e27f185a70039edf090f39ee19160b131650;hb=233bb3f790aef3c8f9a7a7fde9875833b7dc1dfb;hp=f75fd0e70efd8b05e4654d4f650e7d10f121a7db;hpb=a183c1776cfd020a37d028ebb0f641352f49697b;p=dcpomatic.git

diff --git a/test/util_test.cc b/test/util_test.cc
index f75fd0e70..5eb3e27f1 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,19 @@
 
 */
 
-BOOST_AUTO_TEST_CASE (util_test)
+/** @file  test/util_test.cc
+ *  @brief Test various utility methods.
+ */
+
+#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 (split_at_spaces_considering_quotes_test)
 {
 	string t = "Hello this is a string \"with quotes\" and indeed without them";
 	vector<string> b = split_at_spaces_considering_quotes (t);
@@ -36,8 +48,43 @@ 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 DCPTime::round_up */
+BOOST_AUTO_TEST_CASE (dcptime_round_up_test)
+{
+	BOOST_CHECK_EQUAL (DCPTime (0).round_up (DCPTime::HZ / 2), DCPTime (0));
+	BOOST_CHECK_EQUAL (DCPTime (1).round_up (DCPTime::HZ / 2), DCPTime (2));
+	BOOST_CHECK_EQUAL (DCPTime (2).round_up (DCPTime::HZ / 2), DCPTime (2));
+	BOOST_CHECK_EQUAL (DCPTime (3).round_up (DCPTime::HZ / 2), DCPTime (4));
+	
+	BOOST_CHECK_EQUAL (DCPTime (0).round_up (DCPTime::HZ / 42), DCPTime (0));
+	BOOST_CHECK_EQUAL (DCPTime (1).round_up (DCPTime::HZ / 42), DCPTime (42));
+	BOOST_CHECK_EQUAL (DCPTime (42).round_up (DCPTime::HZ / 42), DCPTime (42));
+	BOOST_CHECK_EQUAL (DCPTime (43).round_up (DCPTime::HZ / 42), DCPTime (84));
+
+	/* Check that rounding up to non-integer frame rates works */
+	BOOST_CHECK_EQUAL (DCPTime (45312).round_up (29.976), DCPTime (48045));
+}
+
+
+BOOST_AUTO_TEST_CASE (divide_with_round_test)
+{
+	BOOST_CHECK_EQUAL (divide_with_round (0, 4), 0);
+	BOOST_CHECK_EQUAL (divide_with_round (1, 4), 0);
+	BOOST_CHECK_EQUAL (divide_with_round (2, 4), 1);
+	BOOST_CHECK_EQUAL (divide_with_round (3, 4), 1);
+	BOOST_CHECK_EQUAL (divide_with_round (4, 4), 1);
+	BOOST_CHECK_EQUAL (divide_with_round (5, 4), 1);
+	BOOST_CHECK_EQUAL (divide_with_round (6, 4), 2);
+
+	BOOST_CHECK_EQUAL (divide_with_round (1000, 500), 2);
 }