X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcpomatic_time_test.cc;h=ae03d91c0e09a3c9ec36f76d508ae7210d2876a1;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hp=ca29d8839346fd2013527d25aeee337b580c616b;hpb=794396aa29061894ea359a6f30aa0f759a1f1b74;p=dcpomatic.git

diff --git a/test/dcpomatic_time_test.cc b/test/dcpomatic_time_test.cc
index ca29d8839..ae03d91c0 100644
--- a/test/dcpomatic_time_test.cc
+++ b/test/dcpomatic_time_test.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -54,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 (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 (a.overlap(b).get() == DCPTimePeriod(DCPTime(1), DCPTime(9)));
 }