summaryrefslogtreecommitdiff
path: root/opendc-common/src/test/kotlin/org/opendc/common
diff options
context:
space:
mode:
authorDante Niewenhuis <d.niewenhuis@hotmail.com>2024-03-05 13:23:57 +0100
committerGitHub <noreply@github.com>2024-03-05 13:23:57 +0100
commit5864cbcbfe2eb8c36ca05c3a39c7e5916aeecaec (patch)
tree5b2773b8dc21c2e1b526fb70f829c376dd80532a /opendc-common/src/test/kotlin/org/opendc/common
parentd28002a3c151d198298574312f32f1cb43f3a660 (diff)
Updated package versions, updated web server tests. (#207)
* Updated all package versions including kotlin. Updated all web-server tests to run. * Changed the java version of the tests. OpenDC now only supports java 19. * small update * test update * new update * updated docker version to 19 * updated docker version to 19
Diffstat (limited to 'opendc-common/src/test/kotlin/org/opendc/common')
-rw-r--r--opendc-common/src/test/kotlin/org/opendc/common/DispatcherCoroutineDispatcherTest.kt44
-rw-r--r--opendc-common/src/test/kotlin/org/opendc/common/util/PacerTest.kt35
2 files changed, 43 insertions, 36 deletions
diff --git a/opendc-common/src/test/kotlin/org/opendc/common/DispatcherCoroutineDispatcherTest.kt b/opendc-common/src/test/kotlin/org/opendc/common/DispatcherCoroutineDispatcherTest.kt
index 01b3d2fc..43faba64 100644
--- a/opendc-common/src/test/kotlin/org/opendc/common/DispatcherCoroutineDispatcherTest.kt
+++ b/opendc-common/src/test/kotlin/org/opendc/common/DispatcherCoroutineDispatcherTest.kt
@@ -36,44 +36,46 @@ import org.opendc.simulator.kotlin.runSimulation
* Test suite for [DispatcherCoroutineDispatcher].
*/
class DispatcherCoroutineDispatcherTest {
-
/**
* Tests if a dispatcher yields the correct time
*/
@Test
- fun testYield() = runSimulation {
- withContext(dispatcher.asCoroutineDispatcher()) {
- val startTime = dispatcher.currentTime
- yield()
- assertEquals(startTime, dispatcher.currentTime)
+ fun testYield() =
+ runSimulation {
+ withContext(dispatcher.asCoroutineDispatcher()) {
+ val startTime = dispatcher.currentTime
+ yield()
+ assertEquals(startTime, dispatcher.currentTime)
+ }
}
- }
/**
* Tests if a dispatcher correctly delays
*/
@Test
- fun testDelay() = runSimulation {
- withContext(dispatcher.asCoroutineDispatcher()) {
- val startTime = dispatcher.currentTime
- delay(10)
- assertEquals(startTime + 10, dispatcher.currentTime)
+ fun testDelay() =
+ runSimulation {
+ withContext(dispatcher.asCoroutineDispatcher()) {
+ val startTime = dispatcher.currentTime
+ delay(10)
+ assertEquals(startTime + 10, dispatcher.currentTime)
+ }
}
- }
/**
* Tests if a dispatcher correctly times out
*/
@Test
- fun testTimeout() = runSimulation {
- withContext(dispatcher.asCoroutineDispatcher()) {
- assertThrows<TimeoutCancellationException> {
- withTimeout(10) {
- delay(1000)
+ fun testTimeout() =
+ runSimulation {
+ withContext(dispatcher.asCoroutineDispatcher()) {
+ assertThrows<TimeoutCancellationException> {
+ withTimeout(10) {
+ delay(1000)
+ }
}
- }
- assertEquals(10, dispatcher.currentTime)
+ assertEquals(10, dispatcher.currentTime)
+ }
}
- }
}
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 3235b046..539403b9 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
@@ -39,9 +39,10 @@ class PacerTest {
var count = 0
runSimulation {
- val pacer = Pacer(dispatcher, /*quantum*/ 100) {
- count++
- }
+ val pacer =
+ Pacer(dispatcher, 100) {
+ count++
+ }
pacer.enqueue()
}
@@ -54,9 +55,10 @@ class PacerTest {
var count = 0
runSimulation {
- val pacer = Pacer(dispatcher, /*quantum*/ 100) {
- count++
- }
+ val pacer =
+ Pacer(dispatcher, 100) {
+ count++
+ }
pacer.enqueue()
pacer.enqueue()
@@ -72,9 +74,10 @@ class PacerTest {
var count = 0
runSimulation {
- val pacer = Pacer(dispatcher, /*quantum*/ 100) {
- count++
- }
+ val pacer =
+ Pacer(dispatcher, 100) {
+ count++
+ }
pacer.enqueue()
pacer.cancel()
@@ -90,9 +93,10 @@ class PacerTest {
var count = 0
runSimulation {
- val pacer = Pacer(dispatcher, /*quantum*/ 100) {
- count++
- }
+ val pacer =
+ Pacer(dispatcher, 100) {
+ count++
+ }
assertFalse(pacer.isPending)
assertDoesNotThrow { pacer.cancel() }
@@ -108,9 +112,10 @@ class PacerTest {
var count = 0
runSimulation {
- val pacer = Pacer(dispatcher, /*quantum*/ 100) {
- count++
- }
+ val pacer =
+ Pacer(dispatcher, 100) {
+ count++
+ }
pacer.enqueue()
delay(100)