Use dcp::compose rather than our own.

[dcpomatic.git] / test / cpl_hash_test.cc

diff --git a/test/cpl_hash_test.cc b/test/cpl_hash_test.cc
index f34c295831db4dc8ee0b676770ccea7ba1ec6c18..0e57d54e426702bfb4791f24d2c4ff75ec0d5db5 100644 (file)
--- a/test/cpl_hash_test.cc
+++ b/test/cpl_hash_test.cc
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (hash_added_to_imported_dcp_test)
        make_and_verify_dcp (ov);
 
        /* Remove <Hash> tags from the CPL */
-       for (auto i: directory_iterator(String::compose("build/test/%1/%2", ov_name, ov->dcp_name()))) {
+       for (auto i: directory_iterator(dcp::compose("build/test/%1/%2", ov_name, ov->dcp_name()))) {
                if (boost::algorithm::starts_with(i.path().filename().string(), "cpl_")) {
                        auto in = fopen_boost(i.path(), "r");
                        BOOST_REQUIRE (in);
@@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE (hash_added_to_imported_dcp_test)
        }
 
        string const vf_name = "hash_added_to_imported_dcp_test_vf";
-       auto ov_content = make_shared<DCPContent>(String::compose("build/test/%1/%2", ov_name, ov->dcp_name()));
+       auto ov_content = make_shared<DCPContent>(dcp::compose("build/test/%1/%2", ov_name, ov->dcp_name()));
        auto vf = new_test_film2 (
                vf_name, { ov_content }
                );
@@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE (hash_added_to_imported_dcp_test)
 
        /* Check for Hash tags in the VF DCP */
        int hashes = 0;
-       for (auto i: directory_iterator(String::compose("build/test/%1/%2", vf_name, vf->dcp_name()))) {
+       for (auto i: directory_iterator(dcp::compose("build/test/%1/%2", vf_name, vf->dcp_name()))) {
                if (boost::algorithm::starts_with(i.path().filename().string(), "cpl_")) {
                        auto in = fopen_boost(i.path(), "r");
                        BOOST_REQUIRE (in);