Try again to fix windows tests.

[dcpomatic.git] / test / config_test.cc

diff --git a/test/config_test.cc b/test/config_test.cc
index 7299d98d0b7c97057410772a0c981e0cb945bf88..67c00cf41c80bb786082c4f8997d7dc5f9c2f9a6 100644 (file)
--- a/test/config_test.cc
+++ b/test/config_test.cc
@@ -31,6 +31,8 @@ rewrite_bad_config ()
        boost::system::error_code ec;
        boost::filesystem::remove ("build/test/bad_config/config.xml", ec);
 
+       Config::override_path = "build/test/bad_config";
+       boost::filesystem::create_directories ("build/test/bad_config");
        ofstream f ("build/test/bad_config/config.xml");
        f << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
          << "<Config>\n"
@@ -46,13 +48,7 @@ BOOST_AUTO_TEST_CASE (config_backup_test)
 
        Config::drop();
 
-       boost::system::error_code ec;
-       boost::filesystem::remove ("build/test/bad_config/config.xml.1", ec);
-       boost::filesystem::remove ("build/test/bad_config/config.xml.2", ec);
-       boost::filesystem::remove ("build/test/bad_config/config.xml.3", ec);
-       boost::filesystem::remove ("build/test/bad_config/config.xml.4", ec);
-       boost::filesystem::remove ("build/test/bad_config/config.xml.5", ec);
-       boost::filesystem::remove ("build/test/bad_config/config.xml.5", ec);
+       boost::filesystem::remove_all ("build/test/bad_config");
 
        rewrite_bad_config();
 
@@ -95,3 +91,21 @@ BOOST_AUTO_TEST_CASE (config_backup_test)
        */
        setup_test_config ();
 }
+
+
+BOOST_AUTO_TEST_CASE (config_write_utf8_test)
+{
+       boost::filesystem::remove_all ("build/test/config.xml");
+       boost::filesystem::copy_file ("test/data/utf8_config.xml", "build/test/config.xml");
+       Config::override_path = "build/test";
+       Config::drop ();
+       Config::instance()->write();
+
+       check_text_file ("test/data/utf8_config.xml", "build/test/config.xml");
+
+       /* This test has called Config::set_defaults(), so take us back
+          to the config that we want for our tests.
+       */
+       setup_test_config ();
+}
+