use object.equals

Author: danielfeismann

src/test/groovy/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactoryTest.groovy

@@ -45,8 +45,7 @@ class CosmoTimeBasedWeatherValueFactoryTest extends Specification {
     def model = factory.buildModel(data)
 
     then:
-    model.time == expectedResults.time
-    model.value == expectedResults.value
+    model.equals(expectedResults)
   }
 
   def "A PsdmTimeBasedWeatherValueFactory should be able to create time series values"() {
@@ -78,8 +77,7 @@ class CosmoTimeBasedWeatherValueFactoryTest extends Specification {
     def model = factory.buildModel(data)
 
     then:
-    model.time == expectedResults.time
-    model.value == expectedResults.value
+    model.equals(expectedResults)
   }
 
   def "A PsdmTimeBasedWeatherValueFactory should throw FactoryException if required field is missing"() {
@@ -135,7 +133,6 @@ class CosmoTimeBasedWeatherValueFactoryTest extends Specification {
     def model = factory.buildModel(data)
 
     then:
-    assert model.time == expectedResults.time
-    assert model.value != expectedResults.value
+    !model.equals(expectedResults)
   }
 }

src/test/groovy/edu/ie3/datamodel/io/factory/timeseries/TimeBasedSimpleValueFactoryTest.groovy

@@ -131,8 +131,7 @@ class TimeBasedSimpleValueFactoryTest extends Specification {
         )
 
     expect:
-    factory.buildModel(data).time == expected.time
-    factory.buildModel(data).value == expected.value
+    factory.buildModel(data).equals(expected)
   }
 
   def "The simple time based value factory builds correct heat and active power value"() {
@@ -151,8 +150,7 @@ class TimeBasedSimpleValueFactoryTest extends Specification {
         )
 
     expect:
-    factory.buildModel(data).time == expected.time
-    factory.buildModel(data).value == expected.value
+    factory.buildModel(data).equals(expected)
   }
 
   def "The simple time based value factory builds correct heat demand value"() {
@@ -170,8 +168,7 @@ class TimeBasedSimpleValueFactoryTest extends Specification {
         )
 
     expect:
-    factory.buildModel(data).time == expected.time
-    factory.buildModel(data).value == expected.value
+    factory.buildModel(data).equals(expected)
   }
 
   def "The simple time based value factory builds correct apparent power value"() {
@@ -190,8 +187,7 @@ class TimeBasedSimpleValueFactoryTest extends Specification {
         )
 
     expect:
-    factory.buildModel(data).time == expected.time
-    factory.buildModel(data).value == expected.value
+    factory.buildModel(data).equals(expected)
   }
 
   def "The simple time based value factory builds correct active power value"() {
@@ -209,8 +205,7 @@ class TimeBasedSimpleValueFactoryTest extends Specification {
         )
 
     expect:
-    factory.buildModel(data).time == expected.time
-    factory.buildModel(data).value == expected.value
+    factory.buildModel(data).equals(expected)
   }
 
   def "The simple time based value factory throws a FactoryException upon build request, if a class is not supported"() {