Remove some unused code.

[dcpomatic.git] / test / util_test.cc

diff --git a/test/util_test.cc b/test/util_test.cc
index 25b8140044afadbab3dd0f19d9e5cfcaeaf35a66..43b7b9b1dde09c8a57beb932a7511ea76d720ff9 100644 (file)
--- 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"
@@ -25,23 +29,6 @@ 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);
-       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;
@@ -66,18 +53,26 @@ 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));
+}
 
-BOOST_AUTO_TEST_CASE (divide_with_round_test)
+BOOST_AUTO_TEST_CASE (timecode_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);
+       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_CHECK_EQUAL (divide_with_round (1000, 500), 2);
+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");
 }