X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Ftest.cc;h=c7a9e95bfd6f8d6a78eda143c4020f4d4bf458ce;hp=71cd50ac928b9b9cab897abc445532c7c918a55e;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=12efbd5938f08eb445b43f539fa4f27aa5caccfb diff --git a/test/test.cc b/test/test.cc index 71cd50ac9..c7a9e95bf 100644 --- a/test/test.cc +++ b/test/test.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -21,24 +22,27 @@ * @brief Overall test stuff and useful methods for tests. */ -#include -#include -#include -#include -#include -#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" #include "lib/cross.h" -#include "lib/server_finder.h" +#include "lib/encode_server_finder.h" #include "lib/image.h" +#include "lib/ratio.h" +#include "lib/log_entry.h" +#include +#include +#include +#include #define BOOST_TEST_DYN_LINK #define BOOST_TEST_MODULE dcpomatic_test #include +#include +#include +#include using std::string; using std::vector; @@ -46,11 +50,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 +73,17 @@ 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); + Config::instance()->set_log_types (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR); - ServerFinder::instance()->disable (); + EncodeServerFinder::instance()->disable (); - ui_signaller = new TestUISignaller (); + signal_manager = new TestSignalManager (); } ~TestConfig () @@ -104,10 +111,10 @@ new_test_film (string name) if (boost::filesystem::exists (p)) { boost::filesystem::remove_all (p); } - - shared_ptr f = shared_ptr (new Film (p.string())); - f->write_metadata (); - return f; + + shared_ptr film = shared_ptr (new Film (p.string())); + film->write_metadata (); + return film; } void @@ -117,7 +124,7 @@ check_audio_file (boost::filesystem::path ref, boost::filesystem::path check) ref_info.format = 0; SNDFILE* ref_file = sf_open (ref.string().c_str(), SFM_READ, &ref_info); BOOST_CHECK (ref_file); - + SF_INFO check_info; check_info.format = 0; SNDFILE* check_file = sf_open (check.string().c_str(), SFM_READ, &check_info); @@ -130,19 +137,23 @@ 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_MESSAGE ( + abs (ref_buffer[i] - check_buffer[i]) <= 65536, + ref << " differs from " << check << " at " << (ref_info.frames - N + i) << " of " << ref_info.frames + << "(" << ref_buffer[i] << " vs " << check_buffer[i] << ")" + ); } N -= this_time; @@ -158,14 +169,14 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check) BOOST_CHECK (ref_file); FILE* check_file = fopen_boost (check, "rb"); BOOST_CHECK (check_file); - + int const buffer_size = 65536; uint8_t* ref_buffer = new uint8_t[buffer_size]; uint8_t* check_buffer = new uint8_t[buffer_size]; SafeStringStream error; error << "File " << check.string() << " differs from reference " << ref.string(); - + while (N) { uintmax_t this_time = min (uintmax_t (buffer_size), N); size_t r = fread (ref_buffer, 1, this_time, ref_file); @@ -177,7 +188,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check) if (memcmp (ref_buffer, check_buffer, this_time)) { break; } - + N -= this_time; } @@ -209,9 +220,10 @@ 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_names_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 +236,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 +261,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 +296,10 @@ wait_for_jobs () { JobManager* jm = JobManager::instance (); while (jm->work_to_do ()) { - ui_signaller->ui_idle (); + while (signal_manager->ui_idle ()) {} + dcpomatic_sleep (1); } + if (jm->errors ()) { int N = 0; for (list >::iterator i = jm->_jobs.begin(); i != jm->_jobs.end(); ++i) { @@ -300,16 +317,22 @@ wait_for_jobs () } } } - - BOOST_CHECK (!jm->errors()); - ui_signaller->ui_idle (); + while (signal_manager->ui_idle ()) {} + + if (jm->errors ()) { + JobManager::drop (); + } } void write_image (shared_ptr image, boost::filesystem::path file) { - using namespace MagickCore; +#ifdef DCPOMATIC_IMAGE_MAGICK + using namespace MagickCore; +#else + using namespace MagickLib; +#endif Magick::Image m (image->size().width, image->size().height, "ARGB", CharPixel, (void *) image->data()[0]); m.write (file.string ());