Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed thermal-house-documentation [#873](https://github.com/ie3-institute/PowerSystemDataModel/issues/873)
- Fixed ElectricVehicle Documentation [#875](https://github.com/ie3-institute/PowerSystemDataModel/issues/875)
- Fixed Equal behavior of `ConnectorResult` [#1001](https://github.com/ie3-institute/PowerSystemDataModel/issues/1001)
- Fixed test for invalid input data in `CsvGraphicSource` [#1022](https://github.com/ie3-institute/PowerSystemDataModel/issues/1022)

### Changed
- Changing from comparing strings to comparing uuids in `EntitySource.findFirstEntityByUuid` [#829](https://github.com/ie3-institute/PowerSystemDataModel/issues/829)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ package edu.ie3.datamodel.io.source.csv
import static edu.ie3.test.helper.EntityMap.map

import edu.ie3.datamodel.exceptions.FailureException
import edu.ie3.datamodel.exceptions.GraphicSourceException
import edu.ie3.datamodel.exceptions.SourceException
import edu.ie3.datamodel.io.source.GraphicSource
import edu.ie3.datamodel.io.source.RawGridSource
import edu.ie3.datamodel.io.source.TypeSource
import edu.ie3.datamodel.models.input.NodeInput
import edu.ie3.datamodel.models.input.OperatorInput
import edu.ie3.datamodel.models.input.connector.LineInput
import edu.ie3.datamodel.models.input.connector.type.LineTypeInput
import edu.ie3.datamodel.models.input.graphics.NodeGraphicInput
import edu.ie3.datamodel.utils.Try
import edu.ie3.test.common.GridTestData as gtd
Expand Down Expand Up @@ -45,28 +47,31 @@ class CsvGraphicSourceTest extends Specification implements CsvTestDataMeta {
def rawGridSource =
new RawGridSource(typeSource, new CsvDataSource(csvSep, gridDefaultFolderPath, fileNamingStrategy)) {
@Override
Map<UUID, NodeInput> getNodes() {
Map<UUID, LineInput> getLines() {
return Collections.emptyMap()
}

@Override
Map<UUID, NodeInput> getNodes(Map<UUID, OperatorInput> operators) {
Map<UUID, LineInput> getLines(
Map<UUID, OperatorInput> operators,
Map<UUID, NodeInput> nodes,
Map<UUID, LineTypeInput> lineTypeInputs) {
return Collections.emptyMap()
}
}

def graphicSource = new GraphicSource(typeSource, rawGridSource, new CsvDataSource(csvSep, graphicsFolderPath, fileNamingStrategy))

when:
def graphicElements = Try.of(() -> graphicSource.graphicElements, SourceException)
def graphicElements = Try.of(() -> graphicSource.graphicElements, GraphicSourceException)

then:
graphicElements.failure
graphicElements.data == Optional.empty()

Exception ex = graphicElements.exception.get()
ex.class == SourceException
ex.message.startsWith("edu.ie3.datamodel.exceptions.FailureException: 2 exception(s) occurred within \"LineInput\" data, one is: edu.ie3.datamodel.exceptions.FactoryException: edu.ie3.datamodel.exceptions.SourceException: Linked nodeA with UUID 4ca90220-74c2-4369-9afa-a18bf068840d was not found for entity")
ex.class == GraphicSourceException
ex.message.startsWith("1error(s) occurred while initializing graphic elements. edu.ie3.datamodel.exceptions.FailureException: 1 exception(s) occurred within \"LineGraphicInput\" data, one is: edu.ie3.datamodel.exceptions.FactoryException: edu.ie3.datamodel.exceptions.SourceException: Linked line with UUID 91ec3bcf-1777-4d38-af67-0bf7c9fa73c7 was not found for entity")
}


Expand Down