Merge branch 'refs/heads/dev' into df/#878-thermalGridIT

# Conflicts: # src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
ie3-institute · Aug 24, 2024 · 07e5825 · 07e5825
2 parents ebdc0dc + f82a8c3
commit 07e5825
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala b/src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
@@ -18,7 +18,7 @@ import edu.ie3.simona.ontology.messages.flex.MinMaxFlexibilityMessage.ProvideMin
 import edu.ie3.simona.test.common.UnitSpec
 import edu.ie3.simona.test.common.input.HpInputTestData
 import edu.ie3.util.scala.quantities.WattsPerKelvin
-import org.scalatest.prop.{TableDrivenPropertyChecks, TableFor3}
+import org.scalatest.prop.TableDrivenPropertyChecks
 import squants.energy.{KilowattHours, Kilowatts, Watts}
 import squants.thermal.Celsius
 import squants.{Kelvin, Power, Temperature}
@@ -238,8 +238,7 @@ class HpModelSpec
 
     "determining the flexibility options for different states" should {
       "deliver correct flexibility options" in {
-        val testCases
-            : TableFor3[ThermalGridState, HpState, (Double, Double, Double)] =
+        val testCases =
           Table(
             ("thermalState", "lastState", "expectedValues"),
             // 1. Hp actually not running