1 files changed, 31 insertions, 16 deletions
diff --git a/opendc-trace/opendc-trace-wtf/src/test/kotlin/org/opendc/trace/wtf/WtfTraceFormatTest.kt b/opendc-trace/opendc-trace-wtf/src/test/kotlin/org/opendc/trace/wtf/WtfTraceFormatTest.kt
index c0eb3f08..f6b821c2 100644
--- a/opendc-trace/opendc-trace-wtf/src/test/kotlin/org/opendc/trace/wtf/WtfTraceFormatTest.kt
+++ b/opendc-trace/opendc-trace-wtf/src/test/kotlin/org/opendc/trace/wtf/WtfTraceFormatTest.kt
@@ -22,10 +22,13 @@
 
 package org.opendc.trace.wtf
 
+import org.junit.jupiter.api.*
 import org.junit.jupiter.api.Assertions.*
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
+import org.junit.jupiter.api.Assertions.assertAll
+import org.opendc.trace.TableColumn
+import org.opendc.trace.TableReader
 import org.opendc.trace.conv.*
+import org.opendc.trace.testkit.TableReaderTestKit
 import java.nio.file.Paths
 import java.time.Duration
 import java.time.Instant
@@ -33,6 +36,7 @@ import java.time.Instant
 /**
  * Test suite for the [WtfTraceFormat] class.
  */
+@DisplayName("WTF TraceFormat")
 class WtfTraceFormatTest {
     private val format = WtfTraceFormat()
 
@@ -65,36 +69,47 @@ class WtfTraceFormatTest {
 
         assertAll(
             { assertTrue(reader.nextRow()) },
-            { assertEquals("362334516345962206", reader.get(TASK_ID)) },
-            { assertEquals("1078341553348591493", reader.get(TASK_WORKFLOW_ID)) },
-            { assertEquals(Instant.ofEpochMilli(245604), reader.get(TASK_SUBMIT_TIME)) },
-            { assertEquals(Duration.ofMillis(8163), reader.get(TASK_RUNTIME)) },
+            { assertEquals("362334516345962206", reader.getString(TASK_ID)) },
+            { assertEquals("1078341553348591493", reader.getString(TASK_WORKFLOW_ID)) },
+            { assertEquals(Instant.ofEpochMilli(245604), reader.getInstant(TASK_SUBMIT_TIME)) },
+            { assertEquals(Duration.ofMillis(8163), reader.getDuration(TASK_RUNTIME)) },
             {
                 assertEquals(
                     setOf("584055316413447529", "133113685133695608", "1008582348422865408"),
-                    reader.get(
-                        TASK_PARENTS
-                    )
+                    reader.getSet(TASK_PARENTS, String::class.java)
                 )
             },
         )
 
         assertAll(
             { assertTrue(reader.nextRow()) },
-            { assertEquals("502010169100446658", reader.get(TASK_ID)) },
-            { assertEquals("1078341553348591493", reader.get(TASK_WORKFLOW_ID)) },
-            { assertEquals(Instant.ofEpochMilli(251325), reader.get(TASK_SUBMIT_TIME)) },
-            { assertEquals(Duration.ofMillis(8216), reader.get(TASK_RUNTIME)) },
+            { assertEquals("502010169100446658", reader.getString(TASK_ID)) },
+            { assertEquals("1078341553348591493", reader.getString(TASK_WORKFLOW_ID)) },
+            { assertEquals(Instant.ofEpochMilli(251325), reader.getInstant(TASK_SUBMIT_TIME)) },
+            { assertEquals(Duration.ofMillis(8216), reader.getDuration(TASK_RUNTIME)) },
             {
                 assertEquals(
                     setOf("584055316413447529", "133113685133695608", "1008582348422865408"),
-                    reader.get(
-                        TASK_PARENTS
-                    )
+                    reader.getSet(TASK_PARENTS, String::class.java)
                 )
             },
         )
 
         reader.close()
     }
+
+    @DisplayName("TableReader for Tasks")
+    @Nested
+    inner class TasksTableReaderTest : TableReaderTestKit() {
+        override lateinit var reader: TableReader
+        override lateinit var columns: List<TableColumn>
+
+        @BeforeEach
+        fun setUp() {
+            val path = Paths.get("src/test/resources/wtf-trace")
+
+            columns = format.getDetails(path, TABLE_TASKS).columns
+            reader = format.newReader(path, TABLE_TASKS, null)
+        }
+    }
 }