Try relaxing image check slightly.

[dcpomatic.git] / test / isdcf_name_test.cc

diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index de56d476e58f1c77bca05748d8c2e7f8000c7dc5..96ef5a420d681ef43703ad38bf14f51b15e12a50 100644 (file)
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -1,30 +1,36 @@
 /*
     Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+/** @file  test/isdcf_name_test.cc
+ *  @brief Test creation of ISDCF names.
+ *  @ingroup specific
+ */
+
 #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/sndfile_content.h"
 #include "lib/video_content.h"
 #include "lib/audio_mapping.h"
+#include "lib/ffmpeg_content.h"
 #include "lib/audio_content.h"
 #include "test.h"
 #include <iostream>
@@ -87,6 +93,15 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("XSN"));
        BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-133_DE-fr_US-R_4K_DI_20140704_PP_SMPTE_OV");
 
+       /* And it should always be numeric */
+
+       content->video->set_scale (VideoContentScale (Ratio::from_id ("239")));
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-239_DE-fr_US-R_4K_DI_20140704_PP_SMPTE_OV");
+
+       content->video->set_scale (VideoContentScale (Ratio::from_id ("190")));
+       BOOST_CHECK_EQUAL (film->isdcf_name(false), "MyNiceFilmWith_XSN-2_F-190_DE-fr_US-R_4K_DI_20140704_PP_SMPTE_OV");
+       content->video->set_scale (VideoContentScale (Ratio::from_id ("133")));
+
        /* Test 3D */
 
        film->set_three_d (true);
@@ -127,12 +142,12 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
        /* Test audio channel markup */
 
        film->set_audio_channels (6);
-       shared_ptr<SndfileContent> sound (new SndfileContent (film, "test/data/sine_440.wav"));
+       shared_ptr<FFmpegContent> sound (new FFmpegContent (film, "test/data/sine_440.wav"));
        film->examine_and_add_content (sound);
        wait_for_jobs ();
        BOOST_CHECK_EQUAL (film->isdcf_name(false), "LikeShouting_XSN-2_F-133_DE-fr_US-R_10_4K_DI_20140704_PP_SMPTE_OV");
 
-       AudioMapping mapping = sound->audio->audio_mapping ();
+       AudioMapping mapping = sound->audio->mapping ();
 
        mapping.set (0, dcp::LEFT, 1.0);
        sound->audio->set_mapping (mapping);