Some notes on timing.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 2837729c581ca83895d9acd103b37691d47a2095..1f0d2db5b45ab63442cce66b9f892a6bc585683b 100644 (file)
--- 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>
@@ -65,14 +66,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 +85,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 +98,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 +136,7 @@ note (libdcp::NoteType, string n)
        cout << n << "\n";
 }
 
-void
+static void
 check_dcp (string ref, string check)
 {
        libdcp::DCP ref_dcp (ref);
@@ -145,11 +148,23 @@ 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)));
 }
 
+static void
+wait_for_jobs ()
+{
+       while (JobManager::instance()->work_to_do ()) {}
+}
 
+#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"
 #include "pixel_formats_test.cc"
@@ -157,7 +172,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 "ffmpeg_dcp_test.cc"
 #include "frame_rate_test.cc"
 #include "job_test.cc"
 #include "client_server_test.cc"