X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fisdcf_name_test.cc;h=3ccfd7d9a006925acb358f8794b2db63872e9979;hp=d3227f636ee5ba57d75e71ef40841d73dc1ae49e;hb=dacf46c8aa5b399a7d51c9d0808869af9b73791c;hpb=e6d7b6d8520c7454ecf67df7269056a16d0e2b70

diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index d3227f636..3ccfd7d9a 100644
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -25,22 +25,20 @@
  */
 
 
-#include <boost/test/unit_test.hpp>
-#include "lib/film.h"
-#include "lib/ratio.h"
-#include "lib/dcp_content_type.h"
-#include "lib/image_content.h"
-#include "lib/video_content.h"
-#include "lib/audio_mapping.h"
-#include "lib/ffmpeg_content.h"
 #include "lib/audio_content.h"
+#include "lib/audio_mapping.h"
 #include "lib/content_factory.h"
+#include "lib/dcp_content_type.h"
+#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
+#include "lib/image_content.h"
+#include "lib/ratio.h"
 #include "lib/text_content.h"
+#include "lib/video_content.h"
 #include "test.h"
-#include <iostream>
+#include <boost/test/unit_test.hpp>
 
 
-using std::cout;
 using std::make_shared;
 using std::shared_ptr;
 using std::string;
@@ -56,7 +54,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->_isdcf_date = boost::gregorian::date (2014, boost::gregorian::Jul, 4);
-	auto audio = content_factory("test/data/sine_440.wav").front();
+	auto audio = content_factory("test/data/sine_440.wav")[0];
 	film->examine_and_add_content (audio);
 	BOOST_REQUIRE (!wait_for_jobs());
 	film->set_audio_language(dcp::LanguageTag("en-US"));
@@ -80,7 +78,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	film->_isdcf_date = boost::gregorian::date (2014, boost::gregorian::Jul, 4);
 	film->set_audio_channels (1);
 	film->set_resolution (Resolution::FOUR_K);
-	auto text = content_factory("test/data/subrip.srt").front();
+	auto text = content_factory("test/data/subrip.srt")[0];
 	BOOST_REQUIRE_EQUAL (text->text.size(), 1U);
 	text->text.front()->set_burn (true);
 	text->text.front()->set_language (dcp::LanguageTag("fr-FR"));
@@ -91,16 +89,16 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	film->set_studio (string("di"));
 	film->set_facility (string("ppfacility"));
 	BOOST_REQUIRE (!wait_for_jobs());
-	audio = content_factory("test/data/sine_440.wav").front();
+	audio = content_factory("test/data/sine_440.wav")[0];
 	film->examine_and_add_content (audio);
 	BOOST_REQUIRE (!wait_for_jobs());
 	film->set_audio_language (dcp::LanguageTag("de-DE"));
 	film->set_interop (false);
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_TLR-2_S_DE-fr_US-R_MOS_4K_DI_20140704_PPF_SMPTE_OV");
 
-	/* Test to see that RU ratings like 6+ survive */
+	/* Test to see that RU ratings like 6+ are stripped of their + */
 	film->set_ratings({dcp::Rating("RARS", "6+")});
-	BOOST_CHECK_EQUAL (film->dcp_name(false), "MyNiceFilmWith_TLR-2_S_DE-fr_US-6+_MOS_4K_DI_20140704_PPF_SMPTE_OV");
+	BOOST_CHECK_EQUAL (film->dcp_name(false), "MyNiceFilmWith_TLR-2_S_DE-fr_US-6_MOS_4K_DI_20140704_PPF_SMPTE_OV");
 	film->set_ratings({dcp::Rating("MPA", "R")});
 
 	/* Test interior aspect ratio: shouldn't be shown with trailers */
@@ -234,5 +232,20 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 	/* Check that the proper codes are used, not just part of the language code; in this case, QBP instead of PT (#2235) */
 	film->set_audio_language(dcp::LanguageTag("pt-BR"));
 	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_QBP-fr_US-R_71-HI-VI_4K_DI_20140704_PPF_SMPTE_OV");
+
+	/* Check that nothing is added for non-existant ratings */
+	film->set_ratings({});
+	BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_QBP-fr_US_71-HI-VI_4K_DI_20140704_PPF_SMPTE_OV");
+}
+
+
+BOOST_AUTO_TEST_CASE(isdcf_name_with_atmos)
+{
+	auto content = content_factory(TestPaths::private_data() / "atmos_asset.mxf");
+	auto film = new_test_film2("isdcf_name_with_atmos", content);
+	film->_isdcf_date = boost::gregorian::date(2023, boost::gregorian::Jan, 18);
+	film->set_name("Hello");
+
+	BOOST_CHECK_EQUAL(film->isdcf_name(false), "Hello_TST-1_F_XX-XX_MOS-IAB_2K_20230118_SMPTE_OV");
 }