Skip to content

Commit b16b2d8

Browse files
Merge pull request #725 from ie3-institute/dependabot/gradle/dev/tech.units-indriya-2.1.4
Bump indriya from 2.1.3 to 2.1.4
2 parents 4f3538e + d27d7cb commit b16b2d8

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ dependencies {
5858
// ie³ power system utils
5959
implementation 'com.github.ie3-institute:PowerSystemUtils:2.0-SNAPSHOT'
6060

61-
implementation 'tech.units:indriya:2.1.3'
61+
implementation 'tech.units:indriya:2.1.4'
6262

6363
implementation 'com.github.johanneshiry:OSMonaut:v1.1.1' // tmp pbf parse
6464

src/test/groovy/edu/ie3/datamodel/models/CommonVoltageLevelTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ class CommonVoltageLevelTest extends Specification {
5555

5656
then:
5757
VoltageLevelException ex = thrown()
58-
ex.message == "The provided id \"HS\" and rated voltage \"500 V\" could possibly meet the voltage level \"Niederspannung\" (Interval [0 kV, 10 kV)), but are inconsistent."
58+
ex.message == "The provided id \"HS\" and rated voltage \"500 V\" could possibly meet the voltage level \"Niederspannung\" (Interval [0.0 kV, 10 kV)), but are inconsistent."
5959
}
6060
}

src/test/groovy/edu/ie3/datamodel/models/input/connector/LineInputTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,6 @@ class LineInputTest extends Specification {
9696
", type=3bed3eb3-9790-4874-89b5-a5434d408088" +
9797
", length=0.003 km" +
9898
", geoPosition=LINESTRING (7.411111 51.492528, 7.414116 51.484136)" +
99-
", olmCharacteristic=OlmCharacteristicInput{points=[CharacteristicCoordinate{x=0 m/s, y=1 p.u.}]}}"
99+
", olmCharacteristic=OlmCharacteristicInput{points=[CharacteristicCoordinate{x=0.0 m/s, y=1 p.u.}]}}"
100100
}
101101
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class ConnectorValidationUtilsTest extends Specification {
8181
GridTestData.lineFtoG.copy().nodeA(GridTestData.nodeG).build() || new InvalidEntityException("LineInput connects the same node, but shouldn't", invalidLine)
8282
GridTestData.lineFtoG.copy().nodeA(GridTestData.nodeF.copy().subnet(5).build()).build() || new InvalidEntityException("LineInput connects different subnets, but shouldn't", invalidLine)
8383
GridTestData.lineFtoG.copy().nodeA(GridTestData.nodeF.copy().voltLvl(GermanVoltageLevelUtils.MV_10KV).build()).build() || new InvalidEntityException("LineInput connects different voltage levels, but shouldn't", invalidLine)
84-
GridTestData.lineFtoG.copy().length(Quantities.getQuantity(0d, METRE)).build() || new InvalidEntityException("The following quantities have to be positive: 0 km", invalidLine)
84+
GridTestData.lineFtoG.copy().length(Quantities.getQuantity(0d, METRE)).build() || new InvalidEntityException("The following quantities have to be positive: 0.0 km", invalidLine)
8585
GridTestData.lineFtoG.copy().nodeA(GridTestData.nodeF.copy().geoPosition(testCoordinate).build()).build() || new InvalidEntityException("Coordinates of start and end point do not match coordinates of connected nodes", invalidLine)
8686
GridTestData.lineFtoG.copy().nodeB(GridTestData.nodeG.copy().geoPosition(testCoordinate).build()).build() || new InvalidEntityException("Coordinates of start and end point do not match coordinates of connected nodes", invalidLine)
8787
invalidLineLengthNotMatchingCoordinateDistances || new InvalidEntityException("Line length does not equal calculated distances between points building the line", invalidLine)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ class ValidationUtilsTest extends Specification {
9595
GermanVoltageLevelUtils.LV,
9696
6)
9797
] as Set || Optional.of("9e37ce48-9650-44ec-b888-c2fd182aff01: 2\n" +
98-
" - NodeInput{uuid=9e37ce48-9650-44ec-b888-c2fd182aff01, id='node_f', operator=f15105c4-a2de-4ab8-a621-4bc98e372d92, operationTime=OperationTime{startDate=null, endDate=null, isLimited=false}, vTarget=1 p.u., slack=false, geoPosition=null, voltLvl=CommonVoltageLevel{id='Niederspannung', nominalVoltage=0.4 kV, synonymousIds=[Niederspannung, lv, ns], voltageRange=Interval [0 kV, 10 kV)}, subnet=6}\n" +
99-
" - NodeInput{uuid=9e37ce48-9650-44ec-b888-c2fd182aff01, id='node_g', operator=f15105c4-a2de-4ab8-a621-4bc98e372d92, operationTime=OperationTime{startDate=null, endDate=null, isLimited=false}, vTarget=1 p.u., slack=false, geoPosition=null, voltLvl=CommonVoltageLevel{id='Niederspannung', nominalVoltage=0.4 kV, synonymousIds=[Niederspannung, lv, ns], voltageRange=Interval [0 kV, 10 kV)}, subnet=6}")
98+
" - NodeInput{uuid=9e37ce48-9650-44ec-b888-c2fd182aff01, id='node_f', operator=f15105c4-a2de-4ab8-a621-4bc98e372d92, operationTime=OperationTime{startDate=null, endDate=null, isLimited=false}, vTarget=1 p.u., slack=false, geoPosition=null, voltLvl=CommonVoltageLevel{id='Niederspannung', nominalVoltage=0.4 kV, synonymousIds=[Niederspannung, lv, ns], voltageRange=Interval [0.0 kV, 10 kV)}, subnet=6}\n" +
99+
" - NodeInput{uuid=9e37ce48-9650-44ec-b888-c2fd182aff01, id='node_g', operator=f15105c4-a2de-4ab8-a621-4bc98e372d92, operationTime=OperationTime{startDate=null, endDate=null, isLimited=false}, vTarget=1 p.u., slack=false, geoPosition=null, voltLvl=CommonVoltageLevel{id='Niederspannung', nominalVoltage=0.4 kV, synonymousIds=[Niederspannung, lv, ns], voltageRange=Interval [0.0 kV, 10 kV)}, subnet=6}")
100100
[
101101
GridTestData.nodeD,
102102
GridTestData.nodeE
@@ -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 µS/km, r=0.437 Ω/km, x=0.356 Ω/km, iMax=300 A, vRated=20 kV}]"
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}]"
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 µS/km [LineTypeInput{uuid=3bed3eb3-9790-4874-89b5-a5434d408088, id=lineType_AtoB, b=0 µS/km, g=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: 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}]"
212212
}
213213

214214
def "Checking an unsupported asset leads to an exception"() {

0 commit comments

Comments
 (0)