Cleanup: replace some list with vector.

[dcpomatic.git] / test / kdm_cli_test.cc

diff --git a/test/kdm_cli_test.cc b/test/kdm_cli_test.cc
index 107a6210adfcbd05a43fcc192f46cdfc2aad85d1..c91cb64f41f01975c3572e5f5596a55ca5e6e709 100644 (file)
--- a/test/kdm_cli_test.cc
+++ b/test/kdm_cli_test.cc
@@ -25,12 +25,12 @@
 #include "lib/screen.h"
 #include "lib/trusted_device.h"
 #include "test.h"
+#include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
 
-using std::list;
 using std::string;
 using std::vector;
 using boost::optional;
@@ -85,13 +85,13 @@ 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<Cinema>("Dean's Screens", list<string>(), "", 0, 0);
+       auto cinema_a = std::make_shared<Cinema>("Dean's Screens", vector<string>(), "", 0, 0);
        cinema_a->add_screen(std::make_shared<dcpomatic::Screen>("Screen 1", "", cert, boost::none, std::vector<TrustedDevice>()));
        cinema_a->add_screen(std::make_shared<dcpomatic::Screen>("Screen 2", "", cert, boost::none, std::vector<TrustedDevice>()));
        cinema_a->add_screen(std::make_shared<dcpomatic::Screen>("Screen 3", "", cert, boost::none, std::vector<TrustedDevice>()));
        config->add_cinema(cinema_a);
 
-       auto cinema_b = std::make_shared<Cinema>("Floyd's Celluloid", list<string>(), "", 0, 0);
+       auto cinema_b = std::make_shared<Cinema>("Floyd's Celluloid", vector<string>(), "", 0, 0);
        cinema_b->add_screen(std::make_shared<dcpomatic::Screen>("Foo", "", cert, boost::none, std::vector<TrustedDevice>()));
        cinema_b->add_screen(std::make_shared<dcpomatic::Screen>("Bar", "", cert, boost::none, std::vector<TrustedDevice>()));
        config->add_cinema(cinema_b);
@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE(kdm_cli_select_cinema)
        auto error = run(args, output);
        BOOST_CHECK(!error);
 
-       BOOST_REQUIRE_EQUAL(output.size(), 2);
+       BOOST_REQUIRE_EQUAL(output.size(), 2U);
        BOOST_CHECK(boost::algorithm::starts_with(output[0], "Making KDMs valid from"));
        BOOST_CHECK_EQUAL(output[1], "Wrote 2 KDM files to build/test");
 
@@ -164,7 +164,7 @@ BOOST_AUTO_TEST_CASE(kdm_cli_select_screen)
        auto error = run(args, output);
        BOOST_CHECK(!error);
 
-       BOOST_REQUIRE_EQUAL(output.size(), 2);
+       BOOST_REQUIRE_EQUAL(output.size(), 2U);
        BOOST_CHECK(boost::algorithm::starts_with(output[0], "Making KDMs valid from"));
        BOOST_CHECK_EQUAL(output[1], "Wrote 1 KDM files to build/test");