X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=366bc9302937330d12d0a3d0fd27ef250cfc3a7b;hb=ccbe9126407eb31abaf991c39bcac6d3aec1b852;hp=3ffd9287af546cdb5df32a717688f115325042d3;hpb=274e190de0f680f13e3dfc0dc35c69dfa8e15005;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index 3ffd9287a..366bc9302 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -21,12 +21,6 @@
  *  @brief Overall test stuff and useful methods for tests.
  */
 
-#include <vector>
-#include <list>
-#include <Magick++.h>
-#include <sndfile.h>
-#include <libxml++/libxml++.h>
-#include <dcp/dcp.h>
 #include "lib/config.h"
 #include "lib/util.h"
 #include "lib/signal_manager.h"
@@ -36,9 +30,18 @@
 #include "lib/cross.h"
 #include "lib/server_finder.h"
 #include "lib/image.h"
+#include "lib/ratio.h"
+#include "lib/log_entry.h"
+#include <dcp/dcp.h>
+#include <sndfile.h>
+#include <libxml++/libxml++.h>
+#include <Magick++.h>
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
+#include <list>
+#include <vector>
+#include <iostream>
 
 using std::string;
 using std::vector;
@@ -46,6 +49,7 @@ using std::min;
 using std::cout;
 using std::cerr;
 using std::list;
+using std::abs;
 using boost::shared_ptr;
 using boost::scoped_array;
 
@@ -74,6 +78,7 @@ struct TestConfig
 		Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
 		Config::instance()->set_default_audio_delay (0);
 		Config::instance()->set_default_j2k_bandwidth (100000000);
+		Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
 
 		ServerFinder::instance()->disable ();
 
@@ -105,10 +110,10 @@ new_test_film (string name)
 	if (boost::filesystem::exists (p)) {
 		boost::filesystem::remove_all (p);
 	}
-	
-	shared_ptr<Film> f = shared_ptr<Film> (new Film (p.string()));
-	f->write_metadata ();
-	return f;
+
+	shared_ptr<Film> film = shared_ptr<Film> (new Film (p.string()));
+	film->write_metadata ();
+	return film;
 }
 
 void
@@ -118,7 +123,7 @@ check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
 	ref_info.format = 0;
 	SNDFILE* ref_file = sf_open (ref.string().c_str(), SFM_READ, &ref_info);
 	BOOST_CHECK (ref_file);
-	
+
 	SF_INFO check_info;
 	check_info.format = 0;
 	SNDFILE* check_file = sf_open (check.string().c_str(), SFM_READ, &check_info);
@@ -133,7 +138,7 @@ check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
 	sf_count_t const buffer_size = 65536 * ref_info.channels;
 	scoped_array<int32_t> ref_buffer (new int32_t[buffer_size]);
 	scoped_array<int32_t> check_buffer (new int32_t[buffer_size]);
-	
+
 	sf_count_t N = ref_info.frames;
 	while (N) {
 		sf_count_t this_time = min (buffer_size, N);
@@ -143,7 +148,10 @@ check_audio_file (boost::filesystem::path ref, boost::filesystem::path check)
 		BOOST_CHECK_EQUAL (r, this_time);
 
 		for (sf_count_t i = 0; i < this_time; ++i) {
-			BOOST_CHECK (fabs (ref_buffer[i] - check_buffer[i]) <= 65536);
+			BOOST_REQUIRE_MESSAGE (
+				abs (ref_buffer[i] - check_buffer[i]) <= 65536,
+				ref << " differs from " << check << " at " << (ref_info.frames - N + i) << " of " << ref_info.frames
+				);
 		}
 
 		N -= this_time;
@@ -159,14 +167,14 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 	BOOST_CHECK (ref_file);
 	FILE* check_file = fopen_boost (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];
 
 	SafeStringStream error;
 	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);
@@ -178,7 +186,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 		if (memcmp (ref_buffer, check_buffer, this_time)) {
 			break;
 		}
-		
+
 		N -= this_time;
 	}
 
@@ -210,9 +218,10 @@ check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
 	options.max_std_dev_pixel_error = 5;
 	options.max_audio_sample_error = 255;
 	options.cpl_annotation_texts_can_differ = true;
-	options.mxf_filenames_can_differ = true;
+	options.reel_annotation_texts_can_differ = true;
 	options.reel_hashes_can_differ = true;
-	
+	options.issue_dates_can_differ = true;
+
 	BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
 }
 
@@ -285,8 +294,10 @@ wait_for_jobs ()
 {
 	JobManager* jm = JobManager::instance ();
 	while (jm->work_to_do ()) {
-		signal_manager->ui_idle ();
+		while (signal_manager->ui_idle ()) {}
+		dcpomatic_sleep (1);
 	}
+
 	if (jm->errors ()) {
 		int N = 0;
 		for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
@@ -305,10 +316,11 @@ wait_for_jobs ()
 		}
 	}
 
-	signal_manager->ui_idle ();
+	while (signal_manager->ui_idle ()) {}
 
-	/* Discard all jobs so we lose any we just reported an error in */
-	JobManager::drop ();
+	if (jm->errors ()) {
+		JobManager::drop ();
+	}
 }
 
 void
@@ -318,7 +330,7 @@ write_image (shared_ptr<const Image> image, boost::filesystem::path file)
 		using namespace MagickCore;
 #else
 		using namespace MagickLib;
-#endif		
+#endif
 
 	Magick::Image m (image->size().width, image->size().height, "ARGB", CharPixel, (void *) image->data()[0]);
 	m.write (file.string ());