X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fdcpomatic_time_test.cc;h=5d23f247808135eeadfc94ad17451ffb7b42db45;hp=b343a1376b608bc4bef4581354504546ec49eca0;hb=8f955150ff2b642109552dd234089f9a038bb3d6;hpb=b29eb5107c5e77fe01e43010e1582e733f6ceea1

diff --git a/test/dcpomatic_time_test.cc b/test/dcpomatic_time_test.cc
index b343a1376..5d23f2478 100644
--- a/test/dcpomatic_time_test.cc
+++ b/test/dcpomatic_time_test.cc
@@ -19,7 +19,7 @@
 */
 
 /** @file  test/dcpomatic_time_test.cc
- *  @brief Test Time and TimePeriod classes.
+ *  @brief Test dcpomatic::Time and dcpomatic::TimePeriod classes.
  *  @ingroup selfcontained
  */
 
@@ -302,6 +302,18 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test5)
 	BOOST_CHECK (q.back()  == DCPTimePeriod(DCPTime(100), DCPTime(106)));
 }
 
+BOOST_AUTO_TEST_CASE (test_coalesce_with_overlapping_periods)
+{
+	DCPTimePeriod A (DCPTime(0), DCPTime(10));
+	DCPTimePeriod B (DCPTime(2), DCPTime(8));
+	list<DCPTimePeriod> p;
+	p.push_back (A);
+	p.push_back (B);
+	auto q = coalesce(p);
+	BOOST_REQUIRE_EQUAL (q.size(), 1U);
+	BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(0), DCPTime(10)));
+}
+
 /* Straightforward test of DCPTime::ceil */
 BOOST_AUTO_TEST_CASE (dcpomatic_time_ceil_test)
 {