diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-09-11 00:10:22 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-10-12 09:40:36 +0200 |
| commit | 8b89649074bcaca0f0b059a2b736de404262312d (patch) | |
| tree | e25c828e64ecb5abc5c732151ff65d8737381bca /test | |
| parent | e4ee305e5af5efa0a8d5b93b602c6fc6ce56c707 (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 062c1849a..884f3cb08 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 de17df3f7bd06e08abd557d8f92a144d66303d7 +Subproject e9b91e12e1a951632f6b5fcb8909ba5203131e1 |