X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=154510738e3200bd4ebc1b15cb52ce58763a42b0;hb=2710d4c7b0a6831bbf4c1fe1a42b195d276f1e67;hp=d9c53209c39059677485e52185a5d71dc2512737;hpb=f45cbb73068321d857249aaa21f770b87493c7c2;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index d9c53209c..154510738 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -17,43 +17,37 @@
 
 */
 
-#include <fstream>
-#include <iostream>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/date_time.hpp>
+#include <vector>
+#include <list>
 #include <libdcp/dcp.h>
-#include "ratio.h"
-#include "film.h"
-#include "filter.h"
-#include "job_manager.h"
-#include "util.h"
-#include "exceptions.h"
-#include "image.h"
-#include "log.h"
-#include "dcp_video_frame.h"
-#include "config.h"
-#include "server.h"
-#include "cross.h"
-#include "job.h"
-#include "subtitle.h"
-#include "scaler.h"
-#include "ffmpeg_decoder.h"
-#include "sndfile_decoder.h"
-#include "dcp_content_type.h"
+#include "lib/config.h"
+#include "lib/util.h"
+#include "lib/ui_signaller.h"
+#include "lib/film.h"
+#include "lib/job_manager.h"
+#include "lib/job.h"
+#include "lib/cross.h"
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
 
 using std::string;
-using std::list;
-using std::stringstream;
 using std::vector;
 using std::min;
 using std::cout;
+using std::cerr;
+using std::list;
 using boost::shared_ptr;
-using boost::thread;
-using boost::dynamic_pointer_cast;
+
+class TestUISignaller : public UISignaller
+{
+public:
+	/* No wakes in tests: we call ui_idle ourselves */
+	void wake_ui ()
+	{
+
+	}
+};
 
 struct TestConfig
 {
@@ -62,11 +56,13 @@ struct TestConfig
 		dcpomatic_setup();
 
 		Config::instance()->set_num_local_encoding_threads (1);
-		Config::instance()->set_servers (vector<ServerDescription*> ());
+		Config::instance()->set_servers (vector<ServerDescription> ());
 		Config::instance()->set_server_port (61920);
 		Config::instance()->set_default_dci_metadata (DCIMetadata ());
-		Config::instance()->set_default_container (0);
-		Config::instance()->set_default_dcp_content_type (0);
+		Config::instance()->set_default_container (static_cast<Ratio*> (0));
+		Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
+
+		ui_signaller = new TestUISignaller ();
 	}
 };
 
@@ -95,7 +91,7 @@ new_test_film (string name)
 	return f;
 }
 
-void
+static void
 check_file (string ref, string check)
 {
 	uintmax_t N = boost::filesystem::file_size (ref);
@@ -145,20 +141,29 @@ check_dcp (string ref, string check)
 	options.max_mean_pixel_error = 5;
 	options.max_std_dev_pixel_error = 5;
 	options.max_audio_sample_error = 255;
+	options.cpl_names_can_differ = true;
+	options.mxf_names_can_differ = true;
 	
 	BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
 }
 
-#include "black_fill_test.cc"
-#include "scaling_test.cc"
-#include "ratio_test.cc"
-#include "pixel_formats_test.cc"
-#include "make_black_test.cc"
-#include "film_metadata_test.cc"
-#include "stream_test.cc"
-#include "util_test.cc"
-#include "dcp_test.cc"
-#include "frame_rate_test.cc"
-#include "job_test.cc"
-#include "client_server_test.cc"
-#include "image_test.cc"
+void
+wait_for_jobs ()
+{
+	JobManager* jm = JobManager::instance ();
+	while (jm->work_to_do ()) {
+		ui_signaller->ui_idle ();
+	}
+	if (jm->errors ()) {
+		for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
+			if ((*i)->finished_in_error ()) {
+				cerr << (*i)->error_summary () << "\n"
+				     << (*i)->error_details () << "\n";
+			}
+		}
+	}
+		
+	BOOST_CHECK (!jm->errors());
+
+	ui_signaller->ui_idle ();
+}