X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=3858dff11af091cc248d09eeb82a28dd3661e23d;hb=e7e06b4c9a6bf4459ff27a30cf347121c0e40e07;hp=1080aec793f4ecd1b5f4efa9f9d5ccb33297e1e7;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index 1080aec79..3858dff11 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,12 +22,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"
@@ -34,11 +29,20 @@
 #include "lib/job_manager.h"
 #include "lib/job.h"
 #include "lib/cross.h"
-#include "lib/server_finder.h"
+#include "lib/encode_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;
@@ -75,8 +79,10 @@ 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_default_interop (false);
+		Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
 
-		ServerFinder::instance()->disable ();
+		EncodeServerFinder::instance()->stop ();
 
 		signal_manager = new TestSignalManager ();
 	}
@@ -107,7 +113,7 @@ new_test_film (string name)
 		boost::filesystem::remove_all (p);
 	}
 
-	shared_ptr<Film> film = shared_ptr<Film> (new Film (p.string()));
+	shared_ptr<Film> film = shared_ptr<Film> (new Film (p));
 	film->write_metadata ();
 	return film;
 }
@@ -144,7 +150,11 @@ 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_REQUIRE (abs (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
+				<< "(" << ref_buffer[i] << " vs " << check_buffer[i] << ")"
+				);
 		}
 
 		N -= this_time;
@@ -165,8 +175,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 	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();
+	string error = "File " + check.string() + " differs from reference " + ref.string();
 
 	while (N) {
 		uintmax_t this_time = min (uintmax_t (buffer_size), N);
@@ -175,7 +184,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 		r = fread (check_buffer, 1, this_time, check_file);
 		BOOST_CHECK_EQUAL (r, this_time);
 
-		BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error.str ());
+		BOOST_CHECK_MESSAGE (memcmp (ref_buffer, check_buffer, this_time) == 0, error);
 		if (memcmp (ref_buffer, check_buffer, this_time)) {
 			break;
 		}
@@ -230,7 +239,10 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
 
 	xmlpp::Element::NodeList ref_children = ref->get_children ();
 	xmlpp::Element::NodeList test_children = test->get_children ();
-	BOOST_CHECK_EQUAL (ref_children.size (), test_children.size ());
+	BOOST_CHECK_MESSAGE (
+		ref_children.size() == test_children.size(),
+		ref->get_name() << " has " << ref_children.size() << " or " << test_children.size() << " children"
+		);
 
 	xmlpp::Element::NodeList::iterator k = ref_children.begin ();
 	xmlpp::Element::NodeList::iterator l = test_children.begin ();
@@ -282,16 +294,15 @@ check_xml (boost::filesystem::path ref, boost::filesystem::path test, list<strin
 	check_xml (ref_root, test_root, ignore);
 }
 
-void
+bool
 wait_for_jobs ()
 {
 	JobManager* jm = JobManager::instance ();
 	while (jm->work_to_do ()) {
-		signal_manager->ui_idle ();
+		while (signal_manager->ui_idle ()) {}
+		dcpomatic_sleep (1);
 	}
 
-	cout << "Waiting for jobs: all finished; errors=" << jm->errors() << ".\n";
-
 	if (jm->errors ()) {
 		int N = 0;
 		for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
@@ -310,14 +321,14 @@ wait_for_jobs ()
 		}
 	}
 
-	signal_manager->ui_idle ();
+	while (signal_manager->ui_idle ()) {}
 
 	if (jm->errors ()) {
-		cout << "Dropping JobManager\n";
 		JobManager::drop ();
-	} else {
-		cout << "Not dropping JobManager\n";
+		return true;
 	}
+
+	return false;
 }
 
 void