diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:32:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:32:26 +0100 |
| commit | da748cb939b586072b5cc8bba09f1c7f8b1236a3 (patch) | |
| tree | 5b5fe460ed4c2ec863198926b8873d3e97a37d00 /test | |
| parent | ed18fc59be461a8f08ffa8d52897f2710e0359bf (diff) | |
| parent | 190dc3381a03b5cdbe12881015d16ff18303844a (diff) | |
Merge branch 'master' into 12bit
Diffstat (limited to 'test')
| -rw-r--r-- | test/cpl_sar.cc | 2 | ||||
| -rw-r--r-- | test/dcp_time_test.cc | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/test/cpl_sar.cc b/test/cpl_sar.cc index c91ce287..a878e6b4 100644 --- a/test/cpl_sar.cc +++ b/test/cpl_sar.cc @@ -29,7 +29,7 @@ using boost::shared_ptr; */ BOOST_AUTO_TEST_CASE (cpl_sar) { - shared_ptr<libdcp::MonoPictureAsset> mp (new libdcp::MonoPictureAsset ("build/test/foo", "video.mxf")); + shared_ptr<libdcp::MonoPictureAsset> mp (new libdcp::MonoPictureAsset ("test/ref/DCP/foo", "video.mxf")); mp->set_interop (true); { diff --git a/test/dcp_time_test.cc b/test/dcp_time_test.cc index 6892711e..a8256998 100644 --- a/test/dcp_time_test.cc +++ b/test/dcp_time_test.cc @@ -59,4 +59,16 @@ BOOST_AUTO_TEST_CASE (dcp_time) BOOST_CHECK_EQUAL (libdcp::Time (4128391203LL).to_ticks(), 4128391203LL); BOOST_CHECK_EQUAL (libdcp::Time (60000).to_ticks(), 60000); + + a = libdcp::Time (3600 * 24, 24); + BOOST_CHECK_EQUAL (a.h, 1); + BOOST_CHECK_EQUAL (a.m, 0); + BOOST_CHECK_EQUAL (a.s, 0); + BOOST_CHECK_EQUAL (a.t, 0); + + a = libdcp::Time (60 * 24, 24); + BOOST_CHECK_EQUAL (a.h, 0); + BOOST_CHECK_EQUAL (a.m, 1); + BOOST_CHECK_EQUAL (a.s, 0); + BOOST_CHECK_EQUAL (a.t, 0); } |