using std::make_shared;
-using std::shared_ptr;
using std::string;
-class Keep
-{
-public:
- Keep ()
- {
- _format = Config::instance()->dcp_asset_filename_format ();
- }
-
- ~Keep ()
- {
- Config::instance()->set_dcp_asset_filename_format (_format);
- }
-
-private:
- dcp::NameFormat _format;
-};
-
-
static
string
mxf_regex(string part) {
BOOST_AUTO_TEST_CASE (file_naming_test)
{
- Keep k;
+ ConfigRestorer cr;
Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat("%c"));
auto film = new_test_film ("file_naming_test");
BOOST_AUTO_TEST_CASE (file_naming_test2)
{
- Keep k;
+ ConfigRestorer cr;
+
Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat ("%c"));
auto film = new_test_film ("file_naming_test2");
BOOST_AUTO_TEST_CASE (subtitle_file_naming)
{
- Keep keep;
+ ConfigRestorer cr;
Config::instance()->set_dcp_asset_filename_format(dcp::NameFormat("%t ostrabagalous %c"));
BOOST_CHECK_EQUAL(got, 1);
}
+
+BOOST_AUTO_TEST_CASE(remove_bad_characters_from_template)
+{
+ ConfigRestorer cr;
+
+ /* %z is not recognised, so the % should be discarded so it won't trip
+ * an invalid URI check in make_and_verify_dcp
+ */
+ Config::instance()->set_dcp_asset_filename_format(dcp::NameFormat("%c%z"));
+
+ auto content = content_factory("test/data/flat_red.png");
+ auto film = new_test_film2("remove_bad_characters_from_template", content);
+ make_and_verify_dcp(
+ film,
+ {
+ dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE,
+ dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE
+ });
+}
+