X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=tst%2Fapp%2FTimerTest.cpp;fp=tst%2Fapp%2FTimerTest.cpp;h=6eafe6fb73246d486e72bd634492d31aeef7328f;hb=150d065f431d665326fd8028748c48a74ad956bb;hp=6e20882c44100d8eb435773ad5353537895bd082;hpb=80a9a59d71a7b144c12f64cbef4644751bd54745;p=blank.git

diff --git a/tst/app/TimerTest.cpp b/tst/app/TimerTest.cpp
index 6e20882..6eafe6f 100644
--- a/tst/app/TimerTest.cpp
+++ b/tst/app/TimerTest.cpp
@@ -2,6 +2,8 @@
 
 #include "app/IntervalTimer.hpp"
 
+#include <limits>
+
 CPPUNIT_TEST_SUITE_REGISTRATION(blank::test::TimerTest);
 
 
@@ -15,96 +17,96 @@ void TimerTest::tearDown() {
 }
 
 
-void TimerTest::testIntervalTimer() {
-	IntervalTimer timer(50);
+void TimerTest::testCoarseTimer() {
+	CoarseTimer timer(50);
 	CPPUNIT_ASSERT_MESSAGE(
-		"fresh timer is running",
+		"fresh coarse timer is running",
 		!timer.Running()
 	);
 	CPPUNIT_ASSERT_MESSAGE(
-		"fresh timer hit",
+		"fresh coarse timer hit",
 		!timer.Hit()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"fresh timer with non-zero elapsed time",
+		"fresh coarse timer with non-zero elapsed time",
 		0, timer.Elapsed()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"fresh timer at non-zero iteration",
+		"fresh coarse timer at non-zero iteration",
 		0, timer.Iteration()
 	);
 
 	timer.Start();
 	CPPUNIT_ASSERT_MESSAGE(
-		"startet timer is not running",
+		"startet coarse timer is not running",
 		timer.Running()
 	);
 	CPPUNIT_ASSERT_MESSAGE(
-		"started timer hit without update",
+		"started coarse timer hit without update",
 		!timer.Hit()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"started, but not updated timer with non-zero elapsed time",
+		"started, but not updated coarse timer with non-zero elapsed time",
 		0, timer.Elapsed()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"started, but not updated timer at non-zero iteration",
+		"started, but not updated coarse timer at non-zero iteration",
 		0, timer.Iteration()
 	);
 
 	timer.Update(25);
 	CPPUNIT_ASSERT_MESSAGE(
-		"updated timer is not running",
+		"updated coarse timer is not running",
 		timer.Running()
 	);
 	CPPUNIT_ASSERT_MESSAGE(
-		"timer hit after update, but before it should",
+		"coarse timer hit after update, but before it should",
 		!timer.Hit()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"wrong elapsed time on updated timer",
+		"wrong elapsed time on updated coarse timer",
 		25, timer.Elapsed()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"wrong iteration on updated timer",
+		"wrong iteration on updated coarse timer",
 		0, timer.Iteration()
 	);
 
 	timer.Update(25);
 	CPPUNIT_ASSERT_MESSAGE(
-		"timer not hit after updating to its exact interval time",
+		"coarse timer not hit after updating to its exact interval time",
 		timer.Hit()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"wrong elapsed time on updated timer",
+		"wrong elapsed time on updated coarse timer",
 		50, timer.Elapsed()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"wrong iteration on updated timer at exact interval time",
+		"wrong iteration on updated coarse timer at exact interval time",
 		1, timer.Iteration()
 	);
 
 	timer.Update(49);
 	CPPUNIT_ASSERT_MESSAGE(
-		"timer hit after updating from exact interval time to just before the next",
+		"coarse timer hit after updating from exact interval time to just before the next",
 		!timer.Hit()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"wrong elapsed time on updated timer",
+		"wrong elapsed time on updated coarse timer",
 		99, timer.Elapsed()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"wrong iteration after updating timer from exact interval time to just before the next",
+		"wrong iteration after updating coarse timer from exact interval time to just before the next",
 		1, timer.Iteration()
 	);
 
 	timer.Update(2);
 	CPPUNIT_ASSERT_MESSAGE(
-		"timer not hit after updating across interval time boundary",
+		"coarse timer not hit after updating across interval time boundary",
 		timer.Hit()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"wrong elapsed time on updated timer",
+		"wrong elapsed time on updated coarse timer",
 		101, timer.Elapsed()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
@@ -114,19 +116,135 @@ void TimerTest::testIntervalTimer() {
 
 	timer.Stop();
 	CPPUNIT_ASSERT_MESSAGE(
-		"stopped timer is running",
+		"stopped coarse timer is running",
 		!timer.Running()
 	);
 	CPPUNIT_ASSERT_MESSAGE(
-		"stopped timer hit",
+		"stopped coarse timer hit",
 		!timer.Hit()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"stopped timer has non-zero elapsed time",
+		"stopped coarse timer has non-zero elapsed time",
 		0, timer.Elapsed()
 	);
 	CPPUNIT_ASSERT_EQUAL_MESSAGE(
-		"stopped timer at non-zero iteration",
+		"stopped coarse timer at non-zero iteration",
+		0, timer.Iteration()
+	);
+}
+
+void TimerTest::testFineTimer() {
+	FineTimer timer(0.5f);
+	CPPUNIT_ASSERT_MESSAGE(
+		"fresh fine timer is running",
+		!timer.Running()
+	);
+	CPPUNIT_ASSERT_MESSAGE(
+		"fresh fine timer hit",
+		!timer.Hit()
+	);
+	CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
+		"fresh fine timer with non-zero elapsed time",
+		0.0f, timer.Elapsed(), std::numeric_limits<float>::epsilon()
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"fresh fine timer at non-zero iteration",
+		0, timer.Iteration()
+	);
+
+	timer.Start();
+	CPPUNIT_ASSERT_MESSAGE(
+		"startet fine timer is not running",
+		timer.Running()
+	);
+	CPPUNIT_ASSERT_MESSAGE(
+		"started fine timer hit without update",
+		!timer.Hit()
+	);
+	CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
+		"started, but not updated fine timer with non-zero elapsed time",
+		0.0f, timer.Elapsed(), std::numeric_limits<float>::epsilon()
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"started, but not updated fine timer at non-zero iteration",
+		0, timer.Iteration()
+	);
+
+	timer.Update(0.25f);
+	CPPUNIT_ASSERT_MESSAGE(
+		"updated fine timer is not running",
+		timer.Running()
+	);
+	CPPUNIT_ASSERT_MESSAGE(
+		"fine timer hit after update, but before it should",
+		!timer.Hit()
+	);
+	CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
+		"wrong elapsed time on updated fine timer",
+		0.25f, timer.Elapsed(), std::numeric_limits<float>::epsilon()
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"wrong iteration on updated fine timer",
+		0, timer.Iteration()
+	);
+
+	timer.Update(0.25f);
+	CPPUNIT_ASSERT_MESSAGE(
+		"fine timer not hit after updating to its exact interval time",
+		timer.Hit()
+	);
+	CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
+		"wrong elapsed time on updated fine timer",
+		0.5f, timer.Elapsed(), std::numeric_limits<float>::epsilon()
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"wrong iteration on updated fine timer at exact interval time",
+		1, timer.Iteration()
+	);
+
+	timer.Update(0.49f);
+	CPPUNIT_ASSERT_MESSAGE(
+		"fine timer hit after updating from exact interval time to just before the next",
+		!timer.Hit()
+	);
+	CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
+		"wrong elapsed time on updated fine timer",
+		0.99f, timer.Elapsed(), std::numeric_limits<float>::epsilon()
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"wrong iteration after updating fine timer from exact interval time to just before the next",
+		1, timer.Iteration()
+	);
+
+	timer.Update(0.02f);
+	CPPUNIT_ASSERT_MESSAGE(
+		"fine timer not hit after updating across interval time boundary",
+		timer.Hit()
+	);
+	CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
+		"wrong elapsed time on updated fine timer",
+		1.01f, timer.Elapsed(), std::numeric_limits<float>::epsilon()
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"wrong iteration after updating across interval time boundary",
+		2, timer.Iteration()
+	);
+
+	timer.Stop();
+	CPPUNIT_ASSERT_MESSAGE(
+		"stopped fine timer is running",
+		!timer.Running()
+	);
+	CPPUNIT_ASSERT_MESSAGE(
+		"stopped fine timer hit",
+		!timer.Hit()
+	);
+	CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(
+		"stopped fine timer has non-zero elapsed time",
+		0.0f, timer.Elapsed(), std::numeric_limits<float>::epsilon()
+	);
+	CPPUNIT_ASSERT_EQUAL_MESSAGE(
+		"stopped fine timer at non-zero iteration",
 		0, timer.Iteration()
 	);
 }