summaryrefslogtreecommitdiff
path: root/opendc-trace/opendc-trace-opendc/src/main
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2022-06-08 15:06:14 +0200
committerFabian Mastenbroek <mail.fabianm@gmail.com>2022-06-08 15:06:14 +0200
commit9d759c9bc987965fae8b0c16c000772c546bf3a2 (patch)
treebf20f51b434d56e60ad013568ac1a32b912a3b5e /opendc-trace/opendc-trace-opendc/src/main
parentf7a5b200e4767213617774a87113d0b56d8d8a59 (diff)
test(trace): Add conformance suite for OpenDC trace API
This change adds a re-usable test suite for the interface of the OpenDC trace API, so implementors can verify whether they match the specification of the interfaces.
Diffstat (limited to 'opendc-trace/opendc-trace-opendc/src/main')
-rw-r--r--opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableReader.kt18
-rw-r--r--opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceStateTableReader.kt2
-rw-r--r--opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceStateTableWriter.kt2
-rw-r--r--opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceTableReader.kt2
4 files changed, 18 insertions, 6 deletions
diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableReader.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableReader.kt
index 920daeea..1841c486 100644
--- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableReader.kt
+++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmInterferenceJsonTableReader.kt
@@ -54,12 +54,13 @@ internal class OdcVmInterferenceJsonTableReader(private val parser: JsonParser)
}
}
- return if (parser.nextToken() != JsonToken.END_ARRAY) {
- parseGroup(parser)
- true
- } else {
+ return if (parser.isClosed || parser.nextToken() == JsonToken.END_ARRAY) {
+ parser.close()
reset()
false
+ } else {
+ parseGroup(parser)
+ true
}
}
@@ -102,6 +103,7 @@ internal class OdcVmInterferenceJsonTableReader(private val parser: JsonParser)
}
override fun getDouble(index: Int): Double {
+ checkActive()
return when (index) {
COL_TARGET -> targetLoad
COL_SCORE -> score
@@ -130,6 +132,7 @@ internal class OdcVmInterferenceJsonTableReader(private val parser: JsonParser)
}
override fun <T> getSet(index: Int, elementType: Class<T>): Set<T>? {
+ checkActive()
return when (index) {
COL_MEMBERS -> TYPE_MEMBERS.convertTo(members, elementType)
else -> throw IllegalArgumentException("Invalid column $index")
@@ -149,6 +152,13 @@ internal class OdcVmInterferenceJsonTableReader(private val parser: JsonParser)
private var score = 1.0
/**
+ * Helper method to check if the reader is active.
+ */
+ private fun checkActive() {
+ check(isStarted && !parser.isClosed) { "No active row. Did you call nextRow()?" }
+ }
+
+ /**
* Reset the state.
*/
private fun reset() {
diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceStateTableReader.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceStateTableReader.kt
index 599f46f1..b256047f 100644
--- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceStateTableReader.kt
+++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceStateTableReader.kt
@@ -69,7 +69,7 @@ internal class OdcVmResourceStateTableReader(private val reader: LocalParquetRea
}
override fun isNull(index: Int): Boolean {
- check(index in 0..COL_CPU_USAGE) { "Invalid column index" }
+ require(index in 0..COL_CPU_USAGE) { "Invalid column index" }
return false
}
diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceStateTableWriter.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceStateTableWriter.kt
index f5e8b863..30375de0 100644
--- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceStateTableWriter.kt
+++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceStateTableWriter.kt
@@ -109,6 +109,7 @@ internal class OdcVmResourceStateTableWriter(private val writer: ParquetWriter<R
when (index) {
COL_ID -> _id = value
+ else -> throw IllegalArgumentException("Invalid column or type [index $index]")
}
}
@@ -130,6 +131,7 @@ internal class OdcVmResourceStateTableWriter(private val writer: ParquetWriter<R
when (index) {
COL_DURATION -> _duration = value
+ else -> throw IllegalArgumentException("Invalid column or type [index $index]")
}
}
diff --git a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceTableReader.kt b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceTableReader.kt
index 88f9b781..76fdbca8 100644
--- a/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceTableReader.kt
+++ b/opendc-trace/opendc-trace-opendc/src/main/kotlin/org/opendc/trace/opendc/OdcVmResourceTableReader.kt
@@ -71,7 +71,7 @@ internal class OdcVmResourceTableReader(private val reader: LocalParquetReader<R
}
override fun isNull(index: Int): Boolean {
- check(index in 0..COL_MEM_CAPACITY) { "Invalid column index" }
+ require(index in 0..COL_MEM_CAPACITY) { "Invalid column index" }
return false
}