X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=c0f732c46d22c9f558e6c897772d3833cf51e39f;hb=4e5d5c7dcc6470b8dc918d03a00e30c07df60efe;hp=1fd79872fa3337668144d4d0809939276a18f40c;hpb=3d9f434ef9db3e78eed808d6ecb2d26fd03c2902;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index 1fd79872f..c0f732c46 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -19,6 +19,7 @@
 
 #include <vector>
 #include <list>
+#include <libxml++/libxml++.h>
 #include <libdcp/dcp.h>
 #include "lib/config.h"
 #include "lib/util.h"
@@ -27,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>
@@ -39,20 +41,32 @@ using std::cerr;
 using std::list;
 using boost::shared_ptr;
 
+class TestUISignaller : public UISignaller
+{
+public:
+	/* No wakes in tests: we call ui_idle ourselves */
+	void wake_ui ()
+	{
+
+	}
+};
+
 struct TestConfig
 {
-	TestConfig()
+	TestConfig ()
 	{
-		dcpomatic_setup();
+		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));
+		Config::instance()->set_default_audio_delay (0);
 
-		ui_signaller = new UISignaller ();
+		ServerFinder::instance()->disable ();
+
+		ui_signaller = new TestUISignaller ();
 	}
 };
 
@@ -82,10 +96,10 @@ new_test_film (string name)
 }
 
 static void
-check_file (string ref, string check)
+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));
+	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");
@@ -114,13 +128,15 @@ 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
-check_dcp (string ref, string check)
+check_dcp (boost::filesystem::path ref, boost::filesystem::path check)
 {
 	libdcp::DCP ref_dcp (ref);
 	ref_dcp.read ();
@@ -137,20 +153,81 @@ check_dcp (string ref, string check)
 	BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
 }
 
+void
+check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
+{
+	BOOST_CHECK_EQUAL (ref->get_name (), test->get_name ());
+	BOOST_CHECK_EQUAL (ref->get_namespace_prefix (), test->get_namespace_prefix ());
+
+	if (find (ignore.begin(), ignore.end(), ref->get_name()) != ignore.end ()) {
+		return;
+	}
+	    
+	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 ());
+
+	xmlpp::Element::NodeList::iterator k = ref_children.begin ();
+	xmlpp::Element::NodeList::iterator l = test_children.begin ();
+	while (k != ref_children.end ()) {
+		
+		/* XXX: should be doing xmlpp::EntityReference, xmlpp::XIncludeEnd, xmlpp::XIncludeStart */
+
+		xmlpp::Element* ref_el = dynamic_cast<xmlpp::Element*> (*k);
+		xmlpp::Element* test_el = dynamic_cast<xmlpp::Element*> (*l);
+		BOOST_CHECK ((ref_el && test_el) || (!ref_el && !test_el));
+		if (ref_el && test_el) {
+			check_xml (ref_el, test_el, ignore);
+		}
+
+		xmlpp::ContentNode* ref_cn = dynamic_cast<xmlpp::ContentNode*> (*k);
+		xmlpp::ContentNode* test_cn = dynamic_cast<xmlpp::ContentNode*> (*l);
+		BOOST_CHECK ((ref_cn && test_cn) || (!ref_cn && !test_cn));
+		if (ref_cn && test_cn) {
+			BOOST_CHECK_EQUAL (ref_cn->get_content(), test_cn->get_content ());
+		}
+
+		xmlpp::Attribute* ref_at = dynamic_cast<xmlpp::Attribute*> (*k);
+		xmlpp::Attribute* test_at = dynamic_cast<xmlpp::Attribute*> (*l);
+		BOOST_CHECK ((ref_at && test_at) || (!ref_at && !test_at));
+		if (ref_at && test_at) {
+			BOOST_CHECK_EQUAL (ref_at->get_name(), test_at->get_name ());
+			BOOST_CHECK_EQUAL (ref_at->get_value(), test_at->get_value ());
+		}
+
+		++k;
+		++l;
+	}
+}
+
+void
+check_xml (boost::filesystem::path ref, boost::filesystem::path test, list<string> ignore)
+{
+	xmlpp::DomParser* ref_parser = new xmlpp::DomParser (ref.string ());
+	xmlpp::Element* ref_root = ref_parser->get_document()->get_root_node ();
+	xmlpp::DomParser* test_parser = new xmlpp::DomParser (test.string ());
+	xmlpp::Element* test_root = test_parser->get_document()->get_root_node ();
+
+	check_xml (ref_root, test_root, ignore);
+}
+
 void
 wait_for_jobs ()
 {
 	JobManager* jm = JobManager::instance ();
-	while (jm->work_to_do ()) {}
+	while (jm->work_to_do ()) {
+		ui_signaller->ui_idle ();
+	}
 	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";
+			if ((*i)->finished_in_error ()) {
+				cerr << (*i)->error_summary () << "\n"
+				     << (*i)->error_details () << "\n";
+			}
 		}
 	}
 		
 	BOOST_CHECK (!jm->errors());
 
-	/* Hack: wait for ui_signaller signals to fire */
-	dcpomatic_sleep (1);
+	ui_signaller->ui_idle ();
 }