diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-05-16 22:17:58 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-05-16 22:17:58 +0200 |
| commit | 1aa976b08e0cb7430adeb6c243e1cb9c7b330365 (patch) | |
| tree | bb1661282fb95365fb3bcf6d2d212c8b6079b4fc | |
| parent | 9f4912aa3919c983d69bd3db2dd64dc5421a7228 (diff) | |
Some more test fixups.
| -rw-r--r-- | test/config_test.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/config_test.cc b/test/config_test.cc index 6c7a3323d..0e5f827d1 100644 --- a/test/config_test.cc +++ b/test/config_test.cc @@ -314,7 +314,7 @@ BOOST_AUTO_TEST_CASE(read_cinemas_xml_and_write_sqlite) { Editor editor(dir / "2.18" / "config.xml"); editor.replace( - "/home/realldoesnt/exist/this/path/is/nonsense.xml", + "/home/realldoesnt/exist/this/path/is/nonsense.sqlite3", boost::filesystem::canonical(dir / "cinemas.xml").string() ); } @@ -485,7 +485,7 @@ BOOST_AUTO_TEST_CASE(load_config_from_zip_with_only_xml_zip) "config.xml", boost::algorithm::replace_all_copy( dcp::file_to_string("test/data/2.18.config.xml"), - "/home/realldoesnt/exist/this/path/is/nonsense.xml", + "/home/realldoesnt/exist/this/path/is/nonsense.sqlite3", "build/test/hide/it/here/cinemas.sqlite3" ) ); @@ -509,6 +509,9 @@ BOOST_AUTO_TEST_CASE(load_config_from_zip_with_only_xml_ignore) { ConfigRestorer cr; + CinemaList cinema_list("build/test/hide/it/here/cinemas.sqlite3"); + cinema_list.add_cinema(Cinema("Foo", {}, "Bar", dcp::UTCOffset())); + boost::filesystem::path const zip = "build/test/load.zip"; boost::system::error_code ec; boost::filesystem::remove(zip, ec); @@ -528,7 +531,6 @@ BOOST_AUTO_TEST_CASE(load_config_from_zip_with_only_xml_ignore) Config::instance()->load_from_zip(zip, Config::CinemasAction::IGNORE); - CinemaList cinema_list("build/test/hide/it/here/cinemas.sqlite3"); auto cinemas = cinema_list.cinemas(); BOOST_CHECK(!cinemas.empty()); } @@ -549,7 +551,7 @@ BOOST_AUTO_TEST_CASE(use_sqlite_if_present) { Editor editor(dir / "2.18" / "config.xml"); editor.replace( - "/home/realldoesnt/exist/this/path/is/nonsense.xml", + "/home/realldoesnt/exist/this/path/is/nonsense.sqlite3", boost::filesystem::canonical(dir / "cinemas.xml").string() ); } |