Back-port v2's rename and slight extension of FrameRateConversion.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 1309439d21594e4a66d3f11bf024a9d89798cf6e..be2cf15389949c9ead1d23f5804b65c1c50ab99e 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -28,6 +28,7 @@
 #include "lib/job_manager.h"
 #include "lib/job.h"
 #include "lib/cross.h"
+#include "lib/server_finder.h"
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
@@ -57,12 +58,13 @@ struct TestConfig
                dcpomatic_setup();
 
                Config::instance()->set_num_local_encoding_threads (1);
-               Config::instance()->set_servers (vector<ServerDescription> ());
-               Config::instance()->set_server_port (61920);
+               Config::instance()->set_server_port_base (61920);
                Config::instance()->set_default_dci_metadata (DCIMetadata ());
                Config::instance()->set_default_container (static_cast<Ratio*> (0));
                Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
 
+               ServerFinder::instance()->disable ();
+
                ui_signaller = new TestUISignaller ();
        }
 };
@@ -92,14 +94,14 @@ new_test_film (string name)
        return f;
 }
 
-static void
-check_file (string ref, string check)
+void
+check_file (boost::filesystem::path ref, boost::filesystem::path check)
 {
        uintmax_t N = boost::filesystem::file_size (ref);
        BOOST_CHECK_EQUAL (N, boost::filesystem::file_size(check));
-       FILE* ref_file = fopen (ref.c_str(), "rb");
+       FILE* ref_file = fopen_boost (ref, "rb");
        BOOST_CHECK (ref_file);
-       FILE* check_file = fopen (check.c_str(), "rb");
+       FILE* check_file = fopen_boost (check, "rb");
        BOOST_CHECK (check_file);
        
        int const buffer_size = 65536;
@@ -125,9 +127,11 @@ check_file (string ref, string check)
 }
 
 static void
-note (libdcp::NoteType, string n)
+note (libdcp::NoteType t, string n)
 {
-       cout << n << "\n";
+       if (t == libdcp::ERROR) {
+               cerr << n << "\n";
+       }
 }
 
 void