Various fixes to make tests pass again.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 1c7b7e245c11e967cf59dd8f02e497aa67cd3212..1309439d21594e4a66d3f11bf024a9d89798cf6e 100644 (file)
--- 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"
@@ -39,6 +40,16 @@ 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()
@@ -52,7 +63,7 @@ struct TestConfig
                Config::instance()->set_default_container (static_cast<Ratio*> (0));
                Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
 
-               ui_signaller = new UISignaller ();
+               ui_signaller = new TestUISignaller ();
        }
 };
 
@@ -137,11 +148,71 @@ 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) {
                        if ((*i)->finished_in_error ()) {
@@ -153,6 +224,5 @@ wait_for_jobs ()
                
        BOOST_CHECK (!jm->errors());
 
-       /* Hack: wait for ui_signaller signals to fire */
-       dcpomatic_sleep (1);
+       ui_signaller->ui_idle ();
 }