X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ftest.cc;h=f325aacbc766f1a2b31ed194368d2b51386d5981;hp=3d58b06284493ac63ce9988203c2eeb88b5c9f5e;hb=c5c0e55b2d2ec97a8dd96f4d3e93f85d13cc9d84;hpb=ed5a8c669840b5c4875bf061e49e150cdd1d950a diff --git a/test/test.cc b/test/test.cc index 3d58b0628..f325aacbc 100644 --- a/test/test.cc +++ b/test/test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ #include #include "lib/config.h" #include "lib/util.h" -#include "lib/ui_signaller.h" +#include "lib/signal_manager.h" #include "lib/film.h" #include "lib/job_manager.h" #include "lib/job.h" @@ -46,11 +46,13 @@ using std::min; using std::cout; using std::cerr; using std::list; +using std::abs; using boost::shared_ptr; +using boost::scoped_array; boost::filesystem::path private_data = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"); -class TestUISignaller : public UISignaller +class TestSignalManager : public SignalManager { public: /* No wakes in tests: we call ui_idle ourselves */ @@ -67,16 +69,16 @@ struct TestConfig dcpomatic_setup (); Config::instance()->set_num_local_encoding_threads (1); - Config::instance()->set_server_port_base (61920); + Config::instance()->set_server_port_base (61921); Config::instance()->set_default_isdcf_metadata (ISDCFMetadata ()); - Config::instance()->set_default_container (static_cast (0)); + Config::instance()->set_default_container (Ratio::from_id ("185")); Config::instance()->set_default_dcp_content_type (static_cast (0)); Config::instance()->set_default_audio_delay (0); Config::instance()->set_default_j2k_bandwidth (100000000); ServerFinder::instance()->disable (); - ui_signaller = new TestUISignaller (); + signal_manager = new TestSignalManager (); } ~TestConfig () @@ -130,19 +132,19 @@ check_audio_file (boost::filesystem::path ref, boost::filesystem::path check) /* buffer_size is in frames */ sf_count_t const buffer_size = 65536 * ref_info.channels; - int32_t* ref_buffer = new int32_t[buffer_size]; - int32_t* check_buffer = new int32_t[buffer_size]; + scoped_array ref_buffer (new int32_t[buffer_size]); + scoped_array check_buffer (new int32_t[buffer_size]); sf_count_t N = ref_info.frames; while (N) { sf_count_t this_time = min (buffer_size, N); - sf_count_t r = sf_readf_int (ref_file, ref_buffer, this_time); + sf_count_t r = sf_readf_int (ref_file, ref_buffer.get(), this_time); BOOST_CHECK_EQUAL (r, this_time); - r = sf_readf_int (check_file, check_buffer, this_time); + r = sf_readf_int (check_file, check_buffer.get(), this_time); BOOST_CHECK_EQUAL (r, this_time); for (sf_count_t i = 0; i < this_time; ++i) { - BOOST_CHECK (fabs (ref_buffer[i] - check_buffer[i]) <= 65536); + BOOST_REQUIRE (abs (ref_buffer[i] - check_buffer[i]) <= 65536); } N -= this_time; @@ -209,8 +211,9 @@ check_dcp (boost::filesystem::path ref, boost::filesystem::path check) options.max_std_dev_pixel_error = 5; options.max_audio_sample_error = 255; options.cpl_annotation_texts_can_differ = true; - options.mxf_filenames_can_differ = true; + options.reel_annotation_texts_can_differ = true; options.reel_hashes_can_differ = true; + options.issue_dates_can_differ = true; BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2))); } @@ -224,15 +227,15 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list ignore) 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 () && l != test_children.end ()) { - + while (k != ref_children.end ()) { + /* XXX: should be doing xmlpp::EntityReference, xmlpp::XIncludeEnd, xmlpp::XIncludeStart */ xmlpp::Element* ref_el = dynamic_cast (*k); @@ -249,20 +252,23 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list ignore) BOOST_CHECK_EQUAL (ref_cn->get_content(), test_cn->get_content ()); } - xmlpp::Attribute* ref_at = dynamic_cast (*k); - xmlpp::Attribute* test_at = dynamic_cast (*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; } - BOOST_CHECK (k == ref_children.end ()); - BOOST_CHECK (l == test_children.end ()); + xmlpp::Element::AttributeList ref_attributes = ref->get_attributes (); + xmlpp::Element::AttributeList test_attributes = test->get_attributes (); + BOOST_CHECK_EQUAL (ref_attributes.size(), test_attributes.size ()); + + xmlpp::Element::AttributeList::const_iterator m = ref_attributes.begin(); + xmlpp::Element::AttributeList::const_iterator n = test_attributes.begin(); + while (m != ref_attributes.end ()) { + BOOST_CHECK_EQUAL ((*m)->get_name(), (*n)->get_name()); + BOOST_CHECK_EQUAL ((*m)->get_value(), (*n)->get_value()); + + ++m; + ++n; + } } void @@ -281,8 +287,11 @@ wait_for_jobs () { JobManager* jm = JobManager::instance (); while (jm->work_to_do ()) { - ui_signaller->ui_idle (); + signal_manager->ui_idle (); } + + cout << "Waiting for jobs: all finished; errors=" << jm->errors() << ".\n"; + if (jm->errors ()) { int N = 0; for (list >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) { @@ -300,10 +309,15 @@ wait_for_jobs () } } } - - BOOST_CHECK (!jm->errors()); - ui_signaller->ui_idle (); + signal_manager->ui_idle (); + + if (jm->errors ()) { + cout << "Dropping JobManager\n"; + JobManager::drop (); + } else { + cout << "Not dropping JobManager\n"; + } } void