diff options
| -rw-r--r-- | test/ssa_subtitle_test.cc | 13 | ||||
| -rw-r--r-- | test/subtitle_position_test.cc | 4 | ||||
| -rw-r--r-- | test/test.cc | 1 |
3 files changed, 14 insertions, 4 deletions
diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc index 5c2e61b7e..3a1430696 100644 --- a/test/ssa_subtitle_test.cc +++ b/test/ssa_subtitle_test.cc @@ -32,6 +32,7 @@ #include "lib/ratio.h" #include "lib/text_content.h" #include "test.h" +#include <dcp/interop_subtitle_asset.h> #include <boost/test/unit_test.hpp> #include <boost/algorithm/string.hpp> @@ -61,8 +62,16 @@ BOOST_AUTO_TEST_CASE (ssa_subtitle_test1) make_and_verify_dcp (film, { dcp::VerificationNote::Code::INVALID_STANDARD }); - /* Find the subtitle file and check it */ - check_xml (subtitle_file(film), TestPaths::private_data() / "DKH_UT_EN20160601def.xml", {"SubtitleID"}); + auto ref = make_shared<dcp::InteropSubtitleAsset>(TestPaths::private_data() / "DKH_UT_EN20160601def.xml"); + auto check = make_shared<dcp::InteropSubtitleAsset>(subtitle_file(film)); + + dcp::EqualityOptions options; + options.max_subtitle_vertical_position_error = 0.1; + BOOST_CHECK(ref->equals(check, options, [](dcp::NoteType t, string n) { + if (t == dcp::NoteType::ERROR) { + std::cerr << n << "\n"; + } + })); cl.run (); } diff --git a/test/subtitle_position_test.cc b/test/subtitle_position_test.cc index 0237a417c..3b35c02c6 100644 --- a/test/subtitle_position_test.cc +++ b/test/subtitle_position_test.cc @@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE(interop_correctly_placed_in_smpte) BOOST_REQUIRE_EQUAL(output_subs.size(), 1U); BOOST_CHECK(output_subs[0]->v_align() == dcp::VAlign::BOTTOM); - BOOST_CHECK_CLOSE(output_subs[0]->v_position(), 0.07074, 1e-3); + BOOST_CHECK_CLOSE(output_subs[0]->v_position(), 0.07074, 2); } @@ -145,7 +145,7 @@ vpos_test(dcp::VAlign reference, float position, dcp::Standard from, dcp::Standa BOOST_REQUIRE_EQUAL(subtitles.size(), 1U); BOOST_CHECK(subtitles[0]->v_align() == reference); - BOOST_CHECK_CLOSE(subtitles[0]->v_position(), position, 1e-3); + BOOST_CHECK_CLOSE(subtitles[0]->v_position(), position, 2); } diff --git a/test/test.cc b/test/test.cc index 02b567237..d4c0798c0 100644 --- a/test/test.cc +++ b/test/test.cc @@ -552,6 +552,7 @@ check_dcp (boost::filesystem::path ref, boost::filesystem::path check) options.reel_annotation_texts_can_differ = true; options.reel_hashes_can_differ = true; options.issue_dates_can_differ = true; + options.max_subtitle_vertical_position_error = 0.001; BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2))); } |