diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-09-11 00:10:22 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-01-28 02:01:22 +0100 |
| commit | 591c89275bfa26c3b2e1b0f1926909fc4bf5b219 (patch) | |
| tree | 75dd0838141b38081bc754f6b88d4c56f7f5b083 /test | |
| parent | d0e74dea9d189187d456173702a54a3b3c72aca0 (diff) | |
Normalise XML attribute names to be camelCase (#2241).
Diffstat (limited to 'test')
| -rw-r--r-- | test/config_test.cc | 7 | ||||
| m--------- | test/data | 0 |
2 files changed, 6 insertions, 1 deletions
diff --git a/test/config_test.cc b/test/config_test.cc index 1a505d357..a43bb5ff6 100644 --- a/test/config_test.cc +++ b/test/config_test.cc @@ -208,7 +208,11 @@ BOOST_AUTO_TEST_CASE (config_upgrade_test2) boost::filesystem::remove_all (dir); boost::filesystem::create_directories (dir); +#ifdef DCPOMATIC_WINDOWS + boost::filesystem::copy_file("test/data/2.16.config.windows.xml", dir / "config.xml"); +#else boost::filesystem::copy_file("test/data/2.16.config.xml", dir / "config.xml"); +#endif boost::filesystem::copy_file("test/data/2.14.cinemas.xml", dir / "cinemas.xml"); Config::instance(); try { @@ -216,13 +220,14 @@ BOOST_AUTO_TEST_CASE (config_upgrade_test2) Config::instance()->write(); } catch (...) {} - check_xml(dir / "config.xml", "test/data/2.16.config.xml", {}); check_xml(dir / "cinemas.xml", "test/data/2.14.cinemas.xml", {}); #ifdef DCPOMATIC_WINDOWS /* This file has the windows path for dkdm_recipients.xml (with backslashes) */ check_xml(dir / "2.18" / "config.xml", "test/data/2.18.config.windows.xml", {}); + check_xml(dir / "config.xml", "test/data/2.16.config.windows.xml", {}); #else check_xml(dir / "2.18" / "config.xml", "test/data/2.18.config.xml", {}); + check_xml(dir / "config.xml", "test/data/2.16.config.xml", {}); #endif /* cinemas.xml is not copied into 2.18 as its format has not changed */ BOOST_REQUIRE (!boost::filesystem::exists(dir / "2.18" / "cinemas.xml")); diff --git a/test/data b/test/data -Subproject 6deec5088d1ab9916bf398c1380b53ba1887fe2 +Subproject da24c365d44d1053ca8a0276f22ba55e12d2037 |