summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/certificates_test.cc6
-rw-r--r--test/cpl_sar.cc4
-rw-r--r--test/dcp_test.cc2
-rw-r--r--test/encryption_test.cc22
-rw-r--r--test/error_test.cc2
-rw-r--r--test/kdm_test.cc8
-rw-r--r--test/recovery_test.cc10
-rw-r--r--test/rewrite_subs.cc10
-rw-r--r--test/round_trip_test.cc2
-rw-r--r--test/subs_in_out.cc2
-rw-r--r--test/subtitle_tests.cc2
-rw-r--r--test/util_test.cc2
12 files changed, 36 insertions, 36 deletions
diff --git a/test/certificates_test.cc b/test/certificates_test.cc
index 0a66bc66..0dfcdfa3 100644
--- a/test/certificates_test.cc
+++ b/test/certificates_test.cc
@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE (certificates)
/* Leaf */
BOOST_CHECK_EQUAL (*i, c.leaf ());
-
+
BOOST_CHECK_EQUAL (
c.leaf()->issuer(),
"dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org"
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE (certificates)
c.leaf()->subject(),
"dnQualifier=d95fGDzERNdxfYPgphvAR8A18L4=,CN=CS.smpte-430-2.LEAF.NOT_FOR_PRODUCTION,OU=example.org,O=example.org"
);
-
+
++i;
/* Intermediate */
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE (certificates)
(*i)->subject(),
"dnQualifier=bmtwThq3srgxIAeRMjX6BFhgLDw=,CN=.smpte-430-2.INTERMEDIATE.NOT_FOR_PRODUCTION,OU=example.org,O=example.org"
);
-
+
++i;
/* Root */
diff --git a/test/cpl_sar.cc b/test/cpl_sar.cc
index a878e6b4..a545a5bc 100644
--- a/test/cpl_sar.cc
+++ b/test/cpl_sar.cc
@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE (cpl_sar)
xmlpp::Document doc;
xmlpp::Element* el = doc.create_root_node ("Test");
mp->write_to_cpl (el);
-
+
cxml::Node node (el);
BOOST_CHECK_EQUAL (node.node_child("MainPicture")->string_child ("ScreenAspectRatio"), "1.85");
}
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE (cpl_sar)
xmlpp::Document doc;
xmlpp::Element* el = doc.create_root_node ("Test");
mp->write_to_cpl (el);
-
+
cxml::Node node (el);
BOOST_CHECK_EQUAL (node.node_child("MainPicture")->string_child ("ScreenAspectRatio"), "2.39");
}
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index d0c8b973..a16695c8 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE (dcp_test)
ms->set_channels (2);
ms->set_metadata (mxf_meta);
ms->create (wav);
-
+
cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (mp, ms, shared_ptr<libdcp::SubtitleAsset> ())));
d.add_cpl (cpl);
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 5980952b..4a26e8df 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (encryption)
boost::filesystem::remove_all ("build/test/signer");
boost::filesystem::create_directory ("build/test/signer");
libdcp::make_signer_chain ("build/test/signer", "openssl");
-
+
Kumu::libdcp_test = true;
libdcp::MXFMetadata mxf_metadata;
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE (encryption)
xml_metadata.issuer = "OpenDCP 0.0.25";
xml_metadata.creator = "OpenDCP 0.0.25";
xml_metadata.issue_date = "2012-07-17T04:45:18+00:00";
-
+
boost::filesystem::remove_all ("build/test/DCP/bar");
boost::filesystem::create_directories ("build/test/DCP/bar");
libdcp::DCP d ("build/test/DCP/bar");
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE (encryption)
shared_ptr<libdcp::CPL> cpl (new libdcp::CPL ("build/test/DCP/bar", "A Test DCP", libdcp::FEATURE, 24, 24));
libdcp::Key key;
-
+
shared_ptr<libdcp::MonoPictureAsset> mp (new libdcp::MonoPictureAsset ("build/test/DCP/bar", "video.mxf"));
mp->set_progress (&d.Progress);
mp->set_edit_rate (24);
@@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE (encryption)
ms->set_metadata (mxf_metadata);
ms->set_key (key);
ms->create (wav);
-
+
cpl->add_reel (shared_ptr<libdcp::Reel> (new libdcp::Reel (mp, ms, shared_ptr<libdcp::SubtitleAsset> ())));
d.add_cpl (cpl);
@@ -115,18 +115,18 @@ BOOST_AUTO_TEST_CASE (encryption)
);
kdm.as_xml ("build/test/bar.kdm.xml");
-
+
int r = system (
"xmllint --path schema --nonet --noout --schema schema/SMPTE-430-1-2006-Amd-1-2009-KDM.xsd build/test/bar.kdm.xml "
"> build/test/xmllint.log 2>&1 < /dev/null"
);
-#ifdef DCPOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0);
#else
BOOST_CHECK_EQUAL (r, 0);
-#endif
-
+#endif
+
r = system ("xmlsec1 verify "
"--pubkey-cert-pem test/ref/crypt/leaf.signed.pem "
"--trusted-pem test/ref/crypt/intermediate.signed.pem "
@@ -134,10 +134,10 @@ BOOST_AUTO_TEST_CASE (encryption)
"--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPublic "
"--id-attr:Id http://www.smpte-ra.org/schemas/430-3/2006/ETM:AuthenticatedPrivate "
"build/test/bar.kdm.xml > build/test/xmlsec1.log 2>&1 < /dev/null");
-
-#ifdef DCPOMATIC_POSIX
+
+#ifdef DCPOMATIC_POSIX
BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0);
#else
BOOST_CHECK_EQUAL (r, 0);
-#endif
+#endif
}
diff --git a/test/error_test.cc b/test/error_test.cc
index eeff4f41..854cf305 100644
--- a/test/error_test.cc
+++ b/test/error_test.cc
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE (error_test)
/* Trying to create video/audio MXFs using a non-existant file should throw an exception */
libdcp::MonoPictureAsset pa ("build/test/fred", "video.mxf");
BOOST_CHECK_THROW (pa.create (p), libdcp::FileError);
-
+
libdcp::SoundAsset sa ("build/test/fred", "audio.mxf");
sa.set_channels (1);
BOOST_CHECK_THROW (sa.create (p), libdcp::FileError);
diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index 0f0db031..4e110fc7 100644
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE (kdm_test)
);
list<libdcp::KDMKey> keys = kdm.keys ();
-
+
BOOST_CHECK_EQUAL (keys.size(), 2);
BOOST_CHECK_EQUAL (keys.front().cpl_id(), "eece17de-77e8-4a55-9347-b6bab5724b9f");
@@ -61,9 +61,9 @@ BOOST_AUTO_TEST_CASE (kdm_passthrough_test)
"xmldiff -c test/data/kdm_TONEPLATES-SMPTE-ENC_.smpte-430-2.ROOT.NOT_FOR_PRODUCTION_20130706_20230702_CAR_OV_t1_8971c838.xml build/kdm.xml"
);
-#ifdef LIBDCP_WINDOWS
+#ifdef LIBDCP_WINDOWS
BOOST_CHECK_EQUAL (r, 0);
-#else
+#else
BOOST_CHECK_EQUAL (WEXITSTATUS (r), 0);
-#endif
+#endif
}
diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index 42697c37..1a2dbfa6 100644
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -44,8 +44,8 @@ BOOST_AUTO_TEST_CASE (recovery)
#ifdef LIBDCP_POSIX
/* XXX: fix this posix-only stuff */
Kumu::ResetTestRNG ();
-#endif
-
+#endif
+
boost::filesystem::remove_all ("build/test/baz");
boost::filesystem::create_directories ("build/test/baz");
shared_ptr<libdcp::MonoPictureAsset> mp (new libdcp::MonoPictureAsset ("build/test/baz", "video1.mxf"));
@@ -74,9 +74,9 @@ BOOST_AUTO_TEST_CASE (recovery)
fclose (f);
}
-#ifdef LIBDCP_POSIX
+#ifdef LIBDCP_POSIX
Kumu::ResetTestRNG ();
-#endif
+#endif
mp.reset (new libdcp::MonoPictureAsset ("build/test/baz", "video2.mxf"));
mp->set_edit_rate (24);
@@ -92,6 +92,6 @@ BOOST_AUTO_TEST_CASE (recovery)
for (int i = 4; i < 24; ++i) {
writer->write (data, size);
}
-
+
writer->finalize ();
}
diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index 3a982d1b..eb4cad9f 100644
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -19,16 +19,16 @@ main (int argc, char* argv[])
cerr << "Syntax: " << argv[0] << " <dcp>\n";
exit (EXIT_FAILURE);
}
-
+
DCP* dcp = new DCP (argv[1]);
dcp->read (false);
-
+
list<shared_ptr<CPL> > cpls = dcp->cpls ();
for (list<boost::shared_ptr<CPL> >::iterator i = cpls.begin(); i != cpls.end(); ++i) {
-
+
list<shared_ptr<Reel> > reels = (*i)->reels ();
for (list<shared_ptr<Reel> >::iterator j = reels.begin(); j != reels.end(); ++j) {
-
+
if ((*j)->main_subtitle()) {
(*j)->main_subtitle()->write_xml ();
}
@@ -46,6 +46,6 @@ main (int argc, char* argv[])
cerr << e.what() << " when reading " << argv[1] << "\n";
exit (EXIT_FAILURE);
}
-
+
return 0;
}
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index f5a5054d..c404dd7d 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
boost::filesystem::remove_all ("build/test/signer");
boost::filesystem::create_directory ("build/test/signer");
libdcp::make_signer_chain ("build/test/signer", "openssl");
-
+
libdcp::CertificateChain chain;
chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (boost::filesystem::path ("build/test/signer/ca.self-signed.pem"))));
chain.add (shared_ptr<libdcp::Certificate> (new libdcp::Certificate (boost::filesystem::path ("build/test/signer/intermediate.signed.pem"))));
diff --git a/test/subs_in_out.cc b/test/subs_in_out.cc
index f0a7e96f..76251137 100644
--- a/test/subs_in_out.cc
+++ b/test/subs_in_out.cc
@@ -9,7 +9,7 @@ int main (int argc, char* argv[])
cerr << "Syntax: " << argv[0] << " <subtitle file>\n";
exit (EXIT_FAILURE);
}
-
+
libdcp::SubtitleAsset s ("foo", "bar", "baz");
s.read_xml (argv[1]);
cout << s.xml_as_string ();
diff --git a/test/subtitle_tests.cc b/test/subtitle_tests.cc
index 1f53b02e..ebf0ada5 100644
--- a/test/subtitle_tests.cc
+++ b/test/subtitle_tests.cc
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
libdcp::Time (0, 0, 0, 1, 250),
libdcp::Time (0, 0, 0, 1, 250)
));
-
+
s = subs.subtitles_during (libdcp::Time (0, 0, 7, 190, 250), libdcp::Time (0, 0, 7, 191, 250));
BOOST_CHECK_EQUAL (s.size(), 2);
BOOST_CHECK_EQUAL (*(s.front().get()), libdcp::Subtitle (
diff --git a/test/util_test.cc b/test/util_test.cc
index f7114e90..6cc5a12b 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -27,7 +27,7 @@ using std::string;
BOOST_AUTO_TEST_CASE (base64_decode_test)
{
int const N = 256;
-
+
ifstream f ("test/data/base64_test");
BOOST_CHECK (f.good ());
string s;
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-09 07:16:25 +0000