From 2def11019a294bfff4381ca334415c9506b09a04 Mon Sep 17 00:00:00 2001 From: jo-bao Date: Mon, 26 Feb 2024 16:27:04 +0100 Subject: [PATCH 1/5] Fix test --- .../io/source/csv/CsvGraphicSourceTest.groovy | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvGraphicSourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvGraphicSourceTest.groovy index 05677834b..e6997c446 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvGraphicSourceTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvGraphicSourceTest.groovy @@ -5,6 +5,8 @@ */ package edu.ie3.datamodel.io.source.csv +import edu.ie3.datamodel.models.input.connector.type.LineTypeInput + import static edu.ie3.test.helper.EntityMap.map import edu.ie3.datamodel.exceptions.FailureException @@ -45,12 +47,15 @@ class CsvGraphicSourceTest extends Specification implements CsvTestDataMeta { def rawGridSource = new RawGridSource(typeSource, new CsvDataSource(csvSep, gridDefaultFolderPath, fileNamingStrategy)) { @Override - Map getNodes() { + Map getLines() { return Collections.emptyMap() } @Override - Map getNodes(Map operators) { + Map getLines( + Map operators, + Map nodes, + Map lineTypeInputs) { return Collections.emptyMap() } } @@ -66,7 +71,7 @@ class CsvGraphicSourceTest extends Specification implements CsvTestDataMeta { 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.message.startsWith("edu.ie3.datamodel.exceptions.SourceException: 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") } From 6ff4aef327c2c97ade5caa597f9faf290b9ec02d Mon Sep 17 00:00:00 2001 From: jo-bao Date: Mon, 26 Feb 2024 16:27:21 +0100 Subject: [PATCH 2/5] Spotless --- .../datamodel/io/source/csv/CsvGraphicSourceTest.groovy | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvGraphicSourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvGraphicSourceTest.groovy index e6997c446..c150b9dac 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvGraphicSourceTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvGraphicSourceTest.groovy @@ -5,8 +5,6 @@ */ package edu.ie3.datamodel.io.source.csv -import edu.ie3.datamodel.models.input.connector.type.LineTypeInput - import static edu.ie3.test.helper.EntityMap.map import edu.ie3.datamodel.exceptions.FailureException @@ -17,6 +15,7 @@ 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 @@ -53,9 +52,9 @@ class CsvGraphicSourceTest extends Specification implements CsvTestDataMeta { @Override Map getLines( - Map operators, - Map nodes, - Map lineTypeInputs) { + Map operators, + Map nodes, + Map lineTypeInputs) { return Collections.emptyMap() } } From ae6f113c377c0d94911ff840f9096d6d3b7e379b Mon Sep 17 00:00:00 2001 From: jo-bao Date: Mon, 26 Feb 2024 17:01:05 +0100 Subject: [PATCH 3/5] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eba11a5d2..028052b08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 `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) From 6c78230fc4689896e644709c8b960dc794a5b00d Mon Sep 17 00:00:00 2001 From: jo-bao Date: Mon, 26 Feb 2024 17:01:35 +0100 Subject: [PATCH 4/5] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 028052b08..d070d7c42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +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 `CsvGraphicSource` [#1022](https://github.com/ie3-institute/PowerSystemDataModel/issues/1022) +- 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) From 0e81ccc44b49180d405136b7b7e93efab609d057 Mon Sep 17 00:00:00 2001 From: danielfeismann Date: Mon, 26 Feb 2024 17:33:01 +0100 Subject: [PATCH 5/5] fix test message --- .../datamodel/io/source/csv/CsvGraphicSourceTest.groovy | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvGraphicSourceTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvGraphicSourceTest.groovy index c150b9dac..31ef1c3c0 100644 --- a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvGraphicSourceTest.groovy +++ b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvGraphicSourceTest.groovy @@ -8,6 +8,7 @@ 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 @@ -62,15 +63,15 @@ class CsvGraphicSourceTest extends Specification implements CsvTestDataMeta { 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.SourceException: 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") + 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") }