Skip to content

Commit 0767e27

Browse files
Fixing ValidationUtilsTest
1 parent 47d307b commit 0767e27

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/test/groovy/edu/ie3/datamodel/utils/validation/ValidationUtilsTest.groovy

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import static edu.ie3.datamodel.utils.validation.DummyAssetInput.valid
1111
import static edu.ie3.util.quantities.PowerSystemUnits.OHM_PER_KILOMETRE
1212
import static edu.ie3.util.quantities.PowerSystemUnits.PU
1313

14+
import edu.ie3.datamodel.exceptions.FailedValidationException
1415
import edu.ie3.datamodel.exceptions.InvalidEntityException
15-
import edu.ie3.datamodel.exceptions.NotImplementedException
1616
import edu.ie3.datamodel.exceptions.UnsafeEntityException
1717
import edu.ie3.datamodel.exceptions.ValidationException
1818
import edu.ie3.datamodel.models.OperationTime
@@ -116,7 +116,7 @@ class ValidationUtilsTest extends Specification {
116116

117117
where:
118118
invalidObject || expectedException
119-
new Coordinate(10, 10) || new NotImplementedException("Cannot validate object of class '" + invalidObject.getClass().getSimpleName() + "', as no routine is implemented.")
119+
new Coordinate(10, 10) || new FailedValidationException("Cannot validate object of class '" + invalidObject.getClass().getSimpleName() + "', as no routine is implemented.")
120120
}
121121

122122
def "The validation check method recognizes all potential errors for an asset"() {
@@ -171,7 +171,7 @@ class ValidationUtilsTest extends Specification {
171171

172172
then:
173173
InvalidEntityException ex = thrown()
174-
ex.message == "Entity is invalid because of: The following quantities have to be zero or positive: -1 µS/km [LineTypeInput{uuid=3bed3eb3-9790-4874-89b5-a5434d408088, id=lineType_AtoB, b=-1 µS/km, g=0.0 µS/km, r=0.437 Ω/km, x=0.356 Ω/km, iMax=300 A, vRated=20 kV}]"
174+
ex.message == "Entity is invalid because of: \nThe following quantities have to be zero or positive: -1 µS/km [LineTypeInput{uuid=3bed3eb3-9790-4874-89b5-a5434d408088, id=lineType_AtoB, b=-1 µS/km, g=0.0 µS/km, r=0.437 Ω/km, x=0.356 Ω/km, iMax=300 A, vRated=20 kV}]"
175175
}
176176

177177
def "The check for zero or negative entities should work as expected"() {
@@ -208,7 +208,7 @@ class ValidationUtilsTest extends Specification {
208208

209209
then:
210210
InvalidEntityException ex = thrown()
211-
ex.message == "Entity is invalid because of: The following quantities have to be positive: 0.0 µS/km [LineTypeInput{uuid=3bed3eb3-9790-4874-89b5-a5434d408088, id=lineType_AtoB, b=0.0 µS/km, g=0.0 µS/km, r=0.437 Ω/km, x=0.356 Ω/km, iMax=300 A, vRated=20 kV}]"
211+
ex.message == "Entity is invalid because of: \nThe following quantities have to be positive: 0.0 µS/km [LineTypeInput{uuid=3bed3eb3-9790-4874-89b5-a5434d408088, id=lineType_AtoB, b=0.0 µS/km, g=0.0 µS/km, r=0.437 Ω/km, x=0.356 Ω/km, iMax=300 A, vRated=20 kV}]"
212212
}
213213

214214
def "Checking an unsupported asset leads to an exception"() {
@@ -247,7 +247,7 @@ class ValidationUtilsTest extends Specification {
247247
then:
248248
exceptions.size() == 2
249249
def e = exceptions.get(0).exception.get()
250-
e.message.startsWith("Entity is invalid because of: No ID assigned [AssetTypeInput")
250+
e.message.startsWith("Entity is invalid because of: \nNo ID assigned [AssetTypeInput")
251251
}
252252

253253
def "Checking if asset input ids are unique"() {

0 commit comments

Comments
 (0)