Merge remote-tracking branch 'origin/master' into 2.0

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 3f044acf1fc97ffa7cde203e7127bea7b5c1aa0f..4466b74cb32d77212766b84302df0e4a03456daf 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  test/test.cc
+ *  @brief Overall test stuff and useful methods for tests.
+ */
+
 #include <vector>
 #include <list>
 #include <Magick++.h>
@@ -43,7 +47,7 @@ using std::cerr;
 using std::list;
 using boost::shared_ptr;
 
-boost::filesystem::path private_data = boost::filesystem::path ("test") / boost::filesystem::path ("private");
+boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private");
 
 class TestUISignaller : public UISignaller
 {
@@ -63,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);
@@ -72,6 +76,11 @@ struct TestConfig
 
                ui_signaller = new TestUISignaller ();
        }
+
+       ~TestConfig ()
+       {
+               JobManager::drop ();
+       }
 };
 
 BOOST_GLOBAL_FIXTURE (TestConfig);
@@ -104,7 +113,7 @@ 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_boost (check, "rb");
        BOOST_CHECK (check_file);
@@ -134,7 +143,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 static void
 note (dcp::NoteType t, string n)
 {
-       if (t == dcp::ERROR) {
+       if (t == dcp::DCP_ERROR) {
                cerr << n << "\n";
        }
 }
@@ -173,7 +182,7 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
 
        xmlpp::Element::NodeList::iterator k = ref_children.begin ();
        xmlpp::Element::NodeList::iterator l = test_children.begin ();
-       while (k != ref_children.end ()) {
+       while (k != ref_children.end () && l != test_children.end ()) {
                
                /* XXX: should be doing xmlpp::EntityReference, xmlpp::XIncludeEnd, xmlpp::XIncludeStart */
 
@@ -202,6 +211,9 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
                ++k;
                ++l;
        }
+
+       BOOST_CHECK (k == ref_children.end ());
+       BOOST_CHECK (l == test_children.end ());
 }
 
 void