Bv2.1 6.2.1: Check that closed caption reel and XML <Language> conform to RFC 5646.

[libdcp.git] / test / recovery_test.cc

diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index 6c4f6ac918c08a217dce12bf4692145f396b0f97..76dff1956aafca5045fb066726428d73d5eaf96c 100644 (file)
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,21 +15,36 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "mono_picture_asset_writer.h"
 #include "mono_picture_asset.h"
+#include "test.h"
 #include <asdcp/KM_util.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** Check that recovery from a partially-written MXF works */
 BOOST_AUTO_TEST_CASE (recovery)
 {
-       Kumu::cth_test = true;
+       RNGFixer fix;
 
        string const picture = "test/data/32x32_red_square.j2c";
        int const size = boost::filesystem::file_size (picture);
@@ -41,15 +56,10 @@ BOOST_AUTO_TEST_CASE (recovery)
                fclose (f);
        }
 
-#ifdef LIBDCP_POSIX
-       /* XXX: fix this posix-only stuff */
-       Kumu::ResetTestRNG ();
-#endif
-
        boost::filesystem::remove_all ("build/test/baz");
        boost::filesystem::create_directories ("build/test/baz");
-       shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
-       shared_ptr<dcp::PictureAssetWriter> writer = mp->start_write ("build/test/baz/video1.mxf", dcp::SMPTE, false);
+       shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
+       shared_ptr<dcp::PictureAssetWriter> writer = mp->start_write ("build/test/baz/video1.mxf", false);
 
        int written_size = 0;
        for (int i = 0; i < 24; ++i) {
@@ -77,8 +87,8 @@ BOOST_AUTO_TEST_CASE (recovery)
        Kumu::ResetTestRNG ();
 #endif
 
-       mp.reset (new dcp::MonoPictureAsset (dcp::Fraction (24, 1)));
-       writer = mp->start_write ("build/test/baz/video2.mxf", dcp::SMPTE, true);
+       mp.reset (new dcp::MonoPictureAsset (dcp::Fraction (24, 1), dcp::SMPTE));
+       writer = mp->start_write ("build/test/baz/video2.mxf", true);
 
        writer->write (data, size);