3 files changed, 13 insertions, 11 deletions
diff --git a/opendc-simulator/opendc-simulator-flow/src/test/kotlin/org/opendc/simulator/flow/FlowForwarderTest.kt b/opendc-simulator/opendc-simulator-flow/src/test/kotlin/org/opendc/simulator/flow/FlowForwarderTest.kt
index d548451f..12e72b8f 100644
--- a/opendc-simulator/opendc-simulator-flow/src/test/kotlin/org/opendc/simulator/flow/FlowForwarderTest.kt
+++ b/opendc-simulator/opendc-simulator-flow/src/test/kotlin/org/opendc/simulator/flow/FlowForwarderTest.kt
@@ -217,7 +217,7 @@ internal class FlowForwarderTest {
         assertEquals(2.0, source.counters.actual)
         assertEquals(source.counters.actual, forwarder.counters.actual) { "Actual work" }
         assertEquals(source.counters.demand, forwarder.counters.demand) { "Work demand" }
-        assertEquals(source.counters.overcommit, forwarder.counters.overcommit) { "Overcommitted work" }
+        assertEquals(source.counters.remaining, forwarder.counters.remaining) { "Overcommitted work" }
         assertEquals(2000, clock.millis())
     }
 
diff --git a/opendc-simulator/opendc-simulator-flow/src/test/kotlin/org/opendc/simulator/flow/mux/ExclusiveFlowMultiplexerTest.kt b/opendc-simulator/opendc-simulator-flow/src/test/kotlin/org/opendc/simulator/flow/mux/ForwardingFlowMultiplexerTest.kt
index 3475f027..187dacd9 100644
--- a/opendc-simulator/opendc-simulator-flow/src/test/kotlin/org/opendc/simulator/flow/mux/ExclusiveFlowMultiplexerTest.kt
+++ b/opendc-simulator/opendc-simulator-flow/src/test/kotlin/org/opendc/simulator/flow/mux/ForwardingFlowMultiplexerTest.kt
@@ -37,7 +37,7 @@ import org.opendc.simulator.flow.source.TraceFlowSource
 /**
  * Test suite for the [ForwardingFlowMultiplexer] class.
  */
-internal class ExclusiveFlowMultiplexerTest {
+internal class ForwardingFlowMultiplexerTest {
     /**
      * Test a trace workload.
      */
@@ -63,7 +63,7 @@ internal class ExclusiveFlowMultiplexerTest {
         val forwarder = FlowForwarder(engine)
         val adapter = FlowSourceRateAdapter(forwarder, speed::add)
         source.startConsumer(adapter)
-        switch.addOutput(forwarder)
+        forwarder.startConsumer(switch.newOutput())
 
         val provider = switch.newInput()
         provider.consume(workload)
@@ -88,7 +88,7 @@ internal class ExclusiveFlowMultiplexerTest {
         val switch = ForwardingFlowMultiplexer(engine)
         val source = FlowSink(engine, 3200.0)
 
-        switch.addOutput(source)
+        source.startConsumer(switch.newOutput())
 
         val provider = switch.newInput()
         provider.consume(workload)
@@ -127,7 +127,7 @@ internal class ExclusiveFlowMultiplexerTest {
         val switch = ForwardingFlowMultiplexer(engine)
         val source = FlowSink(engine, 3200.0)
 
-        switch.addOutput(source)
+        source.startConsumer(switch.newOutput())
 
         val provider = switch.newInput()
         provider.consume(workload)
@@ -146,7 +146,7 @@ internal class ExclusiveFlowMultiplexerTest {
         val switch = ForwardingFlowMultiplexer(engine)
         val source = FlowSink(engine, 3200.0)
 
-        switch.addOutput(source)
+        source.startConsumer(switch.newOutput())
 
         switch.newInput()
         assertThrows<IllegalStateException> { switch.newInput() }
diff --git a/opendc-simulator/opendc-simulator-flow/src/test/kotlin/org/opendc/simulator/flow/mux/MaxMinFlowMultiplexerTest.kt b/opendc-simulator/opendc-simulator-flow/src/test/kotlin/org/opendc/simulator/flow/mux/MaxMinFlowMultiplexerTest.kt
index 9f6b8a2c..6e2cdb98 100644
--- a/opendc-simulator/opendc-simulator-flow/src/test/kotlin/org/opendc/simulator/flow/mux/MaxMinFlowMultiplexerTest.kt
+++ b/opendc-simulator/opendc-simulator-flow/src/test/kotlin/org/opendc/simulator/flow/mux/MaxMinFlowMultiplexerTest.kt
@@ -44,7 +44,7 @@ internal class MaxMinFlowMultiplexerTest {
         val switch = MaxMinFlowMultiplexer(scheduler)
 
         val sources = List(2) { FlowSink(scheduler, 2000.0) }
-        sources.forEach { switch.addOutput(it) }
+        sources.forEach { it.startConsumer(switch.newOutput()) }
 
         val provider = switch.newInput()
         val consumer = FixedFlowSource(2000.0, 1.0)
@@ -76,10 +76,11 @@ internal class MaxMinFlowMultiplexerTest {
             )
 
         val switch = MaxMinFlowMultiplexer(scheduler)
+        val sink = FlowSink(scheduler, 3200.0)
         val provider = switch.newInput()
 
         try {
-            switch.addOutput(FlowSink(scheduler, 3200.0))
+            sink.startConsumer(switch.newOutput())
             provider.consume(workload)
             yield()
         } finally {
@@ -89,7 +90,7 @@ internal class MaxMinFlowMultiplexerTest {
         assertAll(
             { assertEquals(1113300.0, switch.counters.demand, "Requested work does not match") },
             { assertEquals(1023300.0, switch.counters.actual, "Actual work does not match") },
-            { assertEquals(90000.0, switch.counters.overcommit, "Overcommitted work does not match") },
+            { assertEquals(2816700.0, switch.counters.remaining, "Remaining capacity does not match") },
             { assertEquals(1200000, clock.millis()) }
         )
     }
@@ -122,11 +123,12 @@ internal class MaxMinFlowMultiplexerTest {
             )
 
         val switch = MaxMinFlowMultiplexer(scheduler)
+        val sink = FlowSink(scheduler, 3200.0)
         val providerA = switch.newInput()
         val providerB = switch.newInput()
 
         try {
-            switch.addOutput(FlowSink(scheduler, 3200.0))
+            sink.startConsumer(switch.newOutput())
 
             coroutineScope {
                 launch { providerA.consume(workloadA) }
@@ -140,7 +142,7 @@ internal class MaxMinFlowMultiplexerTest {
         assertAll(
             { assertEquals(2073600.0, switch.counters.demand, "Requested work does not match") },
             { assertEquals(1053600.0, switch.counters.actual, "Granted work does not match") },
-            { assertEquals(1020000.0, switch.counters.overcommit, "Overcommitted work does not match") },
+            { assertEquals(2786400.0, switch.counters.remaining, "Remaining capacity does not match") },
             { assertEquals(1200000, clock.millis()) }
         )
     }