Fix assertion failure in AudioBuffers::copy_from() (#1909)

[dcpomatic.git] / test / file_naming_test.cc

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index 6b5b2020d77aba32120dee7e7264ba15526758b3..079026cbac85c4db1133668888289f640fe843bd 100644 (file)
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,7 +20,7 @@
 
 /** @file  test/file_naming_test.cc
  *  @brief Test how files in DCPs are named.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include "test.h"
@@ -28,11 +28,15 @@
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/dcp_content_type.h"
+#include "lib/video_content.h"
+#ifdef DCPOMATIC_WINDOWS
+#include <boost/locale.hpp>
+#endif
 #include <boost/test/unit_test.hpp>
 #include <boost/regex.hpp>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 class Keep
 {
@@ -58,6 +62,7 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
 
        shared_ptr<Film> film = new_test_film ("file_naming_test");
        film->set_name ("file_naming_test");
+       film->set_video_frame_rate (24);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
        shared_ptr<FFmpegContent> r (new FFmpegContent("test/data/flat_red.png"));
        film->examine_and_add_content (r);
@@ -67,7 +72,18 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
        film->examine_and_add_content (b);
        BOOST_REQUIRE (!wait_for_jobs());
 
-       film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
+       r->set_video_frame_rate (24);
+       r->video->set_length (24);
+       g->set_position (film, dcpomatic::DCPTime::from_seconds(1));
+       g->set_video_frame_rate (24);
+       g->video->set_length (24);
+       b->set_position (film, dcpomatic::DCPTime::from_seconds(2));
+       b->set_video_frame_rate (24);
+       b->video->set_length (24);
+
+       film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
+       film->write_metadata ();
        film->make_dcp ();
        BOOST_REQUIRE (!wait_for_jobs());
 
@@ -98,6 +114,13 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
        shared_ptr<Film> film = new_test_film ("file_naming_test2");
        film->set_name ("file_naming_test2");
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
+
+#ifdef DCPOMATIC_WINDOWS
+       /* This is necessary so that the UTF8 string constant below gets converted properly */
+       std::locale::global(boost::locale::generator().generate(""));
+       boost::filesystem::path::imbue(std::locale());
+#endif
+
        shared_ptr<FFmpegContent> r (new FFmpegContent("test/data/flät_red.png"));
        film->examine_and_add_content (r);
        shared_ptr<FFmpegContent> g (new FFmpegContent("test/data/flat_green.png"));
@@ -106,7 +129,17 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
        film->examine_and_add_content (b);
        BOOST_REQUIRE (!wait_for_jobs());
 
-       film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+       r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
+       r->set_video_frame_rate (24);
+       r->video->set_length (24);
+       g->set_position (film, dcpomatic::DCPTime::from_seconds(1));
+       g->set_video_frame_rate (24);
+       g->video->set_length (24);
+       b->set_position (film, dcpomatic::DCPTime::from_seconds(2));
+       b->set_video_frame_rate (24);
+       b->video->set_length (24);
+
+       film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
        film->make_dcp ();
        BOOST_REQUIRE (!wait_for_jobs());
 
@@ -115,7 +148,7 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
                boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->file(film->dcp_name()));
                i != boost::filesystem::directory_iterator();
                ++i) {
-               if (boost::regex_match(i->path().string(), boost::regex(".*flt_red\\.png_.*\\.mxf"))) {
+               if (boost::regex_match(i->path().string(), boost::regex(".*flat_red\\.png_.*\\.mxf"))) {
                        ++got[0];
                } else if (boost::regex_match(i->path().string(), boost::regex(".*flat_green\\.png_.*\\.mxf"))) {
                        ++got[1];