X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=4466b74cb32d77212766b84302df0e4a03456daf;hb=1f82930e73679d6aec5223caa255f564339a1a2a;hp=f57023836bcf5d38a2dbc4b23b8f635a26d76b5c;hpb=308488324dbc4d8b709d3fb1dc9fee0479346c21;p=dcpomatic.git

diff --git a/test/test.cc b/test/test.cc
index f57023836..4466b74cb 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -47,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
 {
@@ -67,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);
@@ -113,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);
@@ -143,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";
 	}
 }
@@ -182,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 */
 
@@ -211,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