From a3fcbb3a76e079a5485a0552ea5d35b8d6739116 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 20 May 2023 22:51:49 +0200 Subject: Use sqlite for cinema and DKDM recipient lists. --- test/kdm_cli_test.cc | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'test/kdm_cli_test.cc') diff --git a/test/kdm_cli_test.cc b/test/kdm_cli_test.cc index 1c590cdf7..3fd20d478 100644 --- a/test/kdm_cli_test.cc +++ b/test/kdm_cli_test.cc @@ -20,6 +20,7 @@ #include "lib/cinema.h" +#include "lib/cinema_list.h" #include "lib/config.h" #include "lib/content_factory.h" #include "lib/cross.h" @@ -154,16 +155,16 @@ setup_test_config() auto config = Config::instance(); auto const cert = dcp::Certificate(dcp::file_to_string("test/data/cert.pem")); - auto cinema_a = std::make_shared("Dean's Screens", vector(), "", dcp::UTCOffset()); - cinema_a->add_screen(std::make_shared("Screen 1", "", cert, boost::none, std::vector())); - cinema_a->add_screen(std::make_shared("Screen 2", "", cert, boost::none, std::vector())); - cinema_a->add_screen(std::make_shared("Screen 3", "", cert, boost::none, std::vector())); - config->add_cinema(cinema_a); + CinemaList cinemas(config->cinemas_file()); - auto cinema_b = std::make_shared("Floyd's Celluloid", vector(), "", dcp::UTCOffset()); - cinema_b->add_screen(std::make_shared("Foo", "", cert, boost::none, std::vector())); - cinema_b->add_screen(std::make_shared("Bar", "", cert, boost::none, std::vector())); - config->add_cinema(cinema_b); + auto cinema_a = cinemas.add_cinema({"Dean's Screens", {}, "", dcp::UTCOffset()}); + cinemas.add_screen(cinema_a, {"Screen 1", "", cert, boost::none, {}}); + cinemas.add_screen(cinema_a, {"Screen 2", "", cert, boost::none, {}}); + cinemas.add_screen(cinema_a, {"Screen 3", "", cert, boost::none, {}}); + + auto cinema_b = cinemas.add_cinema({"Floyd's Celluloid", {}, "", dcp::UTCOffset()}); + cinemas.add_screen(cinema_b, {"Foo", "", cert, boost::none, std::vector()}); + cinemas.add_screen(cinema_b, {"Bar", "", cert, boost::none, std::vector()}); } @@ -250,7 +251,7 @@ BOOST_AUTO_TEST_CASE(kdm_cli_specify_cinemas_file) vector args = { "kdm_cli", "--cinemas-file", - "test/data/cinemas.xml", + "test/data/cinemas.sqlite3", "list-cinemas" }; @@ -259,9 +260,9 @@ BOOST_AUTO_TEST_CASE(kdm_cli_specify_cinemas_file) BOOST_CHECK(!error); BOOST_REQUIRE_EQUAL(output.size(), 3U); - BOOST_CHECK_EQUAL(output[0], "stinking dump ()"); + BOOST_CHECK_EQUAL(output[0], "Great (julie@tinyscreen.com)"); BOOST_CHECK_EQUAL(output[1], "classy joint ()"); - BOOST_CHECK_EQUAL(output[2], "Great ()"); + BOOST_CHECK_EQUAL(output[2], "stinking dump (bob@odourscreen.com, alice@whiff.com)"); } -- cgit v1.2.3