Update test after change to video identifiers.
[dcpomatic.git] / test / recover_test.cc
index cb5c26858192fa09b45b419b02f76e061c371cfe..07b38083829aedb80853691f751ddf9844a64f5e 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
  */
 
 #include <boost/test/unit_test.hpp>
-#include <dcp/stereo_picture_mxf.h>
+#include <dcp/stereo_picture_asset.h>
 #include "lib/film.h"
 #include "lib/dcp_content_type.h"
 #include "lib/image_content.h"
@@ -51,13 +51,13 @@ BOOST_AUTO_TEST_CASE (recover_test)
 
        shared_ptr<ImageContent> content (new ImageContent (film, "test/data/3d_test"));
        content->set_video_frame_type (VIDEO_FRAME_TYPE_3D_LEFT_RIGHT);
-       film->examine_and_add_content (content, true);
+       film->examine_and_add_content (content);
        wait_for_jobs ();
 
        film->make_dcp ();
        wait_for_jobs ();
 
-       boost::filesystem::path const video = "build/test/recover_test/video/185_2K_1918f67fe87ecfc4e8c09fe1c2dcefcc_24_bicubic_100000000_P_S_3D.mxf";
+       boost::filesystem::path const video = "build/test/recover_test/video/185_2K_0e7cded8bd5cb8143184fc7729be136e_24_100000000_P_S_3D.mxf";
 
        boost::filesystem::copy_file (
                video,
@@ -69,10 +69,9 @@ BOOST_AUTO_TEST_CASE (recover_test)
        film->make_dcp ();
        wait_for_jobs ();
 
-       shared_ptr<dcp::StereoPictureMXF> A (new dcp::StereoPictureMXF ("build/test/recover_test/original.mxf"));
-       shared_ptr<dcp::StereoPictureMXF> B (new dcp::StereoPictureMXF (video));
+       shared_ptr<dcp::StereoPictureAsset> A (new dcp::StereoPictureAsset ("build/test/recover_test/original.mxf"));
+       shared_ptr<dcp::StereoPictureAsset> B (new dcp::StereoPictureAsset (video));
 
        dcp::EqualityOptions eq;
-       eq.mxf_names_can_differ = true;
        BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
 }