X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=8f92024fc546cce119436aa1359f8cecbb6ed6a0;hb=40d38c8d011f0863f396f21cd750cdcef803a792;hp=59283b14105148211b48647ece229c8f06e5c287;hpb=5ed54056ae4833dd7e6c7737523d99b452bcf2d3;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index 59283b141..8f92024fc 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -35,6 +35,8 @@
 #include "lib/dcp_content_type.h"
 #include "lib/log_entry.h"
 #include "lib/compose.hpp"
+#include "lib/file_log.h"
+#include "lib/dcpomatic_log.h"
 #include "test.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
@@ -69,7 +71,8 @@ using boost::shared_ptr;
 using boost::scoped_array;
 using boost::dynamic_pointer_cast;
 
-boost::filesystem::path private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
+boost::filesystem::path TestPaths::TestPaths::private_data = boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"));
+boost::filesystem::path TestPaths::xsd = boost::filesystem::canonical(boost::filesystem::path("..") / boost::filesystem::path("libdcp") / boost::filesystem::path("xsd"));
 
 void
 setup_test_config ()
@@ -111,8 +114,10 @@ struct TestConfig
 
 		char* env_private = getenv("DCPOMATIC_TEST_PRIVATE");
 		if (env_private) {
-			private_data = env_private;
+			TestPaths::TestPaths::private_data = env_private;
 		}
+
+		dcpomatic_log.reset (new FileLog("build/test/log"));
 	}
 
 	~TestConfig ()
@@ -233,11 +238,7 @@ check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check
 void
 check_image (boost::filesystem::path ref, boost::filesystem::path check, double threshold)
 {
-#ifdef DCPOMATIC_IMAGE_MAGICK
 	using namespace MagickCore;
-#else
-	using namespace MagickLib;
-#endif
 
 	Magick::Image ref_image;
 	ref_image.read (ref.string ());
@@ -246,12 +247,8 @@ check_image (boost::filesystem::path ref, boost::filesystem::path check, double
 	/* XXX: this is a hack; we really want the ImageMagick call but GraphicsMagick doesn't have it;
 	   this may cause random test failures on platforms that use GraphicsMagick.
 	*/
-#ifdef DCPOMATIC_ADVANCED_MAGICK_COMPARE
 	double const dist = ref_image.compare(check_image, Magick::RootMeanSquaredErrorMetric);
 	BOOST_CHECK_MESSAGE (dist < threshold, ref << " differs from " << check << " " << dist);
-#else
-	BOOST_CHECK_MESSAGE (!ref_image.compare(check_image), ref << " differs from " << check);
-#endif
 }
 
 void
@@ -393,7 +390,7 @@ wait_for_jobs ()
 	JobManager* jm = JobManager::instance ();
 	while (jm->work_to_do ()) {
 		while (signal_manager->ui_idle ()) {}
-		dcpomatic_sleep (1);
+		dcpomatic_sleep_seconds (1);
 	}
 
 	if (jm->errors ()) {
@@ -425,15 +422,11 @@ wait_for_jobs ()
 }
 
 void
-write_image (shared_ptr<const Image> image, boost::filesystem::path file, string format)
+write_image (shared_ptr<const Image> image, boost::filesystem::path file, string format, MagickCore::StorageType pixel_type)
 {
-#ifdef DCPOMATIC_IMAGE_MAGICK
-		using namespace MagickCore;
-#else
-		using namespace MagickLib;
-#endif
+	using namespace MagickCore;
 
-	Magick::Image m (image->size().width, image->size().height, format.c_str(), CharPixel, (void *) image->data()[0]);
+	Magick::Image m (image->size().width, image->size().height, format.c_str(), pixel_type, (void *) image->data()[0]);
 	m.write (file.string ());
 }
 
@@ -465,6 +458,7 @@ check_one_frame (boost::filesystem::path dcp_dir, int64_t index, boost::filesyst
 			BOOST_REQUIRE_EQUAL (ref_image->data(0)[off], image->data(0)[off]);
 			BOOST_REQUIRE_EQUAL (ref_image->data(1)[off], image->data(1)[off]);
 			BOOST_REQUIRE_EQUAL (ref_image->data(2)[off], image->data(2)[off]);
+			++off;
 		}
 	}
 }
@@ -480,3 +474,52 @@ dcp_file (shared_ptr<const Film> film, string prefix)
 	BOOST_REQUIRE (i != boost::filesystem::directory_iterator());
 	return i->path();
 }
+
+boost::filesystem::path
+subtitle_file (shared_ptr<Film> film)
+{
+	for (
+		boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (film->directory().get() / film->dcp_name (false));
+		i != boost::filesystem::directory_iterator ();
+		++i) {
+
+		if (boost::filesystem::is_directory (i->path ())) {
+			for (
+				boost::filesystem::directory_iterator j = boost::filesystem::directory_iterator (i->path ());
+				j != boost::filesystem::directory_iterator ();
+				++j) {
+
+				if (boost::algorithm::starts_with (j->path().leaf().string(), "sub_")) {
+					return j->path();
+				}
+			}
+		}
+	}
+
+	BOOST_REQUIRE (false);
+	/* Remove warning */
+	return boost::filesystem::path("/");
+}
+
+void
+make_random_file (boost::filesystem::path path, size_t size)
+{
+	size_t const chunk = 128 * 1024;
+	uint8_t* buffer = static_cast<uint8_t*> (malloc(chunk));
+	BOOST_REQUIRE (buffer);
+	FILE* r = fopen("/dev/urandom", "rb");
+	BOOST_REQUIRE (r);
+	FILE* t = fopen_boost(path, "wb");
+	BOOST_REQUIRE (t);
+	while (size) {
+		size_t this_time = min (size, chunk);
+		size_t N = fread (buffer, 1, this_time, r);
+		BOOST_REQUIRE (N == this_time);
+		N = fwrite (buffer, 1, this_time, t);
+		BOOST_REQUIRE (N == this_time);
+		size -= this_time;
+	}
+	fclose (t);
+	fclose (r);
+	free (buffer);
+}