X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=c233a661ddf4666cb65bd89c68a413d44950fcdb;hb=e6c67f4aac2ca9afc275b6f13058e1e46f2cecc3;hp=f9d761da305dd150e858a48c794710e4615c49a5;hpb=015fe447cfe25babc55cf8ed282bb909e4713aa0;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index f9d761da3..c233a661d 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,11 +17,15 @@
 
 */
 
+/** @file  test/test.cc
+ *  @brief Overall test stuff and useful methods for tests.
+ */
+
 #include <vector>
 #include <list>
 #include <Magick++.h>
 #include <libxml++/libxml++.h>
-#include <libdcp/dcp.h>
+#include <dcp/dcp.h>
 #include "lib/config.h"
 #include "lib/util.h"
 #include "lib/ui_signaller.h"
@@ -43,6 +47,8 @@ using std::cerr;
 using std::list;
 using boost::shared_ptr;
 
+boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
+
 class TestUISignaller : public UISignaller
 {
 public:
@@ -61,7 +67,7 @@ struct TestConfig
 
 		Config::instance()->set_num_local_encoding_threads (1);
 		Config::instance()->set_server_port_base (61920);
-		Config::instance()->set_default_dci_metadata (DCIMetadata ());
+		Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ());
 		Config::instance()->set_default_container (static_cast<Ratio*> (0));
 		Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
 		Config::instance()->set_default_audio_delay (0);
@@ -70,6 +76,11 @@ struct TestConfig
 
 		ui_signaller = new TestUISignaller ();
 	}
+
+	~TestConfig ()
+	{
+		JobManager::drop ();
+	}
 };
 
 BOOST_GLOBAL_FIXTURE (TestConfig);
@@ -104,7 +115,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 	BOOST_CHECK_EQUAL (N, boost::filesystem::file_size (check));
 	FILE* ref_file = fopen (ref.c_str(), "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;
@@ -130,9 +141,9 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 }
 
 static void
-note (libdcp::NoteType t, string n)
+note (dcp::NoteType t, string n)
 {
-	if (t == libdcp::ERROR) {
+	if (t == dcp::DCP_ERROR) {
 		cerr << n << "\n";
 	}
 }
@@ -140,16 +151,16 @@ note (libdcp::NoteType t, string n)
 void
 check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
 {
-	libdcp::DCP ref_dcp (ref);
+	dcp::DCP ref_dcp (ref);
 	ref_dcp.read ();
-	libdcp::DCP check_dcp (check);
+	dcp::DCP check_dcp (check);
 	check_dcp.read ();
 
-	libdcp::EqualityOptions options;
+	dcp::EqualityOptions options;
 	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.cpl_annotation_texts_can_differ = true;
 	options.mxf_names_can_differ = true;
 	
 	BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
@@ -221,10 +232,19 @@ wait_for_jobs ()
 		ui_signaller->ui_idle ();
 	}
 	if (jm->errors ()) {
+		int N = 0;
+		for (list<shared_ptr<Job> >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) {
+			if ((*i)->finished_in_error ()) {
+				++N;
+			}
+		}
+		cerr << N << " errors.\n";
+
 		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";
+				cerr << (*i)->name() << ":\n"
+				     << "\tsummary: " << (*i)->error_summary () << "\n"
+				     << "\tdetails: " << (*i)->error_details () << "\n";
 			}
 		}
 	}