From 2358257c1080b7ce78270535f82f0b960d48261a Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Mon, 6 Jun 2022 16:21:21 +0200
Subject: refactor(trace/api): Introduce type system for trace API

This change updates the trace API by introducing a limited type system
for the table columns. Previously, the table columns could have any
possible type representable by the JVM. With this change, we limit the
available types to a small type system.
---
 .../org/opendc/trace/gwf/GwfTraceFormatTest.kt       | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'opendc-trace/opendc-trace-gwf/src/test')

diff --git a/opendc-trace/opendc-trace-gwf/src/test/kotlin/org/opendc/trace/gwf/GwfTraceFormatTest.kt b/opendc-trace/opendc-trace-gwf/src/test/kotlin/org/opendc/trace/gwf/GwfTraceFormatTest.kt
index 411d45d0..dd0e6066 100644
--- a/opendc-trace/opendc-trace-gwf/src/test/kotlin/org/opendc/trace/gwf/GwfTraceFormatTest.kt
+++ b/opendc-trace/opendc-trace-gwf/src/test/kotlin/org/opendc/trace/gwf/GwfTraceFormatTest.kt
@@ -62,11 +62,11 @@ internal class GwfTraceFormatTest {
 
         assertAll(
             { assertTrue(reader.nextRow()) },
-            { assertEquals("0", reader.get(TASK_WORKFLOW_ID)) },
-            { assertEquals("1", reader.get(TASK_ID)) },
-            { assertEquals(Instant.ofEpochSecond(16), reader.get(TASK_SUBMIT_TIME)) },
-            { assertEquals(Duration.ofSeconds(11), reader.get(TASK_RUNTIME)) },
-            { assertEquals(emptySet<String>(), reader.get(TASK_PARENTS)) },
+            { assertEquals("0", reader.getString(TASK_WORKFLOW_ID)) },
+            { assertEquals("1", reader.getString(TASK_ID)) },
+            { assertEquals(Instant.ofEpochSecond(16), reader.getInstant(TASK_SUBMIT_TIME)) },
+            { assertEquals(Duration.ofSeconds(11), reader.getDuration(TASK_RUNTIME)) },
+            { assertEquals(emptySet<String>(), reader.getSet(TASK_PARENTS, String::class.java)) },
         )
     }
 
@@ -81,11 +81,11 @@ internal class GwfTraceFormatTest {
 
         assertAll(
             { assertTrue(reader.nextRow()) },
-            { assertEquals("0", reader.get(TASK_WORKFLOW_ID)) },
-            { assertEquals("7", reader.get(TASK_ID)) },
-            { assertEquals(Instant.ofEpochSecond(87), reader.get(TASK_SUBMIT_TIME)) },
-            { assertEquals(Duration.ofSeconds(11), reader.get(TASK_RUNTIME)) },
-            { assertEquals(setOf("4", "5", "6"), reader.get(TASK_PARENTS)) },
+            { assertEquals("0", reader.getString(TASK_WORKFLOW_ID)) },
+            { assertEquals("7", reader.getString(TASK_ID)) },
+            { assertEquals(Instant.ofEpochSecond(87), reader.getInstant(TASK_SUBMIT_TIME)) },
+            { assertEquals(Duration.ofSeconds(11), reader.getDuration(TASK_RUNTIME)) },
+            { assertEquals(setOf("4", "5", "6"), reader.getSet(TASK_PARENTS, String::class.java)) },
         )
     }
 }
-- 
cgit v1.2.3


From 9d759c9bc987965fae8b0c16c000772c546bf3a2 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 8 Jun 2022 15:06:14 +0200
Subject: 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.
---
 .../kotlin/org/opendc/trace/gwf/GwfTraceFormatTest.kt | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'opendc-trace/opendc-trace-gwf/src/test')

diff --git a/opendc-trace/opendc-trace-gwf/src/test/kotlin/org/opendc/trace/gwf/GwfTraceFormatTest.kt b/opendc-trace/opendc-trace-gwf/src/test/kotlin/org/opendc/trace/gwf/GwfTraceFormatTest.kt
index dd0e6066..a8c3a715 100644
--- a/opendc-trace/opendc-trace-gwf/src/test/kotlin/org/opendc/trace/gwf/GwfTraceFormatTest.kt
+++ b/opendc-trace/opendc-trace-gwf/src/test/kotlin/org/opendc/trace/gwf/GwfTraceFormatTest.kt
@@ -24,7 +24,10 @@ package org.opendc.trace.gwf
 
 import org.junit.jupiter.api.*
 import org.junit.jupiter.api.Assertions.*
+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
@@ -32,6 +35,7 @@ import java.time.Instant
 /**
  * Test suite for the [GwfTraceFormat] class.
  */
+@DisplayName("GWF TraceFormat")
 internal class GwfTraceFormatTest {
     private val format = GwfTraceFormat()
 
@@ -88,4 +92,19 @@ internal class GwfTraceFormatTest {
             { assertEquals(setOf("4", "5", "6"), reader.getSet(TASK_PARENTS, String::class.java)) },
         )
     }
+
+    @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(checkNotNull(GwfTraceFormatTest::class.java.getResource("/trace.gwf")).toURI())
+
+            columns = format.getDetails(path, TABLE_TASKS).columns
+            reader = format.newReader(path, TABLE_TASKS, null)
+        }
+    }
 }
-- 
cgit v1.2.3