X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Ftest.cc;h=8ca103a6bdedb9800c97ef94f3f14509ac5253ee;hb=fbaade900b1479fafe54bbbe904cf8483a577e94;hp=90b40ed25b1b925af82d857beccb81022d3e00e3;hpb=e21a8bc77f80374a78085c492e4dd14315457e5f;p=dcpomatic.git diff --git a/test/test.cc b/test/test.cc index 90b40ed25..8ca103a6b 100644 --- a/test/test.cc +++ b/test/test.cc @@ -45,6 +45,8 @@ #include "test.h" #include #include +#include +#include #include #include #include @@ -94,13 +96,19 @@ TestPaths::TestPaths::private_data () return boost::filesystem::path(env); } - return boost::filesystem::canonical(boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private")); + auto relative = boost::filesystem::path ("..") / boost::filesystem::path ("dcpomatic-test-private"); + if (!boost::filesystem::exists(relative)) { + std::cerr << "No private test data found! Tests may fail.\n"; + return relative; + } + + return boost::filesystem::canonical(relative); } boost::filesystem::path TestPaths::xsd () { - return boost::filesystem::canonical(boost::filesystem::path("..") / boost::filesystem::path("libdcp") / boost::filesystem::path("xsd")); + return boost::filesystem::current_path().parent_path() / "libdcp" / "xsd"; } @@ -115,6 +123,7 @@ setup_test_config () Config::instance()->set_default_j2k_bandwidth (100000000); Config::instance()->set_default_interop (false); Config::instance()->set_default_still_length (10); + Config::instance()->set_default_dcp_audio_channels(8); Config::instance()->set_log_types ( LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR | LogEntry::TYPE_DISK @@ -126,6 +135,8 @@ setup_test_config () auto decryption = make_shared(dcp::file_to_string("test/data/decryption_chain")); decryption->set_key(dcp::file_to_string("test/data/decryption_key")); Config::instance()->set_decryption_chain (decryption); + Config::instance()->set_dcp_asset_filename_format(dcp::NameFormat("%t")); + Config::instance()->set_cinemas_file("test/data/empty_cinemas.xml"); } @@ -148,6 +159,7 @@ struct TestConfig dcpomatic_setup (); setup_test_config (); + capture_ffmpeg_logs(); EncodeServerFinder::instance()->stop (); @@ -276,6 +288,7 @@ check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check BOOST_REQUIRE (!ASDCP_FAILURE (check_reader.FillAudioDescriptor (check_desc))); BOOST_REQUIRE_EQUAL (ref_desc.ContainerDuration, check_desc.ContainerDuration); + BOOST_REQUIRE_MESSAGE(ref_desc.ChannelCount, check_desc.ChannelCount); ASDCP::PCM::FrameBuffer ref_buffer (Kumu::Megabyte); ASDCP::PCM::FrameBuffer check_buffer (Kumu::Megabyte); @@ -536,7 +549,7 @@ check_dcp (boost::filesystem::path ref, shared_ptr film) void -check_dcp (boost::filesystem::path ref, boost::filesystem::path check) +check_dcp(boost::filesystem::path ref, boost::filesystem::path check, bool sound_can_differ) { dcp::DCP ref_dcp (ref); ref_dcp.read (); @@ -550,10 +563,12 @@ check_dcp (boost::filesystem::path ref, boost::filesystem::path check) options.cpl_annotation_texts_can_differ = true; options.reel_annotation_texts_can_differ = true; options.reel_hashes_can_differ = true; + options.asset_hashes_can_differ = true; options.issue_dates_can_differ = true; options.max_subtitle_vertical_position_error = 0.001; + options.sound_assets_can_differ = sound_can_differ; - BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2))); + BOOST_CHECK_MESSAGE(ref_dcp.equals(check_dcp, options, boost::bind (note, _1, _2)), check << " does not match " << ref); } void @@ -828,7 +843,7 @@ dcp_file (shared_ptr film, string prefix) vector matches; std::copy_if(recursive_directory_iterator(film->dir(film->dcp_name())), recursive_directory_iterator(), std::back_inserter(matches), [&prefix](directory_entry const& entry) { - return boost::algorithm::starts_with(entry.path().leaf().string(), prefix); + return boost::algorithm::starts_with(entry.path().filename().string(), prefix); }); BOOST_REQUIRE_MESSAGE(matches.size() == 1, "Found " << matches.size() << " files with prefix " << prefix); @@ -839,7 +854,7 @@ boost::filesystem::path subtitle_file (shared_ptr film) { for (auto i: boost::filesystem::recursive_directory_iterator(film->directory().get() / film->dcp_name(false))) { - if (boost::algorithm::starts_with(i.path().leaf().string(), "sub_")) { + if (boost::algorithm::starts_with(i.path().filename().string(), "sub_")) { return i.path(); } } @@ -931,12 +946,9 @@ void progress (float) {} void -make_and_verify_dcp (shared_ptr film, vector ignore) +verify_dcp(boost::filesystem::path dir, vector ignore) { - film->write_metadata (); - make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); - BOOST_REQUIRE (!wait_for_jobs()); - auto notes = dcp::verify ({film->dir(film->dcp_name())}, &stage, &progress, TestPaths::xsd()); + auto notes = dcp::verify({dir}, {}, &stage, &progress, {}, TestPaths::xsd()); bool ok = true; for (auto i: notes) { if (find(ignore.begin(), ignore.end(), i.code()) == ignore.end()) { @@ -948,6 +960,16 @@ make_and_verify_dcp (shared_ptr film, vector } +void +make_and_verify_dcp (shared_ptr film, vector ignore) +{ + film->write_metadata (); + make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE); + BOOST_REQUIRE (!wait_for_jobs()); + verify_dcp({film->dir(film->dcp_name())}, ignore); +} + + void check_int_close (int a, int b, int d) { @@ -975,11 +997,11 @@ find_file (boost::filesystem::path dir, string filename_part) boost::optional found; for (auto i: boost::filesystem::directory_iterator(dir)) { if (i.path().filename().string().find(filename_part) != string::npos) { - BOOST_REQUIRE (!found); + BOOST_REQUIRE_MESSAGE(!found, "File " << filename_part << " found more than once in " << dir); found = i; } } - BOOST_REQUIRE (found); + BOOST_REQUIRE_MESSAGE(found, "Could not find " << filename_part << " in " << dir); return *found; }