diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-05-08 00:15:51 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-05-08 00:15:51 +0100 |
| commit | 9facd099fd1b0651af721883ea1ffe5590d4b23b (patch) | |
| tree | 28044eba95ffb18fc37fc7f9fcb3685a09c49d0f /test | |
| parent | cc120b1a461fd91a8ea4553aa2f7fddce5f7f74a (diff) | |
| parent | 7b03aba8bc4e9df269430d79ce4ee2c6bd5f344c (diff) | |
Merge branch 'master' of ssh://main.carlh.net/home/carl/git/libdcp
Diffstat (limited to 'test')
| -rw-r--r-- | test/dcp_time_test.cc | 4 | ||||
| -rw-r--r-- | test/frame_info_hash_test.cc | 4 | ||||
| -rw-r--r-- | test/verify_test.cc | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc index 48a35b5a..405640f8 100644 --- a/test/dcp_time_test.cc +++ b/test/dcp_time_test.cc @@ -102,7 +102,9 @@ BOOST_AUTO_TEST_CASE (dcp_time) b = dcp::Time (9, 12, 41, 17, 99); BOOST_CHECK_EQUAL (b.rebase(250), dcp::Time(9, 12, 41, 43, 250)); a = dcp::Time (0, 2, 57, 999, 1000); - BOOST_CHECK_EQUAL (a.rebase(250), dcp::Time(0, 2, 57, 250, 250)); + BOOST_CHECK_EQUAL (a.rebase(250), dcp::Time(0, 2, 58, 0, 250)); + a = dcp::Time (0, 47, 9, 998, 1000); + BOOST_CHECK_EQUAL (a.rebase(250), dcp::Time(0, 47, 10, 0, 250)); /* Check some allowed constructions from string */ diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc index d1f81d2c..8e894d29 100644 --- a/test/frame_info_hash_test.cc +++ b/test/frame_info_hash_test.cc @@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (frame_info_hash_test) unsigned int seed = 42; /* Check a few random frames */ - check (&seed, writer, "bb19bc96466d1b65708dabafa2e2ec0f"); - check (&seed, writer, "426ec5ac52d7a27fe278f7736d53151f"); + check (&seed, writer, "c039c5a0e5d20bc646f7e9c10e2d5874"); + check (&seed, writer, "d9e694cfe84544c54a869c128ba39343"); check (&seed, writer, "fafb05a0039cb9fc604279c90a13cb87"); } diff --git a/test/verify_test.cc b/test/verify_test.cc index a0360730..f39d7ae6 100644 --- a/test/verify_test.cc +++ b/test/verify_test.cc @@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE (verify_test1) notes = dcp::verify (directories, &stage, &progress); BOOST_CHECK_EQUAL (notes.size(), 2); BOOST_CHECK_EQUAL (notes.front().type(), dcp::VerificationNote::VERIFY_ERROR); - BOOST_CHECK_EQUAL (notes.front().note(), "Picture asset hash is incorrect"); + BOOST_CHECK_EQUAL (notes.front().note(), "Picture asset hash is incorrect."); BOOST_CHECK_EQUAL (notes.back().type(), dcp::VerificationNote::VERIFY_ERROR); - BOOST_CHECK_EQUAL (notes.back().note(), "Sound asset hash is incorrect"); + BOOST_CHECK_EQUAL (notes.back().note(), "Sound asset hash is incorrect."); } |