X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcpomatic_time_test.cc;h=5d23f247808135eeadfc94ad17451ffb7b42db45;hb=fd130fc0b0c7421c7b1af613ff1f31ba3fc4f03b;hp=f49d29a57caae5c7c77a046acea746c0ce82e9b4;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0;p=dcpomatic.git

diff --git a/test/dcpomatic_time_test.cc b/test/dcpomatic_time_test.cc
index f49d29a57..5d23f2478 100644
--- a/test/dcpomatic_time_test.cc
+++ b/test/dcpomatic_time_test.cc
@@ -19,15 +19,19 @@
 */
 
 /** @file  test/dcpomatic_time_test.cc
- *  @brief Test Time and TimePeriod classes.
+ *  @brief Test dcpomatic::Time and dcpomatic::TimePeriod classes.
  *  @ingroup selfcontained
  */
 
 #include "lib/dcpomatic_time.h"
+#include "lib/dcpomatic_time_coalesce.h"
 #include <boost/test/unit_test.hpp>
 #include <list>
+#include <iostream>
 
 using std::list;
+using std::cout;
+using namespace dcpomatic;
 
 BOOST_AUTO_TEST_CASE (dcpomatic_time_test)
 {
@@ -214,3 +218,135 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test7)
 	++i;
 	BOOST_REQUIRE (i == r.end ());
 }
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_subtract_test8)
+{
+	DCPTimePeriod A (DCPTime(0), DCPTime(32000));
+	list<DCPTimePeriod> B;
+	B.push_back (DCPTimePeriod (DCPTime(8000), DCPTime(20000)));
+	B.push_back (DCPTimePeriod (DCPTime(28000), DCPTime(32000)));
+	list<DCPTimePeriod> r = subtract (A, B);
+	list<DCPTimePeriod>::const_iterator i = r.begin ();
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (*i == DCPTimePeriod(DCPTime(0), DCPTime(8000)));
+	++i;
+	BOOST_REQUIRE (i != r.end ());
+	BOOST_CHECK (*i == DCPTimePeriod(DCPTime(20000), DCPTime(28000)));
+	++i;
+	BOOST_REQUIRE (i == r.end ());
+}
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test1)
+{
+	DCPTimePeriod A (DCPTime(14), DCPTime(29));
+	DCPTimePeriod B (DCPTime(45), DCPTime(91));
+	list<DCPTimePeriod> p;
+	p.push_back (A);
+	p.push_back (B);
+	list<DCPTimePeriod> q = coalesce (p);
+	BOOST_REQUIRE_EQUAL (q.size(), 2U);
+	BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(29)));
+	BOOST_CHECK (q.back () == DCPTimePeriod(DCPTime(45), DCPTime(91)));
+}
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test2)
+{
+	DCPTimePeriod A (DCPTime(14), DCPTime(29));
+	DCPTimePeriod B (DCPTime(26), DCPTime(91));
+	list<DCPTimePeriod> p;
+	p.push_back (A);
+	p.push_back (B);
+	list<DCPTimePeriod> q = coalesce (p);
+	BOOST_REQUIRE_EQUAL (q.size(), 1U);
+	BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(91)));
+}
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test3)
+{
+	DCPTimePeriod A (DCPTime(14), DCPTime(29));
+	DCPTimePeriod B (DCPTime(29), DCPTime(91));
+	list<DCPTimePeriod> p;
+	p.push_back (A);
+	p.push_back (B);
+	list<DCPTimePeriod> q = coalesce (p);
+	BOOST_REQUIRE_EQUAL (q.size(), 1U);
+	BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(91)));
+}
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test4)
+{
+	DCPTimePeriod A (DCPTime(14), DCPTime(29));
+	DCPTimePeriod B (DCPTime(20), DCPTime(91));
+	DCPTimePeriod C (DCPTime(35), DCPTime(106));
+	list<DCPTimePeriod> p;
+	p.push_back (A);
+	p.push_back (B);
+	p.push_back (C);
+	list<DCPTimePeriod> q = coalesce (p);
+	BOOST_REQUIRE_EQUAL (q.size(), 1U);
+	BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(106)));
+}
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_coalesce_test5)
+{
+	DCPTimePeriod A (DCPTime(14), DCPTime(29));
+	DCPTimePeriod B (DCPTime(20), DCPTime(91));
+	DCPTimePeriod C (DCPTime(100), DCPTime(106));
+	list<DCPTimePeriod> p;
+	p.push_back (A);
+	p.push_back (B);
+	p.push_back (C);
+	list<DCPTimePeriod> q = coalesce (p);
+	BOOST_REQUIRE_EQUAL (q.size(), 2U);
+	BOOST_CHECK (q.front() == DCPTimePeriod(DCPTime(14), DCPTime(91)));
+	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)
+{
+	BOOST_CHECK_EQUAL (DCPTime(0).ceil(DCPTime::HZ / 2).get(), 0);
+	BOOST_CHECK_EQUAL (DCPTime(1).ceil(DCPTime::HZ / 2).get(), 2);
+	BOOST_CHECK_EQUAL (DCPTime(2).ceil(DCPTime::HZ / 2).get(), 2);
+	BOOST_CHECK_EQUAL (DCPTime(3).ceil(DCPTime::HZ / 2).get(), 4);
+
+	BOOST_CHECK_EQUAL (DCPTime(0).ceil(DCPTime::HZ / 42).get(), 0);
+	BOOST_CHECK_EQUAL (DCPTime(1).ceil(DCPTime::HZ / 42).get(), 42);
+	BOOST_CHECK_EQUAL (DCPTime(42).ceil(DCPTime::HZ / 42).get(), 42);
+	BOOST_CHECK_EQUAL (DCPTime(43).ceil(DCPTime::HZ / 42).get(), 84);
+
+	/* Check that rounding up to non-integer frame rates works */
+	BOOST_CHECK_EQUAL (DCPTime(45312).ceil(29.976).get(), 48038);
+
+	/* Check another tricky case that used to fail */
+	BOOST_CHECK_EQUAL (DCPTime(212256039).ceil(23.976).get(), 212256256);
+}
+
+/* Straightforward test of DCPTime::floor */
+BOOST_AUTO_TEST_CASE (dcpomatic_time_floor_test)
+{
+	BOOST_CHECK_EQUAL (DCPTime(0).floor(DCPTime::HZ / 2).get(), 0);
+	BOOST_CHECK_EQUAL (DCPTime(1).floor(DCPTime::HZ / 2).get(), 0);
+	BOOST_CHECK_EQUAL (DCPTime(2).floor(DCPTime::HZ / 2).get(), 2);
+	BOOST_CHECK_EQUAL (DCPTime(3).floor(DCPTime::HZ / 2).get(), 2);
+
+	BOOST_CHECK_EQUAL (DCPTime(0).floor(DCPTime::HZ / 42).get(), 0);
+	BOOST_CHECK_EQUAL (DCPTime(1).floor(DCPTime::HZ / 42).get(), 0);
+	BOOST_CHECK_EQUAL (DCPTime(42).floor(DCPTime::HZ / 42.0).get(), 42);
+	BOOST_CHECK_EQUAL (DCPTime(43).floor(DCPTime::HZ / 42.0).get(), 42);
+
+	/* Check that rounding down to non-integer frame rates works */
+	BOOST_CHECK_EQUAL (DCPTime(45312).floor(29.976).get(), 44836);
+}