Move some tests and rename one set.

[libdcp.git] / test / recovery_test.cc

diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index 7482b8cc94a1f8074acaec609066eb9899d89e6b..03961e339b38bd532b5cd007d6497eb6c6dc75af 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,6 +15,20 @@
 
     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"
@@ -48,12 +62,13 @@ BOOST_AUTO_TEST_CASE (recovery)
 
        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) {
                dcp::FrameInfo info = writer->write (data, size);
+               BOOST_CHECK_EQUAL (info.hash, "cb90485a97ea5f7555cedc8a7afd473b");
                written_size = info.size;
        }
 
@@ -76,8 +91,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);