X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcpomatic_time_test.cc;h=f49d29a57caae5c7c77a046acea746c0ce82e9b4;hb=eb75d656970d2195ff03f7d1bb57db959249cb96;hp=716ec98d756e6547fd0d1c0e7f9d4542e0416182;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/test/dcpomatic_time_test.cc b/test/dcpomatic_time_test.cc
index 716ec98d7..f49d29a57 100644
--- a/test/dcpomatic_time_test.cc
+++ b/test/dcpomatic_time_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,8 +18,16 @@
 
 */
 
-#include <boost/test/unit_test.hpp>
+/** @file  test/dcpomatic_time_test.cc
+ *  @brief Test Time and TimePeriod classes.
+ *  @ingroup selfcontained
+ */
+
 #include "lib/dcpomatic_time.h"
+#include <boost/test/unit_test.hpp>
+#include <list>
+
+using std::list;
 
 BOOST_AUTO_TEST_CASE (dcpomatic_time_test)
 {
@@ -55,18 +63,154 @@ 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)));
+}
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test1)
+{
+	DCPTimePeriod A (DCPTime (0), DCPTime (106));
+	list<DCPTimePeriod> B;
+	B.push_back (DCPTimePeriod (DCPTime (0), DCPTime (42)));
+	B.push_back (DCPTimePeriod (DCPTime (52), DCPTime (91)));
+	B.push_back (DCPTimePeriod (DCPTime (94), DCPTime (106)));
+	list<DCPTimePeriod> r = subtract (A, B);
+	list<DCPTimePeriod>::const_iterator i = r.begin ();
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from == DCPTime (42));
+	BOOST_CHECK (i->to == DCPTime (52));
+	++i;
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from == DCPTime (91));
+	BOOST_CHECK (i->to == DCPTime (94));
+	++i;
+	BOOST_REQUIRE (i == r.end ());
+}
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test2)
+{
+	DCPTimePeriod A (DCPTime (0), DCPTime (106));
+	list<DCPTimePeriod> B;
+	B.push_back (DCPTimePeriod (DCPTime (14), DCPTime (42)));
+	B.push_back (DCPTimePeriod (DCPTime (52), DCPTime (91)));
+	B.push_back (DCPTimePeriod (DCPTime (94), DCPTime (106)));
+	list<DCPTimePeriod> r = subtract (A, B);
+	list<DCPTimePeriod>::const_iterator i = r.begin ();
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from == DCPTime (0));
+	BOOST_CHECK (i->to == DCPTime (14));
+	++i;
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from == DCPTime (42));
+	BOOST_CHECK (i->to == DCPTime (52));
+	++i;
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from == DCPTime (91));
+	BOOST_CHECK (i->to == DCPTime (94));
+	++i;
+	BOOST_REQUIRE (i == r.end ());
+}
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test3)
+{
+	DCPTimePeriod A (DCPTime (0), DCPTime (106));
+	list<DCPTimePeriod> B;
+	B.push_back (DCPTimePeriod (DCPTime (14), DCPTime (42)));
+	B.push_back (DCPTimePeriod (DCPTime (52), DCPTime (91)));
+	B.push_back (DCPTimePeriod (DCPTime (94), DCPTime (99)));
+	list<DCPTimePeriod> r = subtract (A, B);
+	list<DCPTimePeriod>::const_iterator i = r.begin ();
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from == DCPTime (0));
+	BOOST_CHECK (i->to == DCPTime (14));
+	++i;
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from == DCPTime (42));
+	BOOST_CHECK (i->to == DCPTime (52));
+	++i;
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from == DCPTime (91));
+	BOOST_CHECK (i->to == DCPTime (94));
+	++i;
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from == DCPTime (99));
+	BOOST_CHECK (i->to == DCPTime (106));
+	++i;
+	BOOST_REQUIRE (i == r.end ());
+}
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test4)
+{
+	DCPTimePeriod A (DCPTime (0), DCPTime (106));
+	list<DCPTimePeriod> B;
+	list<DCPTimePeriod> r = subtract (A, B);
+	list<DCPTimePeriod>::const_iterator i = r.begin ();
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from == DCPTime (0));
+	BOOST_CHECK (i->to == DCPTime (106));
+	++i;
+	BOOST_REQUIRE (i == r.end ());
+}
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test5)
+{
+	DCPTimePeriod A (DCPTime (0), DCPTime (106));
+	list<DCPTimePeriod> B;
+	B.push_back (DCPTimePeriod (DCPTime (14), DCPTime (42)));
+	B.push_back (DCPTimePeriod (DCPTime (42), DCPTime (91)));
+	B.push_back (DCPTimePeriod (DCPTime (94), DCPTime (99)));
+	list<DCPTimePeriod> r = subtract (A, B);
+	list<DCPTimePeriod>::const_iterator i = r.begin ();
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from == DCPTime (0));
+	BOOST_CHECK (i->to == DCPTime (14));
+	++i;
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from ==DCPTime (91));
+	BOOST_CHECK (i->to == DCPTime (94));
+	++i;
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from == DCPTime (99));
+	BOOST_CHECK (i->to == DCPTime (106));
+	++i;
+	BOOST_REQUIRE (i == r.end ());
+}
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test6)
+{
+	DCPTimePeriod A (DCPTime (0), DCPTime (106));
+	list<DCPTimePeriod> B;
+	B.push_back (DCPTimePeriod (DCPTime (0), DCPTime (42)));
+	B.push_back (DCPTimePeriod (DCPTime (42), DCPTime (91)));
+	B.push_back (DCPTimePeriod (DCPTime (91), DCPTime (106)));
+	list<DCPTimePeriod> r = subtract (A, B);
+	BOOST_CHECK (r.empty());
+}
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test7)
+{
+	DCPTimePeriod A (DCPTime (228), DCPTime (356));
+	list<DCPTimePeriod> B;
+	B.push_back (DCPTimePeriod (DCPTime (34), DCPTime (162)));
+	list<DCPTimePeriod> r = subtract (A, B);
+	list<DCPTimePeriod>::const_iterator i = r.begin ();
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (i->from == DCPTime (228));
+	BOOST_CHECK (i->to == DCPTime (356));
+	++i;
+	BOOST_REQUIRE (i == r.end ());
 }