summaryrefslogtreecommitdiff
path: root/test/verify_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'test/verify_test.cc')
-rw-r--r--test/verify_test.cc140
1 files changed, 70 insertions, 70 deletions
diff --git a/test/verify_test.cc b/test/verify_test.cc
index d8a259ac..4c2cb5d3 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -118,9 +118,9 @@ prepare_directory (path path)
static path
setup (int reference_number, string verify_test_suffix)
{
- auto const dir = dcp::String::compose("build/test/verify_test%1", verify_test_suffix);
+ auto const dir = dcp::compose("build/test/verify_test%1", verify_test_suffix);
prepare_directory (dir);
- for (auto i: directory_iterator(dcp::String::compose("test/ref/DCP/dcp_test%1", reference_number))) {
+ for (auto i: directory_iterator(dcp::compose("test/ref/DCP/dcp_test%1", reference_number))) {
copy_file (i.path(), dir / i.path().filename());
}
@@ -141,8 +141,8 @@ write_dcp_with_single_asset (path dir, shared_ptr<dcp::ReelAsset> reel_asset, dc
auto dcp = make_shared<dcp::DCP>(dir);
dcp->add (cpl);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"hello"
);
@@ -399,7 +399,7 @@ static
path
cpl (string suffix)
{
- return dcp::String::compose("build/test/verify_test%1/%2", suffix, dcp_test1_cpl);
+ return dcp::compose("build/test/verify_test%1/%2", suffix, dcp_test1_cpl);
}
@@ -407,7 +407,7 @@ static
path
pkl (string suffix)
{
- return dcp::String::compose("build/test/verify_test%1/%2", suffix, dcp_test1_pkl);
+ return dcp::compose("build/test/verify_test%1/%2", suffix, dcp_test1_pkl);
}
@@ -415,7 +415,7 @@ static
path
asset_map (string suffix)
{
- return dcp::String::compose("build/test/verify_test%1/ASSETMAP.xml", suffix);
+ return dcp::compose("build/test/verify_test%1/ASSETMAP.xml", suffix);
}
@@ -814,8 +814,8 @@ BOOST_AUTO_TEST_CASE (verify_valid_cpl_metadata)
dcp::DCP dcp (dir);
dcp.add (cpl);
dcp.write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"hello"
);
@@ -858,8 +858,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_bad_tag)
dcp::DCP dcp (dir);
dcp.add (cpl);
dcp.write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"hello"
);
@@ -909,8 +909,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_cpl_metadata_missing_tag)
dcp::DCP dcp (dir);
dcp.add (cpl);
dcp.write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"hello"
);
@@ -1002,8 +1002,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language3)
auto dcp = make_shared<dcp::DCP>(dir);
dcp->add (cpl);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"hello"
);
@@ -1068,8 +1068,8 @@ check_picture_size (int width, int height, int frame_rate, bool three_d)
d->add (cpl);
d->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -1237,7 +1237,7 @@ make_large_subtitle_asset (path font_file)
dcp::ArrayData big_fake_font(1024 * 1024);
big_fake_font.write (font_file);
for (int i = 0; i < 116; ++i) {
- asset->add_font (dcp::String::compose("big%1", i), big_fake_font);
+ asset->add_font (dcp::compose("big%1", i), big_fake_font);
}
return asset;
}
@@ -1313,8 +1313,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
dcp->cpls()[0]->reels()[0]->add(reel_subs);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -1354,8 +1354,8 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
}
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -1396,8 +1396,8 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
}
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -1448,8 +1448,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
dcp->cpls()[0]->reels()[0]->add(reel_subs);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -1501,8 +1501,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
dcp->cpls().front()->reels().front()->add(reel_subs);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -1612,8 +1612,8 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
auto dcp = make_shared<dcp::DCP>(dir);
dcp->add (cpl);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"hello"
);
@@ -1906,8 +1906,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_sound_frame_rate)
auto dcp = make_shared<dcp::DCP>(dir);
dcp->add (cpl);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"hello"
);
@@ -1926,8 +1926,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_annotation_text)
path const dir("build/test/verify_missing_cpl_annotation_text");
auto dcp = make_simple (dir);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -1956,8 +1956,8 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_cpl_annotation_text)
path const dir("build/test/verify_mismatched_cpl_annotation_text");
auto dcp = make_simple (dir);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2000,8 +2000,8 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_asset_duration)
dcp->add (cpl);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2065,8 +2065,8 @@ verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool a
dcp->add (cpl);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2151,8 +2151,8 @@ verify_closed_captions_must_be_in_all_reels_check (path dir, int caps_in_reel1,
dcp->add (cpl);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2219,8 +2219,8 @@ verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost
dcp->add (cpl);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2277,8 +2277,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_hash)
path const dir("build/test/verify_missing_hash");
auto dcp = make_simple (dir);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2320,8 +2320,8 @@ verify_markers_test (
}
dcp->cpls()[0]->reels()[0]->add(markers_asset);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2421,8 +2421,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_cpl_metadata_version_number)
auto cpl = dcp->cpls()[0];
cpl->unset_version_number();
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2436,8 +2436,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata1)
path dir = "build/test/verify_missing_extension_metadata1";
auto dcp = make_simple (dir);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2463,8 +2463,8 @@ BOOST_AUTO_TEST_CASE (verify_missing_extension_metadata2)
path dir = "build/test/verify_missing_extension_metadata2";
auto dcp = make_simple (dir);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2490,8 +2490,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata3)
path dir = "build/test/verify_invalid_xml_cpl_extension_metadata3";
auto dcp = make_simple (dir);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2519,8 +2519,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata1)
path dir = "build/test/verify_invalid_extension_metadata1";
auto dcp = make_simple (dir);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2546,8 +2546,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_extension_metadata2)
path dir = "build/test/verify_invalid_extension_metadata2";
auto dcp = make_simple (dir);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2573,8 +2573,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata6)
path dir = "build/test/verify_invalid_xml_cpl_extension_metadata6";
auto dcp = make_simple (dir);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2602,8 +2602,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata7)
path dir = "build/test/verify_invalid_xml_cpl_extension_metadata7";
auto dcp = make_simple (dir);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2629,8 +2629,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata8)
path dir = "build/test/verify_invalid_xml_cpl_extension_metadata8";
auto dcp = make_simple (dir);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2658,8 +2658,8 @@ BOOST_AUTO_TEST_CASE (verify_invalid_xml_cpl_extension_metadata9)
path dir = "build/test/verify_invalid_xml_cpl_extension_metadata9";
auto dcp = make_simple (dir);
dcp->write_xml (
- dcp::String::compose("libdcp %1", dcp::version),
- dcp::String::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
+ dcp::compose("libdcp %1", dcp::version),
dcp::LocalTime().as_string(),
"A Test DCP"
);
@@ -2884,7 +2884,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_resource_id)
auto subs_mxf = dir / "subs.mxf";
auto r = writer.OpenWrite(subs_mxf.c_str(), writer_info, descriptor, 4096);
BOOST_REQUIRE (ASDCP_SUCCESS(r));
- writer.WriteTimedTextResource (dcp::String::compose(
+ writer.WriteTimedTextResource (dcp::compose(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
"<Id>urn:uuid:%1</Id>"
@@ -2948,7 +2948,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_timed_text_id)
auto subs_mxf = dir / "subs.mxf";
auto r = writer.OpenWrite(subs_mxf.c_str(), writer_info, descriptor, 4096);
BOOST_REQUIRE (ASDCP_SUCCESS(r));
- writer.WriteTimedTextResource (dcp::String::compose(
+ writer.WriteTimedTextResource (dcp::compose(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/schema\">"
"<Id>urn:uuid:%1</Id>"
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-06 03:32:33 +0000