Revamped the trace system. All TraceFormat files are now in the api m… (#216)

* Revamped the trace system. All TraceFormat files are now in the api module. This fixes some problems with not being able to use types of traces

* applied spotless

2 files changed, 0 insertions, 106 deletions

diff --git a/opendc-trace/opendc-trace-swf/src/test/kotlin/org/opendc/trace/swf/SwfTraceFormatTest.kt b/opendc-trace/opendc-trace-swf/src/test/kotlin/org/opendc/trace/swf/SwfTraceFormatTest.kt
deleted file mode 100644
index 436f2572..00000000
--- a/opendc-trace/opendc-trace-swf/src/test/kotlin/org/opendc/trace/swf/SwfTraceFormatTest.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2021 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.opendc.trace.swf
-
-import org.junit.jupiter.api.Assertions.assertAll
-import org.junit.jupiter.api.Assertions.assertDoesNotThrow
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.DisplayName
-import org.junit.jupiter.api.Nested
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
-import org.opendc.trace.TableColumn
-import org.opendc.trace.TableReader
-import org.opendc.trace.conv.TABLE_TASKS
-import org.opendc.trace.conv.TASK_ALLOC_NCPUS
-import org.opendc.trace.conv.TASK_ID
-import org.opendc.trace.testkit.TableReaderTestKit
-import java.nio.file.Paths
-
-/**
- * Test suite for the [SwfTraceFormat] class.
- */
-@DisplayName("SWF TraceFormat")
-internal class SwfTraceFormatTest {
-    private val format = SwfTraceFormat()
-
-    @Test
-    fun testTables() {
-        val path = Paths.get(checkNotNull(SwfTraceFormatTest::class.java.getResource("/trace.swf")).toURI())
-
-        assertEquals(listOf(TABLE_TASKS), format.getTables(path))
-    }
-
-    @Test
-    fun testTableExists() {
-        val path = Paths.get(checkNotNull(SwfTraceFormatTest::class.java.getResource("/trace.swf")).toURI())
-        assertDoesNotThrow { format.getDetails(path, TABLE_TASKS) }
-    }
-
-    @Test
-    fun testTableDoesNotExist() {
-        val path = Paths.get(checkNotNull(SwfTraceFormatTest::class.java.getResource("/trace.swf")).toURI())
-
-        assertThrows<IllegalArgumentException> { format.getDetails(path, "test") }
-    }
-
-    @Test
-    fun testReader() {
-        val path = Paths.get(checkNotNull(SwfTraceFormatTest::class.java.getResource("/trace.swf")).toURI())
-        val reader = format.newReader(path, TABLE_TASKS, null)
-
-        assertAll(
-            { assertTrue(reader.nextRow()) },
-            { assertEquals("1", reader.getString(TASK_ID)) },
-            { assertEquals(306, reader.getInt(TASK_ALLOC_NCPUS)) },
-            { assertTrue(reader.nextRow()) },
-            { assertEquals("2", reader.getString(TASK_ID)) },
-            { assertEquals(17, reader.getInt(TASK_ALLOC_NCPUS)) },
-        )
-
-        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(checkNotNull(SwfTraceFormatTest::class.java.getResource("/trace.swf")).toURI())
-
-            columns = format.getDetails(path, TABLE_TASKS).columns
-            reader = format.newReader(path, TABLE_TASKS, null)
-        }
-    }
-}
diff --git a/opendc-trace/opendc-trace-swf/src/test/resources/trace.swf b/opendc-trace/opendc-trace-swf/src/test/resources/trace.swf
deleted file mode 100644
index c3ecf890..00000000
--- a/opendc-trace/opendc-trace-swf/src/test/resources/trace.swf
+++ /dev/null
@@ -1,6 +0,0 @@
-; Excerpt from the PWA: CTC-SP2-1996-3.1-cln.swf
-    1        0 588530    937  306 142.00    -1   -1  35100    -1  1  97  -1 307  3 -1 -1 -1
-    2   164472 356587     75   17   2.00    -1   -1    300    -1  1  81  -1 195  3 -1 -1 -1
-    3   197154 459987  35268  306  32792    -1   -1  35100    -1  0  97  -1 307  3 -1 -1 -1
-    4   310448  50431  29493   64  28745    -1   -1  64800    -1  1  38  -1  38  1 -1 -1 -1
-    5   310541  50766  29063   64  28191    -1   -1  64800    -1  1  38  -1  69  1 -1 -1 -1