From 18ff316a6b6ab984ebf8283ea48ed98ec69d8295 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 2 Sep 2021 13:20:05 +0200
Subject: refactor(capelin): Restructure input reading classes

---
 .../kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt   | 4 +++-
 .../experiments/capelin/trace/PerformanceInterferenceReaderTest.kt    | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'opendc-experiments/opendc-experiments-capelin/src/test')

diff --git a/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt b/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
index abd8efeb..aed9a4bb 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/CapelinIntegrationTest.kt
@@ -197,7 +197,9 @@ class CapelinIntegrationTest {
 
         val perfInterferenceInput = checkNotNull(CapelinIntegrationTest::class.java.getResourceAsStream("/bitbrains-perf-interference.json"))
         val performanceInterferenceModel =
-            PerformanceInterferenceReader(perfInterferenceInput).use { VmInterferenceModel(it.read(), Random(seed.toLong())) }
+            PerformanceInterferenceReader()
+                .read(perfInterferenceInput)
+                .let { VmInterferenceModel(it, Random(seed.toLong())) }
 
         val meterProvider = createMeterProvider(clock)
 
diff --git a/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/trace/PerformanceInterferenceReaderTest.kt b/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/trace/PerformanceInterferenceReaderTest.kt
index 9b1513dc..fbc39b87 100644
--- a/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/trace/PerformanceInterferenceReaderTest.kt
+++ b/opendc-experiments/opendc-experiments-capelin/src/test/kotlin/org/opendc/experiments/capelin/trace/PerformanceInterferenceReaderTest.kt
@@ -33,9 +33,7 @@ class PerformanceInterferenceReaderTest {
     @Test
     fun testSmoke() {
         val input = checkNotNull(PerformanceInterferenceReader::class.java.getResourceAsStream("/perf-interference.json"))
-        val reader = PerformanceInterferenceReader(input)
-
-        val result = reader.use { reader.read() }
+        val result = PerformanceInterferenceReader().read(input)
 
         assertAll(
             { assertEquals(2, result.size) },
-- 
cgit v1.2.3