summaryrefslogtreecommitdiff
path: root/test/dcpomatic_time_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-07-31 23:52:02 +0100
committerCarl Hetherington <cth@carlh.net>2016-07-31 23:52:02 +0100
commit9c01623c3038b978ba732de2ad147d29fad60afe (patch)
tree72907bc7560dcef38d43f363881e2b959d4c0d34 /test/dcpomatic_time_test.cc
parent83a2cf5916fe7207e786b95aa5c560b6b5d11e4e (diff)
Allow configuration of MXF/XML filenames (part of #710).
Diffstat (limited to 'test/dcpomatic_time_test.cc')
-rw-r--r--test/dcpomatic_time_test.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/test/dcpomatic_time_test.cc b/test/dcpomatic_time_test.cc
index 716ec98d7..6dd4094da 100644
--- a/test/dcpomatic_time_test.cc
+++ b/test/dcpomatic_time_test.cc
@@ -55,18 +55,20 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_period_overlaps_test)
TimePeriod<DCPTime> a (DCPTime (0), DCPTime (4));
TimePeriod<DCPTime> b (DCPTime (4), DCPTime (8));
- BOOST_CHECK (!a.overlaps (b));
+ BOOST_CHECK (!a.overlap (b));
/* Some more obvious non-overlaps */
a = TimePeriod<DCPTime> (DCPTime (0), DCPTime (4));
b = TimePeriod<DCPTime> (DCPTime (5), DCPTime (8));
- BOOST_CHECK (!a.overlaps (b));
+ BOOST_CHECK (!a.overlap (b));
/* Some overlaps */
a = TimePeriod<DCPTime> (DCPTime (0), DCPTime (4));
b = TimePeriod<DCPTime> (DCPTime (3), DCPTime (8));
- BOOST_CHECK (a.overlaps (b));
+ BOOST_CHECK (a.overlap (b));
+ BOOST_CHECK_EQUAL (a.overlap(b).get(), DCPTimePeriod(DCPTime(3), DCPTime(4)));
a = TimePeriod<DCPTime> (DCPTime (1), DCPTime (9));
b = TimePeriod<DCPTime> (DCPTime (0), DCPTime (10));
- BOOST_CHECK (a.overlaps (b));
+ BOOST_CHECK (a.overlap (b));
+ BOOST_CHECK_EQUAL (a.overlap(b).get(), DCPTimePeriod(DCPTime(1), DCPTime(9)));
}