2 files changed, 17 insertions, 32 deletions
diff --git a/opendc-common/src/test/kotlin/org/opendc/common/util/PacerTest.kt b/opendc-common/src/test/kotlin/org/opendc/common/util/PacerTest.kt
index 3fae2ebc..3235b046 100644
--- a/opendc-common/src/test/kotlin/org/opendc/common/util/PacerTest.kt
+++ b/opendc-common/src/test/kotlin/org/opendc/common/util/PacerTest.kt
@@ -28,26 +28,18 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
 import org.opendc.simulator.kotlin.runSimulation
-import java.time.Clock
-import kotlin.coroutines.EmptyCoroutineContext
 
 /**
  * Test suite for the [Pacer] class.
  */
 class PacerTest {
     @Test
-    fun testEmptyContext() {
-        assertThrows<IllegalArgumentException> { Pacer(EmptyCoroutineContext, Clock.systemUTC(), 100) {} }
-    }
-
-    @Test
     fun testSingleEnqueue() {
         var count = 0
 
         runSimulation {
-            val pacer = Pacer(coroutineContext, clock, quantum = 100) {
+            val pacer = Pacer(dispatcher, /*quantum*/ 100) {
                 count++
             }
 
@@ -62,7 +54,7 @@ class PacerTest {
         var count = 0
 
         runSimulation {
-            val pacer = Pacer(coroutineContext, clock, quantum = 100) {
+            val pacer = Pacer(dispatcher, /*quantum*/ 100) {
                 count++
             }
 
@@ -80,7 +72,7 @@ class PacerTest {
         var count = 0
 
         runSimulation {
-            val pacer = Pacer(coroutineContext, clock, quantum = 100) {
+            val pacer = Pacer(dispatcher, /*quantum*/ 100) {
                 count++
             }
 
@@ -98,7 +90,7 @@ class PacerTest {
         var count = 0
 
         runSimulation {
-            val pacer = Pacer(coroutineContext, clock, quantum = 100) {
+            val pacer = Pacer(dispatcher, /*quantum*/ 100) {
                 count++
             }
 
@@ -116,7 +108,7 @@ class PacerTest {
         var count = 0
 
         runSimulation {
-            val pacer = Pacer(coroutineContext, clock, quantum = 100) {
+            val pacer = Pacer(dispatcher, /*quantum*/ 100) {
                 count++
             }
 
diff --git a/opendc-common/src/test/kotlin/org/opendc/common/util/TimerSchedulerTest.kt b/opendc-common/src/test/kotlin/org/opendc/common/util/TimerSchedulerTest.kt
index 22a26111..3947fa2e 100644
--- a/opendc-common/src/test/kotlin/org/opendc/common/util/TimerSchedulerTest.kt
+++ b/opendc-common/src/test/kotlin/org/opendc/common/util/TimerSchedulerTest.kt
@@ -29,25 +29,18 @@ import org.junit.jupiter.api.Assertions.fail
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.opendc.simulator.kotlin.runSimulation
-import java.time.Clock
-import kotlin.coroutines.EmptyCoroutineContext
 
 /**
  * A test suite for the [TimerScheduler] class.
  */
-internal class TimerSchedulerTest {
-    @Test
-    fun testEmptyContext() {
-        assertThrows<IllegalArgumentException> { TimerScheduler<Unit>(EmptyCoroutineContext, Clock.systemUTC()) }
-    }
-
+class TimerSchedulerTest {
     @Test
     fun testBasicTimer() {
         runSimulation {
-            val scheduler = TimerScheduler<Int>(coroutineContext, clock)
+            val scheduler = TimerScheduler<Int>(dispatcher)
 
             scheduler.startSingleTimer(0, 1000) {
-                assertEquals(1000, clock.millis())
+                assertEquals(1000, timeSource.millis())
             }
 
             assertTrue(scheduler.isTimerActive(0))
@@ -58,7 +51,7 @@ internal class TimerSchedulerTest {
     @Test
     fun testCancelNonExisting() {
         runSimulation {
-            val scheduler = TimerScheduler<Int>(coroutineContext, clock)
+            val scheduler = TimerScheduler<Int>(dispatcher)
 
             scheduler.cancel(1)
         }
@@ -67,7 +60,7 @@ internal class TimerSchedulerTest {
     @Test
     fun testCancelExisting() {
         runSimulation {
-            val scheduler = TimerScheduler<Int>(coroutineContext, clock)
+            val scheduler = TimerScheduler<Int>(dispatcher)
 
             scheduler.startSingleTimer(0, 1000) {
                 fail()
@@ -76,7 +69,7 @@ internal class TimerSchedulerTest {
             scheduler.startSingleTimer(1, 100) {
                 scheduler.cancel(0)
 
-                assertEquals(100, clock.millis())
+                assertEquals(100, timeSource.millis())
             }
         }
     }
@@ -84,7 +77,7 @@ internal class TimerSchedulerTest {
     @Test
     fun testCancelAll() {
         runSimulation {
-            val scheduler = TimerScheduler<Int>(coroutineContext, clock)
+            val scheduler = TimerScheduler<Int>(dispatcher)
 
             scheduler.startSingleTimer(0, 1000) { fail() }
             scheduler.startSingleTimer(1, 100) { fail() }
@@ -95,12 +88,12 @@ internal class TimerSchedulerTest {
     @Test
     fun testOverride() {
         runSimulation {
-            val scheduler = TimerScheduler<Int>(coroutineContext, clock)
+            val scheduler = TimerScheduler<Int>(dispatcher)
 
             scheduler.startSingleTimer(0, 1000) { fail() }
 
             scheduler.startSingleTimer(0, 200) {
-                assertEquals(200, clock.millis())
+                assertEquals(200, timeSource.millis())
             }
         }
     }
@@ -108,12 +101,12 @@ internal class TimerSchedulerTest {
     @Test
     fun testOverrideBlock() {
         runSimulation {
-            val scheduler = TimerScheduler<Int>(coroutineContext, clock)
+            val scheduler = TimerScheduler<Int>(dispatcher)
 
             scheduler.startSingleTimer(0, 1000) { fail() }
 
             scheduler.startSingleTimer(0, 1000) {
-                assertEquals(1000, clock.millis())
+                assertEquals(1000, timeSource.millis())
             }
         }
     }
@@ -121,7 +114,7 @@ internal class TimerSchedulerTest {
     @Test
     fun testNegativeDelay() {
         runSimulation {
-            val scheduler = TimerScheduler<Int>(coroutineContext, clock)
+            val scheduler = TimerScheduler<Int>(dispatcher)
 
             assertThrows<IllegalArgumentException> {
                 scheduler.startSingleTimer(1, -1) {