No-op; fix GPL address and use the explicit-program-name version.

[dcpomatic.git] / test / dcpomatic_time_test.cc

diff --git a/test/dcpomatic_time_test.cc b/test/dcpomatic_time_test.cc
index 4462ae870f59ce2dfa1738e0fd099abbda379e3b..716ec98d756e6547fd0d1c0e7f9d4542e0416182 100644 (file)
--- 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/>.
 
 */
 
@@ -28,8 +29,7 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_test)
        for (int64_t i = 0; i < 62000; i += 2000) {
                DCPTime d (i);
                ContentTime c (d, frc);
-               std::cout << i << " " << d << " " << c << " " << c.frames (24.0) << " " << j << "\n";
-               BOOST_CHECK_EQUAL (c.frames (24.0), j);
+               BOOST_CHECK_EQUAL (c.frames_floor (24.0), j);
                ++k;
                if (k == 2) {
                        ++j;
@@ -37,3 +37,36 @@ BOOST_AUTO_TEST_CASE (dcpomatic_time_test)
                }
        }
 }
+
+BOOST_AUTO_TEST_CASE (dcpomatic_time_period_overlaps_test)
+{
+       /* Taking times as the start of a sampling interval
+
+          |--|--|--|--|--|--|--|--|--|--|
+          0  1  2  3  4  5  6  7  8  9  |
+          |--|--|--|--|--|--|--|--|--|--|
+
+          <------a----><----b----->
+
+          and saying `from' is the start of the first sampling
+          interval and `to' is the start of the interval after
+          the period... a and b do not overlap.
+       */
+
+       TimePeriod<DCPTime> a (DCPTime (0), DCPTime (4));
+       TimePeriod<DCPTime> b (DCPTime (4), DCPTime (8));
+       BOOST_CHECK (!a.overlaps (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));
+
+       /* Some overlaps */
+       a = TimePeriod<DCPTime> (DCPTime (0), DCPTime (4));
+       b = TimePeriod<DCPTime> (DCPTime (3), DCPTime (8));
+       BOOST_CHECK (a.overlaps (b));
+       a = TimePeriod<DCPTime> (DCPTime (1), DCPTime (9));
+       b = TimePeriod<DCPTime> (DCPTime (0), DCPTime (10));
+       BOOST_CHECK (a.overlaps (b));
+}