Cleanup: rename _empty_condition -> _schedule_condition

[dcpomatic.git] / test / file_naming_test.cc

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index 069b1d825dea998af1a69ca5f6453688b0035a88..7175e209ab2a81195530da655bba3e9fc48f1e96 100644 (file)
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -62,6 +62,19 @@ private:
 };
 
 
+static
+string
+mxf_regex(string part) {
+#ifdef DCPOMATIC_WINDOWS
+       /* Windows replaces . in filenames with _ */
+       return String::compose(".*flat_%1_png_.*\\.mxf", part);
+#else
+       return String::compose(".*flat_%1\\.png_.*\\.mxf", part);
+#endif
+};
+
+
+
 BOOST_AUTO_TEST_CASE (file_naming_test)
 {
        Keep k;
@@ -80,13 +93,13 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
        BOOST_REQUIRE (!wait_for_jobs());
 
        r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
-       r->set_video_frame_rate (24);
+       r->set_video_frame_rate(film, 24);
        r->video->set_length (24);
        g->set_position (film, dcpomatic::DCPTime::from_seconds(1));
-       g->set_video_frame_rate (24);
+       g->set_video_frame_rate(film, 24);
        g->video->set_length (24);
        b->set_position (film, dcpomatic::DCPTime::from_seconds(2));
-       b->set_video_frame_rate (24);
+       b->set_video_frame_rate(film, 24);
        b->video->set_length (24);
 
        film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
@@ -100,11 +113,11 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
 
        int got[3] = { 0, 0, 0 };
        for (auto i: boost::filesystem::directory_iterator(film->file(film->dcp_name()))) {
-               if (boost::regex_match(i.path().string(), boost::regex(".*flat_red\\.png_.*\\.mxf"))) {
+               if (boost::regex_match(i.path().string(), boost::regex(mxf_regex("red")))) {
                        ++got[0];
-               } else if (boost::regex_match(i.path().string(), boost::regex(".*flat_green\\.png_.*\\.mxf"))) {
+               } else if (boost::regex_match(i.path().string(), boost::regex(mxf_regex("green")))) {
                        ++got[1];
-               } else if (boost::regex_match(i.path().string(), boost::regex(".*flat_blue\\.png_.*\\.mxf"))) {
+               } else if (boost::regex_match(i.path().string(), boost::regex(mxf_regex("blue")))) {
                        ++got[2];
                }
        }
@@ -139,13 +152,13 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
        BOOST_REQUIRE (!wait_for_jobs());
 
        r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
-       r->set_video_frame_rate (24);
+       r->set_video_frame_rate(film, 24);
        r->video->set_length (24);
        g->set_position (film, dcpomatic::DCPTime::from_seconds(1));
-       g->set_video_frame_rate (24);
+       g->set_video_frame_rate(film, 24);
        g->video->set_length (24);
        b->set_position (film, dcpomatic::DCPTime::from_seconds(2));
-       b->set_video_frame_rate (24);
+       b->set_video_frame_rate(film, 24);
        b->video->set_length (24);
 
        film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
@@ -158,11 +171,11 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
 
        int got[3] = { 0, 0, 0 };
        for (auto i: boost::filesystem::directory_iterator (film->file(film->dcp_name()))) {
-               if (boost::regex_match(i.path().string(), boost::regex(".*flat_red\\.png_.*\\.mxf"))) {
+               if (boost::regex_match(i.path().string(), boost::regex(mxf_regex("red")))) {
                        ++got[0];
-               } else if (boost::regex_match(i.path().string(), boost::regex(".*flat_green\\.png_.*\\.mxf"))) {
+               } else if (boost::regex_match(i.path().string(), boost::regex(mxf_regex("green")))) {
                        ++got[1];
-               } else if (boost::regex_match(i.path().string(), boost::regex(".*flat_blue\\.png_.*\\.mxf"))) {
+               } else if (boost::regex_match(i.path().string(), boost::regex(mxf_regex("blue")))) {
                        ++got[2];
                }
        }