Merge master.

[dcpomatic.git] / test / util_test.cc

diff --git a/test/util_test.cc b/test/util_test.cc
index 18c24ac3a4135e25c75295f9f289a22baba04656..37dee00c90fcd0ef5714de481ee0830a74362e1c 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -17,7 +17,15 @@
 
 */
 
-BOOST_AUTO_TEST_CASE (util_test)
+#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 +44,40 @@ BOOST_AUTO_TEST_CASE (util_test)
 
 BOOST_AUTO_TEST_CASE (md5_digest_test)
 {
-       string const t = md5_digest ("test/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);
+}
+
+
+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);
 }