Various work on improving vertical position handling.

[libsub.git] / test / time_test.cc

diff --git a/test/time_test.cc b/test/time_test.cc
index a244377792b28470a111955e8ff3398f83ade0b2..a4dae507237aa436a3e9f1643bc4d45080ed01f0 100644 (file)
--- a/test/time_test.cc
+++ b/test/time_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,16 +17,15 @@
 
 */
 
+#include "sub_time.h"
+#include "exceptions.h"
 #include <boost/test/unit_test.hpp>
-#include "metric_time.h"
-#include "frame_time.h"
-#include "convert_time.h"
 
 /* Check time construction */
 BOOST_AUTO_TEST_CASE (time_construction_test)
 {
        {
-               sub::MetricTime t (3, 5, 7, 40);
+               sub::Time t = sub::Time::from_hms (3, 5, 7, 40);
                BOOST_CHECK_EQUAL (t.hours(), 3);
                BOOST_CHECK_EQUAL (t.minutes(), 5);
                BOOST_CHECK_EQUAL (t.seconds(), 7);
@@ -34,7 +33,7 @@ BOOST_AUTO_TEST_CASE (time_construction_test)
        }
 
        {
-               sub::MetricTime t (591353, 1, 2, 3);
+               sub::Time t = sub::Time::from_hms (591353, 1, 2, 3);
                BOOST_CHECK_EQUAL (t.hours(), 591353);
                BOOST_CHECK_EQUAL (t.minutes(), 1);
                BOOST_CHECK_EQUAL (t.seconds(), 2);
@@ -45,12 +44,31 @@ BOOST_AUTO_TEST_CASE (time_construction_test)
 /* Check time conversions */
 BOOST_AUTO_TEST_CASE (time_conversion_test)
 {
+       sub::Time p;
+
        /* 40ms = 1 frame at 25fps */
-       BOOST_CHECK_EQUAL (metric_to_frame (sub::MetricTime (3, 5, 7, 40), 25), sub::FrameTime (3, 5, 7, 1));
-       BOOST_CHECK_EQUAL (frame_to_metric (sub::FrameTime  (3, 5, 7, 1), 25), sub::MetricTime (3, 5, 7, 40));
+       p = sub::Time::from_hms (3, 5, 7, 40);
+       BOOST_CHECK_EQUAL (p.frames_at (sub::Rational (25, 1)), 1);
+       p = sub::Time::from_hmsf (3, 5, 7, 1, sub::Rational (25, 1));
+       BOOST_CHECK_EQUAL (p.milliseconds (), 40);
 
        /* 120ms = 3 frames at 25fps */
-       BOOST_CHECK_EQUAL (metric_to_frame (sub::MetricTime (3, 5, 7, 120), 25), sub::FrameTime (3, 5, 7, 3));
-       BOOST_CHECK_EQUAL (frame_to_metric (sub::FrameTime  (3, 5, 7, 3), 25), sub::MetricTime (3, 5, 7, 120));
+       p = sub::Time::from_hms (3, 5, 7, 120);
+       BOOST_CHECK_EQUAL (p.frames_at (sub::Rational (25, 1)), 3);
+       p = sub::Time::from_hmsf (3, 5, 7, 3, sub::Rational (25, 1));
+       BOOST_CHECK_EQUAL (p.milliseconds (), 120);
+}
+
+/* Check some operators */
+BOOST_AUTO_TEST_CASE (time_operator_test)
+{
+       BOOST_CHECK_EQUAL (sub::Time::from_hms (0, 0, 5, 198 * 4), sub::Time::from_hms (0, 0, 5, 198 * 4));
+       BOOST_CHECK (sub::Time::from_hms (0, 0, 55, 332) != sub::Time::from_hms (0, 0, 58, 332));
 }
 
+/* Check some other bits of Time */
+BOOST_AUTO_TEST_CASE (time_other_test)
+{
+       BOOST_CHECK_THROW (sub::Time::from_hmsf (2, 1, 58, 4).all_as_seconds(), sub::UnknownFrameRateError);
+       BOOST_CHECK_CLOSE (sub::Time::from_hmsf (2, 1, 58, 4, sub::Rational (24, 1)).all_as_seconds(), 7318.1667, 0.001);
+}