Extract run() method to call kdm_cli().

[dcpomatic.git] / test / kdm_cli_test.cc

diff --git a/test/kdm_cli_test.cc b/test/kdm_cli_test.cc
index 404f7f8d1508161272b2f293f42528c1e8c07867..52b0316235a77a6ee0ff82ba0da0bef132e52a36 100644 (file)
--- a/test/kdm_cli_test.cc
+++ b/test/kdm_cli_test.cc
@@ -20,12 +20,28 @@
 
 
 #include "lib/kdm_cli.h"
+#include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
 
 using std::string;
 using std::vector;
+optional<string>
+run(vector<string> const& args, vector<string>& output)
+{
+       std::vector<char*> argv(args.size());
+       for (auto i = 0U; i < args.size(); ++i) {
+               argv[i] = const_cast<char*>(args[i].c_str());
+       }
+
+       auto error = kdm_cli(args.size(), argv.data(), [&output](string s) { output.push_back(s); });
+       if (error) {
+               std::cout << *error << "\n";
+       }
+
+       return error;
+}
 
 
 BOOST_AUTO_TEST_CASE (kdm_cli_test_certificate)
@@ -36,20 +52,20 @@ BOOST_AUTO_TEST_CASE (kdm_cli_test_certificate)
                "--valid-from", "now",
                "--valid-duration", "2 weeks",
                "--certificate", "test/data/cert.pem",
+               "-S", "my great screen",
+               "-o", "build/test",
                "test/data/dkdm.xml"
        };
 
-       char** argv = new char*[args.size()];
-       for (auto i = 0U; i < args.size(); ++i) {
-               argv[i] = const_cast<char*>(args[i].c_str());
-       }
+       boost::filesystem::path const kdm_filename = "build/test/KDM_Test_FTR-1_F-133_XX-XX_MOS_2K_20220109_SMPTE_OV__my_great_screen.xml";
+       boost::system::error_code ec;
+       boost::filesystem::remove(kdm_filename, ec);
 
-       auto error = kdm_cli (args.size(), argv, [](string s) { std::cout << s << "\n"; });
-       if (error) {
-               std::cout << *error << "\n";
-       }
+       vector<string> output;
+       auto error = run(args, output);
        BOOST_CHECK (!error);
 
-       delete[] argv;
+       BOOST_CHECK(boost::filesystem::exists(kdm_filename));
+
 }