X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Futil_test.cc;h=e296229e1ad3d42c3242071d731dd1e01532022a;hb=refs%2Ftags%2Fv2.7.3;hp=43b7b9b1dde09c8a57beb932a7511ea76d720ff9;hpb=937b96045830a2326daff83b70b892f2d25244ff;p=dcpomatic.git diff --git a/test/util_test.cc b/test/util_test.cc index 43b7b9b1d..e296229e1 100644 --- a/test/util_test.cc +++ b/test/util_test.cc @@ -33,12 +33,21 @@ BOOST_AUTO_TEST_CASE (md5_digest_test) { vector p; p.push_back ("test/data/md5.test"); - string const t = md5_digest (p, shared_ptr ()); - BOOST_CHECK_EQUAL (t, "15058685ba99decdc4398c7634796eb0"); + BOOST_CHECK_EQUAL (md5_digest_head_tail (p, 1024), "57497ef84a0487f2bb0939a1f5703912"); + + p.push_back ("test/data/md5.test2"); + BOOST_CHECK_EQUAL (md5_digest_head_tail (p, 1024), "5a3a89857b931755ae728a518224a05c"); + + p.clear (); + p.push_back ("test/data/md5.test3"); + p.push_back ("test/data/md5.test"); + p.push_back ("test/data/md5.test2"); + p.push_back ("test/data/md5.test4"); + BOOST_CHECK_EQUAL (md5_digest_head_tail (p, 1024), "52ccf111e4e72b58bb7b2aaa6bd45ea5"); p.clear (); p.push_back ("foobar"); - BOOST_CHECK_THROW (md5_digest (p, shared_ptr ()), std::runtime_error); + BOOST_CHECK_THROW (md5_digest_head_tail (p, 1024), OpenFileError); } /* Straightforward test of DCPTime::round_up */ @@ -48,7 +57,7 @@ BOOST_AUTO_TEST_CASE (dcptime_round_up_test) BOOST_CHECK_EQUAL (DCPTime (1).round_up (DCPTime::HZ / 2), DCPTime (2)); BOOST_CHECK_EQUAL (DCPTime (2).round_up (DCPTime::HZ / 2), DCPTime (2)); BOOST_CHECK_EQUAL (DCPTime (3).round_up (DCPTime::HZ / 2), DCPTime (4)); - + BOOST_CHECK_EQUAL (DCPTime (0).round_up (DCPTime::HZ / 42), DCPTime (0)); BOOST_CHECK_EQUAL (DCPTime (1).round_up (DCPTime::HZ / 42), DCPTime (42)); BOOST_CHECK_EQUAL (DCPTime (42).round_up (DCPTime::HZ / 42), DCPTime (42));