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

diff --git a/test/util_test.cc b/test/util_test.cc
index 5733c7d03..f5bf94c01 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,7 +29,7 @@ using std::string;
 using std::vector;
 using boost::shared_ptr;
 
-BOOST_AUTO_TEST_CASE (util_test)
+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);
@@ -54,16 +58,52 @@ BOOST_AUTO_TEST_CASE (md5_digest_test)
 	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)
+/* Straightforward test of DCPTime::round_up */
+BOOST_AUTO_TEST_CASE (dcptime_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 (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 (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 (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);
+}
+
+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");
+}
+
+BOOST_AUTO_TEST_CASE (seconds_to_approximate_hms_test)
+{
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1), "1 second");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (2), "2 seconds");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (60), "1 minute");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1.5 * 60), "1 minute 30 seconds");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (2 * 60), "2 minutes");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (17 * 60 + 20), "17 minutes");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (1 * 3600), "1 hour");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (3600 + 40 * 60), "1 hour 40 minutes");
+	BOOST_CHECK_EQUAL (seconds_to_approximate_hms (13 * 3600 + 40 * 60), "14 hours");
 }