X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Futil_test.cc;h=e296229e1ad3d42c3242071d731dd1e01532022a;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=5733c7d03d69070b2fa195e43665c1b337f146c7;hpb=d2926ea8574330b9c7f4efa4241843cf052652b8;p=dcpomatic.git

diff --git a/test/util_test.cc b/test/util_test.cc
index 5733c7d03..e296229e1 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,6 +17,10 @@
 
 */
 
+/** @file  test/util_test.cc
+ *  @brief Test various utility methods.
+ */
+
 #include <boost/test/unit_test.hpp>
 #include "lib/util.h"
 #include "lib/exceptions.h"
@@ -25,45 +29,59 @@ 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";
-	vector<string> b = split_at_spaces_considering_quotes (t);
-	vector<string>::iterator i = b.begin ();
-	BOOST_CHECK_EQUAL (*i++, "Hello");
-	BOOST_CHECK_EQUAL (*i++, "this");
-	BOOST_CHECK_EQUAL (*i++, "is");
-	BOOST_CHECK_EQUAL (*i++, "a");
-	BOOST_CHECK_EQUAL (*i++, "string");
-	BOOST_CHECK_EQUAL (*i++, "with quotes");
-	BOOST_CHECK_EQUAL (*i++, "and");
-	BOOST_CHECK_EQUAL (*i++, "indeed");
-	BOOST_CHECK_EQUAL (*i++, "without");
-	BOOST_CHECK_EQUAL (*i++, "them");
-}
-
 BOOST_AUTO_TEST_CASE (md5_digest_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_EQUAL (md5_digest_head_tail (p, 1024), "57497ef84a0487f2bb0939a1f5703912");
+
+	p.push_back ("test/data/md5.test2");
+	BOOST_CHECK_EQUAL (md5_digest_head_tail (p, 1024), "5a3a89857b931755ae728a518224a05c");
+
+	p.clear ();
+	p.push_back ("test/data/md5.test3");
+	p.push_back ("test/data/md5.test");
+	p.push_back ("test/data/md5.test2");
+	p.push_back ("test/data/md5.test4");
+	BOOST_CHECK_EQUAL (md5_digest_head_tail (p, 1024), "52ccf111e4e72b58bb7b2aaa6bd45ea5");
 
 	p.clear ();
 	p.push_back ("foobar");
-	BOOST_CHECK_THROW (md5_digest (p, shared_ptr<Job> ()), std::runtime_error);
+	BOOST_CHECK_THROW (md5_digest_head_tail (p, 1024), OpenFileError);
+}
+
+/* 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 (timecode_test)
+{
+	DCPTime t = DCPTime::from_seconds (2 * 60 * 60 + 4 * 60 + 31) + DCPTime::from_frames (19, 24);
+	BOOST_CHECK_EQUAL (t.timecode (24), "02:04:31:19");
 }
 
-/* Straightforward test of time_round_up_test */
-BOOST_AUTO_TEST_CASE (time_round_up_test)
+BOOST_AUTO_TEST_CASE (seconds_to_approximate_hms_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_CHECK_EQUAL (seconds_to_approximate_hms (1), "1s");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (2), "2s");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (60), "1m");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1.5 * 60), "1m 30s");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (2 * 60), "2m");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (17 * 60 + 20), "17m");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1 * 3600), "1h");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (3600 + 40 * 60), "1h 40m");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (13 * 3600 + 40 * 60), "14h");
 }