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 1f894d329537b0998600a8cb3b8211a8aa2a50c7..6abc9b5e727273ca9a250939efc287e26d1e584f 100644 (file)
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -22,10 +22,9 @@
  *  @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;
@@ -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ï");
 }