X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frecovery_test.cc;h=eaf34f815f31285649ea3459ee56c565643a7aad;hb=refs%2Fheads%2Fsmaller-ccap;hp=277ea67899e3f6949973ec99d5def1884c29a85a;hpb=7fd1757fc244a493d3116ef95bae2488565dc404;p=libdcp.git

diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index 277ea678..eaf34f81 100644
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -1,52 +1,67 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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,
+    libdcp 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 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 "picture_asset_writer.h"
 
-/* Check that recovery from a partially-written MXF works */
+#include "mono_picture_asset_writer.h"
+#include "mono_picture_asset.h"
+#include "test.h"
+#include <asdcp/KM_util.h>
+#include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
+
+
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+
+
+/** Check that recovery from a partially-written MXF works */
 BOOST_AUTO_TEST_CASE (recovery)
 {
-	Kumu::libdcp_test = true;
+	RNGFixer fix;
 
-	string const picture = "test/data/32x32_red_square.j2c";
-	int const size = boost::filesystem::file_size (picture);
-	uint8_t* data = new uint8_t[size];
-	{
-		FILE* f = fopen (picture.c_str(), "rb");
-		BOOST_CHECK (f);
-		fread (data, 1, size, f);
-		fclose (f);
-	}
+	string const picture = "test/data/flat_red.j2c";
+	dcp::ArrayData data(picture);
 
-#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<libdcp::MonoPictureAsset> mp (new libdcp::MonoPictureAsset ("build/test/baz", "video1.mxf", 24, libdcp::Size (32, 32), false));
-	shared_ptr<libdcp::PictureAssetWriter> writer = mp->start_write (false, false);
+	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
+	auto writer = mp->start_write("build/test/baz/video1.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
 
 	int written_size = 0;
 	for (int i = 0; i < 24; ++i) {
-		libdcp::FrameInfo info = writer->write (data, size);
+		auto info = writer->write (data.data(), data.size());
+		BOOST_CHECK_EQUAL (info.hash, "c3c9a3adec09baf2b0bcb65806fbeac8");
 		written_size = info.size;
 	}
 
@@ -54,10 +69,10 @@ BOOST_AUTO_TEST_CASE (recovery)
 	writer.reset ();
 
 	boost::filesystem::copy_file ("build/test/baz/video1.mxf", "build/test/baz/video2.mxf");
-	boost::filesystem::resize_file ("build/test/baz/video2.mxf", 16384 + 353 * 11);
+	boost::filesystem::resize_file ("build/test/baz/video2.mxf", 16384 + data.size() * 11);
 
 	{
-		FILE* f = fopen ("build/test/baz/video2.mxf", "r+");
+		auto f = fopen ("build/test/baz/video2.mxf", "rb+");
 		rewind (f);
 		char zeros[256];
 		memset (zeros, 0, 256);
@@ -65,22 +80,22 @@ BOOST_AUTO_TEST_CASE (recovery)
 		fclose (f);
 	}
 
-#ifdef LIBDCP_POSIX	
 	Kumu::ResetTestRNG ();
-#endif	
 
-	mp.reset (new libdcp::MonoPictureAsset ("build/test/baz", "video2.mxf", 24, libdcp::Size (32, 32), false));
-	writer = mp->start_write (true, false);
+	mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
+	writer = mp->start_write("build/test/baz/video2.mxf", dcp::PictureAsset::Behaviour::OVERWRITE_EXISTING);
 
-	writer->write (data, size);
+	writer->write (data.data(), data.size());
 
 	for (int i = 1; i < 4; ++i) {
 		writer->fake_write (written_size);
 	}
 
 	for (int i = 4; i < 24; ++i) {
-		writer->write (data, size);
+		writer->write (data.data(), data.size());
 	}
-	
+
 	writer->finalize ();
+
+	check_file ("build/test/baz/video1.mxf", "build/test/baz/video2.mxf");
 }