X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=b5142bd63fc95c20b07ee0db0f4c6a923481bd98;hb=3e56e4126ec8199f15e03c213b37f39d72c27cc3;hp=7c7efd1a090580de332ec217ea4398fb8e20d9cc;hpb=e6d086fff404d9fe5ac080f9e75334eeb315c1da;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index 7c7efd1a0..b5142bd63 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -36,11 +36,12 @@
 #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 "ui_signaller.h"
+#include "ratio.h"
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
@@ -51,6 +52,7 @@ using std::stringstream;
 using std::vector;
 using std::min;
 using std::cout;
+using std::cerr;
 using boost::shared_ptr;
 using boost::thread;
 using boost::dynamic_pointer_cast;
@@ -65,14 +67,16 @@ struct TestConfig
 		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 UISignaller ();
 	}
 };
 
 BOOST_GLOBAL_FIXTURE (TestConfig);
 
-boost::filesystem::path
+static boost::filesystem::path
 test_film_dir (string name)
 {
 	boost::filesystem::path p;
@@ -82,7 +86,7 @@ test_film_dir (string name)
 	return p;
 }
 
-shared_ptr<Film>
+static shared_ptr<Film>
 new_test_film (string name)
 {
 	boost::filesystem::path p = test_film_dir (name);
@@ -95,7 +99,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);
@@ -133,7 +137,7 @@ note (libdcp::NoteType, string n)
 	cout << n << "\n";
 }
 
-void
+static void
 check_dcp (string ref, string check)
 {
 	libdcp::DCP ref_dcp (ref);
@@ -151,6 +155,27 @@ check_dcp (string ref, string check)
 	BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
 }
 
+void
+wait_for_jobs ()
+{
+	JobManager* jm = JobManager::instance ();
+	while (jm->work_to_do ()) {}
+	if (jm->errors ()) {
+		for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
+			cerr << (*i)->error_summary () << "\n"
+			     << (*i)->error_details () << "\n";
+		}
+	}
+		
+	BOOST_CHECK (!jm->errors());
+}
+
+#include "play_test.cc"
+#include "frame_rate_test.cc"
+#include "silence_padding_test.cc"
+#include "audio_delay_test.cc"
+#include "ffmpeg_pts_offset.cc"
+#include "ffmpeg_examiner_test.cc"
 #include "black_fill_test.cc"
 #include "scaling_test.cc"
 #include "ratio_test.cc"
@@ -159,8 +184,7 @@ check_dcp (string ref, string check)
 #include "film_metadata_test.cc"
 #include "stream_test.cc"
 #include "util_test.cc"
-#include "dcp_test.cc"
-#include "frame_rate_test.cc"
+#include "ffmpeg_dcp_test.cc"
 #include "job_test.cc"
 #include "client_server_test.cc"
 #include "image_test.cc"