Skip to content

Commit 4f8e1b4

Browse files
Revert "use objects.equals()"
This reverts commit 9898ac1.
1 parent 9898ac1 commit 4f8e1b4

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class CosmoTimeBasedWeatherValueFactoryTest extends Specification {
4545
def model = factory.buildModel(data)
4646

4747
then:
48-
Object.equals(model,expectedResults)
48+
model.equals(expectedResults)
4949
}
5050

5151
def "A PsdmTimeBasedWeatherValueFactory should be able to create time series values"() {
@@ -77,7 +77,7 @@ class CosmoTimeBasedWeatherValueFactoryTest extends Specification {
7777
def model = factory.buildModel(data)
7878

7979
then:
80-
Object.equals(model,expectedResults)
80+
model.equals(expectedResults)
8181
}
8282

8383
def "A PsdmTimeBasedWeatherValueFactory should throw FactoryException if required field is missing"() {
@@ -133,6 +133,6 @@ class CosmoTimeBasedWeatherValueFactoryTest extends Specification {
133133
def model = factory.buildModel(data)
134134

135135
then:
136-
!Object.equals(model,expectedResults)
136+
!model.equals(expectedResults)
137137
}
138138
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class TimeBasedSimpleValueFactoryTest extends Specification {
109109
)
110110

111111
expect:
112-
Object.equals(factory.buildModel(data),expected)
112+
factory.buildModel(data).equals(expected)
113113
}
114114

115115
def "The simple time based value factory builds correct heat and apparent power value"() {
@@ -129,7 +129,7 @@ class TimeBasedSimpleValueFactoryTest extends Specification {
129129
)
130130

131131
expect:
132-
Object.equals(factory.buildModel(data),expected)
132+
factory.buildModel(data).equals(expected)
133133
}
134134

135135
def "The simple time based value factory builds correct heat and active power value"() {
@@ -147,7 +147,7 @@ class TimeBasedSimpleValueFactoryTest extends Specification {
147147
)
148148

149149
expect:
150-
Object.equals(factory.buildModel(data),expected)
150+
factory.buildModel(data).equals(expected)
151151
}
152152

153153
def "The simple time based value factory builds correct heat demand value"() {
@@ -164,7 +164,7 @@ class TimeBasedSimpleValueFactoryTest extends Specification {
164164
)
165165

166166
expect:
167-
Object.equals(factory.buildModel(data),expected)
167+
factory.buildModel(data).equals(expected)
168168
}
169169

170170
def "The simple time based value factory builds correct apparent power value"() {
@@ -182,7 +182,7 @@ class TimeBasedSimpleValueFactoryTest extends Specification {
182182
)
183183

184184
expect:
185-
Object.equals(factory.buildModel(data),expected)
185+
factory.buildModel(data).equals(expected)
186186
}
187187

188188
def "The simple time based value factory builds correct active power value"() {
@@ -199,7 +199,7 @@ class TimeBasedSimpleValueFactoryTest extends Specification {
199199
)
200200

201201
expect:
202-
Object.equals(factory.buildModel(data),expected)
202+
factory.buildModel(data).equals(expected)
203203
}
204204

205205
def "The simple time based value factory throws a FactoryException upon build request, if a class is not supported"() {

0 commit comments

Comments
 (0)