X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Futil_test.cc;h=3817a8d08d06438278670f3763546ea39511ca04;hb=81c71ecbd9106d93e5e2ce803ea924199f464d8f;hp=25b8140044afadbab3dd0f19d9e5cfcaeaf35a66;hpb=a4c19a34244aeaf183c25878933b570fc5c0ee34;p=dcpomatic.git

diff --git a/test/util_test.cc b/test/util_test.cc
index 25b814004..3817a8d08 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -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"
@@ -66,6 +70,9 @@ BOOST_AUTO_TEST_CASE (dcptime_round_up_test)
 	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,22 @@ 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");
+}
+
+BOOST_AUTO_TEST_CASE (seconds_to_approximate_hms_test)
+{
+	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");
+}