Various development / fixes.rework

1 files changed, 73 insertions, 2 deletions

diff --git a/test/time_test.cc b/test/time_test.cc
index 2179815..5bf057c 100644
--- 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,8 +17,9 @@
 
 */
 
-#include <boost/test/unit_test.hpp>
 #include "sub_time.h"
+#include "exceptions.h"
+#include <boost/test/unit_test.hpp>
 
 /* Check time construction */
 BOOST_AUTO_TEST_CASE (time_construction_test)
@@ -38,6 +39,22 @@ BOOST_AUTO_TEST_CASE (time_construction_test)
 		BOOST_CHECK_EQUAL (t.seconds, 2);
 		BOOST_CHECK_EQUAL (t._milliseconds.get(), 3);
 	}
+
+	{
+		sub::Time t = sub::Time::from_frames (91231513, sub::TWENTY_FOUR);
+		BOOST_CHECK_EQUAL (t.hours, 1055);
+		BOOST_CHECK_EQUAL (t.minutes, 55);
+		BOOST_CHECK_EQUAL (t.seconds, 13);
+		BOOST_CHECK_EQUAL (t._frames.get(), 1);
+	}
+
+	{
+		sub::Time t = sub::Time::from_milliseconds (91231513);
+		BOOST_CHECK_EQUAL (t.hours, 25);
+		BOOST_CHECK_EQUAL (t.minutes, 20);
+		BOOST_CHECK_EQUAL (t.seconds, 31);
+		BOOST_CHECK_EQUAL (t._milliseconds.get(), 513);
+	}
 }
 
 /* Check time conversions */
@@ -55,3 +72,57 @@ BOOST_AUTO_TEST_CASE (time_conversion_test)
 	p = sub::Time::from_hmsf (3, 5, 7, 3, sub::TWENTY_FIVE);
 	BOOST_CHECK_EQUAL (p.as_milliseconds (), sub::Time::from_hmsm (3, 5, 7, 120).as_milliseconds ());
 }
+
+BOOST_AUTO_TEST_CASE (time_addition_test)
+{
+	{
+		sub::Time a = sub::Time::from_hmsf (4, 54, 23, 5);
+		sub::Time b = sub::Time::from_hmsf (4, 54, 23, 5);
+		BOOST_CHECK_THROW (a + b, sub::UnknownFrameRateException);
+	}
+
+	{
+		sub::Time a = sub::Time::from_hmsf (4, 54, 23, 5, sub::THIRTY);
+		sub::Time b = sub::Time::from_hmsf (4, 54, 23, 5, sub::TWENTY_FOUR);
+		BOOST_CHECK_THROW (a + b, sub::MismatchedFrameRateException);
+	}
+
+	{
+		sub::Time a = sub::Time::from_hmsf (4, 54, 23, 5, sub::TWENTY_FOUR);
+		sub::Time b = sub::Time::from_hmsf (1, 9, 55, 23, sub::TWENTY_FOUR);
+		BOOST_CHECK_EQUAL (a + b, sub::Time::from_hmsf (6, 4, 19, 4, sub::TWENTY_FOUR));
+	}
+
+	{
+		sub::Time a = sub::Time::from_hmsm (4, 54, 23, 512);
+		sub::Time b = sub::Time::from_hmsm (1, 9, 55, 998);
+		BOOST_CHECK_EQUAL (a + b, sub::Time::from_hmsm (6, 4, 19, 510));
+	}
+}
+
+BOOST_AUTO_TEST_CASE (time_subtraction_test)
+{
+	{
+		sub::Time a = sub::Time::from_hmsf (4, 54, 23, 5);
+		sub::Time b = sub::Time::from_hmsf (4, 54, 23, 5);
+		BOOST_CHECK_THROW (a - b, sub::UnknownFrameRateException);
+	}
+
+	{
+		sub::Time a = sub::Time::from_hmsf (4, 54, 23, 5, sub::THIRTY);
+		sub::Time b = sub::Time::from_hmsf (4, 54, 23, 5, sub::TWENTY_FOUR);
+		BOOST_CHECK_THROW (a - b, sub::MismatchedFrameRateException);
+	}
+
+	{
+		sub::Time a = sub::Time::from_hmsf (2, 1, 1, 1, sub::TWENTY_FOUR);
+		sub::Time b = sub::Time::from_hmsf (1, 59, 59, 23, sub::TWENTY_FOUR);
+		BOOST_CHECK_EQUAL (a - b, sub::Time::from_hmsf (0, 1, 1, 2, sub::TWENTY_FOUR));
+	}
+
+	{
+		sub::Time a = sub::Time::from_hmsm (2, 1, 1, 1);
+		sub::Time b = sub::Time::from_hmsm (1, 59, 59, 999);
+		BOOST_CHECK_EQUAL (a - b, sub::Time::from_hmsm (0, 1, 1, 2));
+	}
+}