X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fkdm_cli_test.cc;h=e79e37b2d83434ef7d340ed1b7d181d19c775c6b;hb=HEAD;hp=e300d82a5a04b8b481861ebb8ca47458b22ac791;hpb=3bc8c0bd2375e8180a2745e760c91cfb59b413d7;p=dcpomatic.git

diff --git a/test/kdm_cli_test.cc b/test/kdm_cli_test.cc
index e300d82a5..e79e37b2d 100644
--- a/test/kdm_cli_test.cc
+++ b/test/kdm_cli_test.cc
@@ -21,6 +21,8 @@
 
 #include "lib/cinema.h"
 #include "lib/config.h"
+#include "lib/content_factory.h"
+#include "lib/film.h"
 #include "lib/kdm_cli.h"
 #include "lib/screen.h"
 #include "lib/trusted_device.h"
@@ -31,7 +33,6 @@
 #include <iostream>
 
 
-using std::list;
 using std::string;
 using std::vector;
 using boost::optional;
@@ -86,13 +87,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);
@@ -173,3 +174,57 @@ BOOST_AUTO_TEST_CASE(kdm_cli_select_screen)
 }
 
 
+BOOST_AUTO_TEST_CASE(kdm_cli_specify_cinemas_file)
+{
+	ConfigRestorer cr;
+
+	setup_test_config();
+
+	vector<string> args = {
+		"kdm_cli",
+		"--cinemas-file",
+		"test/data/cinemas.xml",
+		"--list-cinemas"
+	};
+
+	vector<string> output;
+	auto const error = run(args, output);
+	BOOST_CHECK(!error);
+
+	BOOST_REQUIRE_EQUAL(output.size(), 3U);
+	BOOST_CHECK_EQUAL(output[0], "stinking dump ()");
+	BOOST_CHECK_EQUAL(output[1], "classy joint ()");
+	BOOST_CHECK_EQUAL(output[2], "Great ()");
+}
+
+
+BOOST_AUTO_TEST_CASE(kdm_cli_specify_cert)
+{
+	boost::filesystem::path kdm_filename = "build/test/KDM_KDMCLI__.xml";
+
+	boost::system::error_code ec;
+	boost::filesystem::remove(kdm_filename, ec);
+
+	auto film = new_test_film2("kdm_cli_specify_cert", content_factory("test/data/flat_red.png"));
+	film->set_encrypted(true);
+	film->set_name("KDMCLI");
+	film->set_use_isdcf_name(false);
+	make_and_verify_dcp(film);
+
+	vector<string> args = {
+		"kdm_cli",
+		"--valid-from", "2024-01-01 10:10:10",
+		"--valid-duration", "2 weeks",
+		"-C", "test/data/cert.pem",
+		"-o", "build/test",
+		"build/test/kdm_cli_specify_cert"
+	};
+
+	vector<string> output;
+	auto error = run(args, output);
+	BOOST_CHECK(!error);
+
+	BOOST_CHECK(output.empty());
+	BOOST_CHECK(boost::filesystem::exists(kdm_filename));
+}
+