Better tidy_for_filename that doesn't screw up with UTF-8.

[dcpomatic.git] / test / util_test.cc

diff --git a/test/util_test.cc b/test/util_test.cc
index 0cbb5acd36ad8d9d535ae4f38bf4b07080ce48f0..6abc9b5e727273ca9a250939efc287e26d1e584f 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -22,16 +22,15 @@
  *  @brief Test various utility methods.
  */
 
-#include <boost/test/unit_test.hpp>
 #include "lib/util.h"
-#include "lib/raw_convert.h"
 #include "lib/exceptions.h"
+#include <boost/test/unit_test.hpp>
 
 using std::string;
 using std::vector;
 using boost::shared_ptr;
 
-BOOST_AUTO_TEST_CASE (digest_test)
+BOOST_AUTO_TEST_CASE (digest_head_tail_test)
 {
        vector<boost::filesystem::path> p;
        p.push_back ("test/data/digest.test");
@@ -55,18 +54,18 @@ BOOST_AUTO_TEST_CASE (digest_test)
 /* 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 / 2).get(), 0);
+       BOOST_CHECK_EQUAL (DCPTime(1).round_up(DCPTime::HZ / 2).get(), 2);
+       BOOST_CHECK_EQUAL (DCPTime(2).round_up(DCPTime::HZ / 2).get(), 2);
+       BOOST_CHECK_EQUAL (DCPTime(3).round_up(DCPTime::HZ / 2).get(), 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));
+       BOOST_CHECK_EQUAL (DCPTime(0).round_up(DCPTime::HZ / 42).get(), 0);
+       BOOST_CHECK_EQUAL (DCPTime(1).round_up(DCPTime::HZ / 42).get(), 42);
+       BOOST_CHECK_EQUAL (DCPTime(42).round_up(DCPTime::HZ / 42).get(), 42);
+       BOOST_CHECK_EQUAL (DCPTime(43).round_up(DCPTime::HZ / 42).get(), 84);
 
        /* Check that rounding up to non-integer frame rates works */
-       BOOST_CHECK_EQUAL (DCPTime (45312).round_up (29.976), DCPTime (48045));
+       BOOST_CHECK_EQUAL (DCPTime(45312).round_up(29.976).get(), 48045);
 }
 
 BOOST_AUTO_TEST_CASE (timecode_test)
@@ -88,8 +87,10 @@ BOOST_AUTO_TEST_CASE (seconds_to_approximate_hms_test)
        BOOST_CHECK_EQUAL (seconds_to_approximate_hms (13 * 3600 + 40 * 60), "14h");
 }
 
-BOOST_AUTO_TEST_CASE (raw_convert_test)
+BOOST_AUTO_TEST_CASE (tidy_for_filename_test)
 {
-       BOOST_CHECK_EQUAL (raw_convert<string> ("foo"), "foo");
-       BOOST_CHECK_EQUAL (raw_convert<string> ("foo bar"), "foo bar");
+       BOOST_CHECK_EQUAL (tidy_for_filename ("fish\\chips"), "fish_chips");
+       BOOST_CHECK_EQUAL (tidy_for_filename ("fish:chips\\"), "fish_chips_");
+       BOOST_CHECK_EQUAL (tidy_for_filename ("fish/chips\\"), "fish_chips_");
+       BOOST_CHECK_EQUAL (tidy_for_filename ("abcdefghï"), "abcdefghï");
 }