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
{
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);
{
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);
static void
note (dcp::NoteType t, string n)
{
- if (t == dcp::ERROR) {
+ if (t == dcp::DCP_ERROR) {
cerr << n << "\n";
}
}
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 */
++k;
++l;
}
+
+ BOOST_CHECK (k == ref_children.end ());
+ BOOST_CHECK (l == test_children.end ());
}
void