X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ffile_naming_test.cc;h=6b5b2020d77aba32120dee7e7264ba15526758b3;hp=5bc2e6dd4116009b9dc617a7177ee37aa3030362;hb=95f4d8740de74cdecf6658ab2607c0af9732904e;hpb=1d022220899c63e2cae0a2a9a81f6c6db955a23d

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index 5bc2e6dd4..6b5b2020d 100644
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -18,35 +18,113 @@
 
 */
 
+/** @file  test/file_naming_test.cc
+ *  @brief Test how files in DCPs are named.
+ *  @ingroup specific
+ */
+
 #include "test.h"
 #include "lib/config.h"
 #include "lib/film.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/dcp_content_type.h"
 #include <boost/test/unit_test.hpp>
+#include <boost/regex.hpp>
 
+using std::string;
 using boost::shared_ptr;
 
+class Keep
+{
+public:
+	Keep ()
+	{
+		_format = Config::instance()->dcp_asset_filename_format ();
+	}
+
+	~Keep ()
+	{
+		Config::instance()->set_dcp_asset_filename_format (_format);
+	}
+
+private:
+	dcp::NameFormat _format;
+};
+
 BOOST_AUTO_TEST_CASE (file_naming_test)
 {
-	dcp::NameFormat nf ("%c");
-	Config::instance()->set_dcp_filename_format (dcp::NameFormat ("%c"));
+	Keep k;
+	Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat ("%c"));
+
 	shared_ptr<Film> film = new_test_film ("file_naming_test");
 	film->set_name ("file_naming_test");
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
-	shared_ptr<FFmpegContent> r (new FFmpegContent (film, "test/data/flat_red.png"));
+	shared_ptr<FFmpegContent> r (new FFmpegContent("test/data/flat_red.png"));
+	film->examine_and_add_content (r);
+	shared_ptr<FFmpegContent> g (new FFmpegContent("test/data/flat_green.png"));
+	film->examine_and_add_content (g);
+	shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
+	film->examine_and_add_content (b);
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film->make_dcp ();
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	int got[3] = { 0, 0, 0 };
+	for (
+		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(".*flat_red\\.png_.*\\.mxf"))) {
+			++got[0];
+		} else if (boost::regex_match(i->path().string(), boost::regex(".*flat_green\\.png_.*\\.mxf"))) {
+			++got[1];
+		} else if (boost::regex_match(i->path().string(), boost::regex(".*flat_blue\\.png_.*\\.mxf"))) {
+			++got[2];
+		}
+	}
+
+	for (int i = 0; i < 3; ++i) {
+		BOOST_CHECK (got[i] == 2);
+	}
+}
+
+BOOST_AUTO_TEST_CASE (file_naming_test2)
+{
+	Keep k;
+	Config::instance()->set_dcp_asset_filename_format (dcp::NameFormat ("%c"));
+
+	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"));
+	shared_ptr<FFmpegContent> r (new FFmpegContent("test/data/flät_red.png"));
 	film->examine_and_add_content (r);
-	shared_ptr<FFmpegContent> g (new FFmpegContent (film, "test/data/flat_green.png"));
+	shared_ptr<FFmpegContent> g (new FFmpegContent("test/data/flat_green.png"));
 	film->examine_and_add_content (g);
-	shared_ptr<FFmpegContent> b (new FFmpegContent (film, "test/data/flat_blue.png"));
+	shared_ptr<FFmpegContent> b (new FFmpegContent("test/data/flat_blue.png"));
 	film->examine_and_add_content (b);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 
 	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
 	film->make_dcp ();
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
+
+	int got[3] = { 0, 0, 0 };
+	for (
+		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"))) {
+			++got[0];
+		} else if (boost::regex_match(i->path().string(), boost::regex(".*flat_green\\.png_.*\\.mxf"))) {
+			++got[1];
+		} else if (boost::regex_match(i->path().string(), boost::regex(".*flat_blue\\.png_.*\\.mxf"))) {
+			++got[2];
+		}
+	}
 
-	BOOST_CHECK (boost::filesystem::exists (film->file (film->dcp_name() + "/flat_red.png.mxf")));
-	BOOST_CHECK (boost::filesystem::exists (film->file (film->dcp_name() + "/flat_green.png.mxf")));
-	BOOST_CHECK (boost::filesystem::exists (film->file (film->dcp_name() + "/flat_blue.png.mxf")));
+	for (int i = 0; i < 3; ++i) {
+		BOOST_CHECK (got[i] == 2);
+	}
 }