fmt

ie3-institute · Jul 30, 2024 · 86bb6b6 · 86bb6b6
1 parent 1eebc64
commit 86bb6b6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala b/src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
@@ -7,7 +7,10 @@
 package edu.ie3.simona.model.thermal
 
 import edu.ie3.datamodel.models.input.thermal.ThermalStorageInput
-import edu.ie3.simona.model.thermal.ThermalGrid.ThermalGridState
+import edu.ie3.simona.model.thermal.ThermalGrid.{
+  ThermalEnergyDemand,
+  ThermalGridState,
+}
 import edu.ie3.simona.model.thermal.ThermalHouse.ThermalHouseState
 import edu.ie3.simona.model.thermal.ThermalHouse.ThermalHouseThreshold.{
   HouseTemperatureLowerBoundaryReached,
@@ -72,9 +75,9 @@ class ThermalGridWithHouseOnlySpec extends UnitSpec with ThermalHouseTestData {
       }
     }
 
-    "determining the energy demand" should {
-      "exactly be the demand of the house" in {
-        val tick = 10800 // after three house
+    "determining the energy demand for heating" should {
+      "exactly be the thermal demand for heating of the house" in {
+        val tick = 10800 // after three hours
         val expectedHouseDemand = thermalHouse.energyDemandHeating(
           tick,
           testGridambientTemperature,
@@ -130,7 +133,7 @@ class ThermalGridWithHouseOnlySpec extends UnitSpec with ThermalHouseTestData {
       }
 
       "not withdraw energy from the house, if actual consumption is given" in {
-        val tick = 0L // after three house
+        val tick = 0L // after three hours
         val gridState = ThermalGrid.startingState(thermalGrid)
 
         val (updatedGridState, reachedThreshold) =

diff --git a/src/test/scala/edu/ie3/simona/model/thermal/ThermalHouseTestData.scala b/src/test/scala/edu/ie3/simona/model/thermal/ThermalHouseTestData.scala
@@ -9,14 +9,15 @@ package edu.ie3.simona.model.thermal
 import edu.ie3.datamodel.models.StandardUnits
 import edu.ie3.datamodel.models.input.thermal.ThermalHouseInput
 import edu.ie3.simona.model.thermal.ThermalHouse.ThermalHouseState
+import edu.ie3.simona.test.common.DefaultTestData
 import squants.energy.Megawatts
 import squants.thermal.Celsius
 import tech.units.indriya.quantity.Quantities.getQuantity
 import tech.units.indriya.unit.Units
 
 import java.util.UUID
 
-trait ThermalHouseTestData extends ThermalGridTestData {
+trait ThermalHouseTestData extends ThermalGridTestData with DefaultTestData {
   protected val thermalHouseInput: ThermalHouseInput = new ThermalHouseInput(
     UUID.randomUUID(),
     "Thermal House",