X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ftest.cc;h=fd9c6941be30e4aac818a3debf3f2b6706df865b;hp=7136b038d99bbb9c28bc1a8569cdb0f6b226e72f;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hpb=59c4edb69ba926d3790198cd2b62dc601944a632

diff --git a/test/test.cc b/test/test.cc
index 7136b038d..fd9c6941b 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -50,6 +50,7 @@
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
+#include <dcp/warnings.h>
 #include <asdcp/AS_DCP.h>
 #include <png.h>
 #include <sndfile.h>
@@ -59,8 +60,11 @@ extern "C" {
 }
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
-#include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>
+LIBDCP_DISABLE_WARNINGS
+#include <boost/random.hpp>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/test/unit_test.hpp>
 #include <iostream>
 #include <list>
 #include <vector>
@@ -462,46 +466,40 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 {
 	auto N = boost::filesystem::file_size (ref);
 	BOOST_CHECK_EQUAL (N, boost::filesystem::file_size (check));
-	auto ref_file = fopen_boost (ref, "rb");
+	dcp::File ref_file(ref, "rb");
 	BOOST_CHECK (ref_file);
-	auto check_file = fopen_boost (check, "rb");
+	dcp::File check_file(check, "rb");
 	BOOST_CHECK (check_file);
 
 	int const buffer_size = 65536;
-	uint8_t* ref_buffer = new uint8_t[buffer_size];
-	uint8_t* check_buffer = new uint8_t[buffer_size];
+	std::vector<uint8_t> ref_buffer(buffer_size);
+	std::vector<uint8_t> check_buffer(buffer_size);
 
 	string error = "File " + check.string() + " differs from reference " + ref.string();
 
 	while (N) {
 		uintmax_t this_time = min (uintmax_t (buffer_size), N);
-		size_t r = fread (ref_buffer, 1, this_time, ref_file);
+		size_t r = ref_file.read (ref_buffer.data(), 1, this_time);
 		BOOST_CHECK_EQUAL (r, this_time);
-		r = fread (check_buffer, 1, this_time, check_file);
+		r = check_file.read(check_buffer.data(), 1, this_time);
 		BOOST_CHECK_EQUAL (r, this_time);
 
-		BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error);
-		if (memcmp (ref_buffer, check_buffer, this_time)) {
+		BOOST_CHECK_MESSAGE (memcmp (ref_buffer.data(), check_buffer.data(), this_time) == 0, error);
+		if (memcmp (ref_buffer.data(), check_buffer.data(), this_time)) {
 			break;
 		}
 
 		N -= this_time;
 	}
-
-	delete[] ref_buffer;
-	delete[] check_buffer;
-
-	fclose (ref_file);
-	fclose (check_file);
 }
 
 
 void
 check_text_file (boost::filesystem::path ref, boost::filesystem::path check)
 {
-	auto ref_file = fopen_boost (ref, "r");
+	dcp::File ref_file(ref, "r");
 	BOOST_CHECK (ref_file);
-	auto check_file = fopen_boost (check, "r");
+	dcp::File check_file(check, "r");
 	BOOST_CHECK (check_file);
 
 	int const buffer_size = std::max(
@@ -511,20 +509,14 @@ check_text_file (boost::filesystem::path ref, boost::filesystem::path check)
 
 	DCPOMATIC_ASSERT (buffer_size < 1024 * 1024);
 
-	auto ref_buffer = new uint8_t[buffer_size];
-	auto ref_read = fread(ref_buffer, 1, buffer_size, ref_file);
-	auto check_buffer = new uint8_t[buffer_size];
-	auto check_read = fread(check_buffer, 1, buffer_size, check_file);
+	std::vector<uint8_t> ref_buffer(buffer_size);
+	auto ref_read = ref_file.read(ref_buffer.data(), 1, buffer_size);
+	std::vector<uint8_t> check_buffer(buffer_size);
+	auto check_read = check_file.read(check_buffer.data(), 1, buffer_size);
 	BOOST_CHECK_EQUAL (ref_read, check_read);
 
 	string const error = "File " + check.string() + " differs from reference " + ref.string();
-	BOOST_CHECK_MESSAGE(memcmp(ref_buffer, check_buffer, ref_read) == 0, error);
-
-	delete[] ref_buffer;
-	delete[] check_buffer;
-
-	fclose (ref_file);
-	fclose (check_file);
+	BOOST_CHECK_MESSAGE(memcmp(ref_buffer.data(), check_buffer.data(), ref_read) == 0, error);
 }
 
 
@@ -803,12 +795,12 @@ check_one_frame (boost::filesystem::path dcp_dir, int64_t index, boost::filesyst
 boost::filesystem::path
 dcp_file (shared_ptr<const Film> film, string prefix)
 {
-	auto i = boost::filesystem::directory_iterator (film->dir(film->dcp_name()));
-	while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), prefix)) {
+	auto i = boost::filesystem::recursive_directory_iterator(film->dir(film->dcp_name()));
+	while (i != boost::filesystem::recursive_directory_iterator() && !boost::algorithm::starts_with(i->path().leaf().string(), prefix)) {
 		++i;
 	}
 
-	BOOST_REQUIRE (i != boost::filesystem::directory_iterator());
+	BOOST_REQUIRE_MESSAGE(i != boost::filesystem::recursive_directory_iterator(), "Could not find file with prefix " << prefix);
 	return i->path();
 }
 
@@ -830,16 +822,22 @@ subtitle_file (shared_ptr<Film> film)
 	return boost::filesystem::path("/");
 }
 
+
 void
 make_random_file (boost::filesystem::path path, size_t size)
 {
-	auto t = fopen_boost(path, "wb");
-	BOOST_REQUIRE (t);
-	for (size_t i = 0; i < size; ++i) {
-		uint8_t r = rand() & 0xff;
-		fwrite (&r, 1, 1, t);
+	dcp::File random_file(path, "wb");
+	BOOST_REQUIRE (random_file);
+
+	boost::random::mt19937 rng(1);
+	boost::random::uniform_int_distribution<uint64_t> dist(0);
+
+	while (size > 0) {
+		auto this_time = std::min(size, size_t(8));
+		uint64_t random = dist(rng);
+		random_file.write(&random, this_time, 1);
+		size -= this_time;
 	}
-	fclose (t);
 }
 
 
@@ -943,3 +941,17 @@ ConfigRestorer::~ConfigRestorer()
 	setup_test_config();
 }
 
+
+boost::filesystem::path
+find_file (boost::filesystem::path dir, string filename_part)
+{
+	boost::optional<boost::filesystem::path> found;
+	for (auto i: boost::filesystem::directory_iterator(dir)) {
+		if (i.path().filename().string().find(filename_part) != string::npos) {
+			BOOST_REQUIRE (!found);
+			found = i;
+		}
+	}
+	BOOST_REQUIRE (found);
+	return *found;
+}