X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Futil_test.cc;h=39cc0e6bf7df07956b56191e88af6465ee92db71;hb=f1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef;hp=37dee00c90fcd0ef5714de481ee0830a74362e1c;hpb=1629bd7df2150156109afbc7a16677cb29e82adf;p=dcpomatic.git

diff --git a/test/util_test.cc b/test/util_test.cc
index 37dee00c9..39cc0e6bf 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"
@@ -54,18 +58,21 @@ 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));
 }
 
 
@@ -81,3 +88,9 @@ BOOST_AUTO_TEST_CASE (divide_with_round_test)
 
 	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");
+}