Complete clock class tests

wfd3 · Feb 28, 2024 · 5715418 · 5715418
1 parent a2b3d83
commit 5715418
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 8 deletions.
diff --git a/clock/clock.h b/clock/clock.h
@@ -43,16 +43,18 @@ class BusClock_t {
 		_accumulatedCycles = 0;
 	}
 
-	uint64_t delay(const uint64_t cycles = 1) {
+	bool delay(const uint64_t cycles = 1) {
 		_accumulatedCycles += cycles;
 
-		if (_accumulatedCycles > _cyclesInDelayTime) {
+		if (_accumulatedCycles >= _cyclesInDelayTime) {
 			_accumulatedCycles -= _cyclesInDelayTime;
-			if (_emulateTiming)
+			if (_emulateTiming) {
 				std::this_thread::sleep_for(_delayMs);
+				return true;
+			}
 		} 
 
-		return _accumulatedCycles; 
+		return false;
 	}
 
 	freq_t getFrequencyMHz() { return _MHz; }

diff --git a/tests/clock_tests.cc b/tests/clock_tests.cc
@@ -26,26 +26,71 @@ class ClockTests : public testing::Test {
 	virtual void TearDown()	{}
 };
 
-TEST_F(ClockTests, BelowThresholdTakesNoTime) {
+TEST_F(ClockTests, BelowThresholdDoesNotDelay) {
     uint64_t count = 100;
     BusClock_t clock(1);
+    bool didDelay = false;
+
+    clock.enableTimingEmulation();
+
+    while(count--) {
+        didDelay |= clock.delay(1);
+    }
+
+    EXPECT_FALSE(didDelay);
+}
+
+TEST_F(ClockTests, AboveThresholdDelays) {
+    BusClock_t clock(1);
+    uint64_t count = clock.getCyclesInDelayTime();
+    bool didDelay = false;
+
     clock.enableTimingEmulation();
 
     while(count--) {
-        clock.delay(1);
+        didDelay |= clock.delay(1);
     }
+
+    EXPECT_TRUE(didDelay);
+}
+
+TEST_F(ClockTests, BelowThresholdDoesNotDelayAt4MHz) {
+    uint64_t count = 100;
+    BusClock_t clock(4);
+    bool didDelay = false;
+
+    clock.enableTimingEmulation();
+
+    while(count--) {
+        didDelay |= clock.delay(1);
+    }
+
+    EXPECT_FALSE(didDelay);
+}
+
+TEST_F(ClockTests, AboveThresholdDelaysAt4MHz) {
+    BusClock_t clock(4);
+    uint64_t count = clock.getCyclesInDelayTime();
+    bool didDelay = false;
+
+    clock.enableTimingEmulation();
+
+    while(count--) {
+        didDelay |= clock.delay(1);
+    }
+
+    EXPECT_TRUE(didDelay);
 }
 
 TEST_F(ClockTests, CanGetClockFrequency) {
     static constexpr uint16_t _MHz = 4;
-
     BusClock_t clock(_MHz);
+
     EXPECT_EQ(clock.getFrequencyMHz(), _MHz);
 }
 
 TEST_F(ClockTests, CanGetAccumulatedClockCycles) {
     static constexpr uint16_t _MHz = 4;
-
     BusClock_t clock(_MHz);
 
     clock.delay(10000);
@@ -63,3 +108,13 @@ TEST_F(ClockTests, DelayConsumesAccumulatedCycles) {
 
     EXPECT_EQ(clock.getAccumulatedCycles(), constant);
 }
+
+TEST_F(ClockTests, CantSetLowMHz) {
+    BusClock_t clock(0);
+    EXPECT_EQ(clock.getFrequencyMHz(), 1);
+}
+
+TEST_F(ClockTests, CantSetHighMHz) {
+    BusClock_t clock(1001);
+    EXPECT_EQ(clock.getFrequencyMHz(), 1000);
+}