Fix incorrect issuer/creator in CPL files.

2 files changed, 53 insertions, 0 deletions

diff --git a/test/dcp_metadata_test.cc b/test/dcp_metadata_test.cc
new file mode 100644
index 000000000..67d170020
--- /dev/null
+++ b/test/dcp_metadata_test.cc
@@ -0,0 +1,52 @@
+/*
+    Copyright (C) 2021 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "lib/config.h"
+#include "lib/content_factory.h"
+#include "lib/film.h"
+#include "test.h"
+#include <dcp/cpl.h>
+#include <dcp/dcp.h>
+#include <boost/test/unit_test.hpp>
+
+
+BOOST_AUTO_TEST_CASE (dcp_metadata_test)
+{
+	auto content = content_factory("test/data/flat_red.png").front();
+	auto film = new_test_film2 ("dcp_metadata_test", { content });
+
+	Config::instance()->set_dcp_creator ("this is the creator");
+	Config::instance()->set_dcp_issuer ("this is the issuer");
+
+	make_and_verify_dcp (
+		film,
+		{ dcp::VerificationNote::Code::MISSING_CPL_METADATA }
+		);
+
+	dcp::DCP dcp (film->dir(film->dcp_name()));
+	dcp.read ();
+	auto cpls = dcp.cpls();
+	BOOST_REQUIRE_EQUAL (cpls.size(), 1U);
+
+	BOOST_CHECK_EQUAL (cpls[0]->creator(), "this is the creator");
+	BOOST_CHECK_EQUAL (cpls[0]->issuer(), "this is the issuer");
+}
+
diff --git a/test/wscript b/test/wscript
index 5774ffebf..797e5eefa 100644
--- a/test/wscript
+++ b/test/wscript
@@ -65,6 +65,7 @@ def build(bld):
                  crypto_test.cc
                  dcpomatic_time_test.cc
                  dcp_decoder_test.cc
+                 dcp_metadata_test.cc
                  dcp_playback_test.cc
                  dcp_subtitle_test.cc
                  digest_test.cc