Skip to content

Commit a3860e9

Browse files
tests
1 parent 5c45532 commit a3860e9

File tree

3 files changed

+25
-19
lines changed

3 files changed

+25
-19
lines changed

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvDataSourceTest.groovy

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package edu.ie3.datamodel.io.source.csv
88
import edu.ie3.datamodel.exceptions.SourceException
99
import edu.ie3.datamodel.io.connectors.CsvFileConnector
1010
import edu.ie3.datamodel.io.naming.FileNamingStrategy
11+
import edu.ie3.datamodel.io.file.FileType
1112
import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme
1213
import edu.ie3.datamodel.io.naming.timeseries.FileIndividualTimeSeriesMetaInformation
1314
import edu.ie3.datamodel.models.input.system.LoadInput
@@ -383,11 +384,11 @@ class CsvDataSourceTest extends Specification implements CsvTestDataMeta {
383384
def "The CsvDataSource is able to build correct uuid to meta information mapping"() {
384385
given:
385386
def expected = [
386-
(UUID.fromString("53990eea-1b5d-47e8-9134-6d8de36604bf")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("53990eea-1b5d-47e8-9134-6d8de36604bf"), ColumnScheme.APPARENT_POWER, Path.of("its_pq_53990eea-1b5d-47e8-9134-6d8de36604bf")),
387-
(UUID.fromString("fcf0b851-a836-4bde-8090-f44c382ed226")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("fcf0b851-a836-4bde-8090-f44c382ed226"), ColumnScheme.ACTIVE_POWER, Path.of("its_p_fcf0b851-a836-4bde-8090-f44c382ed226")),
388-
(UUID.fromString("5022a70e-a58f-4bac-b8ec-1c62376c216b")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("5022a70e-a58f-4bac-b8ec-1c62376c216b"), ColumnScheme.APPARENT_POWER_AND_HEAT_DEMAND, Path.of("its_pqh_5022a70e-a58f-4bac-b8ec-1c62376c216b")),
389-
(UUID.fromString("b88dee50-5484-4136-901d-050d8c1c97d1")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("b88dee50-5484-4136-901d-050d8c1c97d1"), ColumnScheme.ENERGY_PRICE, Path.of("its_c_b88dee50-5484-4136-901d-050d8c1c97d1")),
390-
(UUID.fromString("c7b0d9d6-5044-4f51-80b4-f221d8b1f14b")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("c7b0d9d6-5044-4f51-80b4-f221d8b1f14b"), ColumnScheme.ENERGY_PRICE, Path.of("its_c_c7b0d9d6-5044-4f51-80b4-f221d8b1f14b"))
387+
(UUID.fromString("53990eea-1b5d-47e8-9134-6d8de36604bf")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("53990eea-1b5d-47e8-9134-6d8de36604bf"), ColumnScheme.APPARENT_POWER, Path.of("its_pq_53990eea-1b5d-47e8-9134-6d8de36604bf"), FileType.CSV),
388+
(UUID.fromString("fcf0b851-a836-4bde-8090-f44c382ed226")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("fcf0b851-a836-4bde-8090-f44c382ed226"), ColumnScheme.ACTIVE_POWER, Path.of("its_p_fcf0b851-a836-4bde-8090-f44c382ed226"), FileType.CSV),
389+
(UUID.fromString("5022a70e-a58f-4bac-b8ec-1c62376c216b")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("5022a70e-a58f-4bac-b8ec-1c62376c216b"), ColumnScheme.APPARENT_POWER_AND_HEAT_DEMAND, Path.of("its_pqh_5022a70e-a58f-4bac-b8ec-1c62376c216b"), FileType.CSV),
390+
(UUID.fromString("b88dee50-5484-4136-901d-050d8c1c97d1")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("b88dee50-5484-4136-901d-050d8c1c97d1"), ColumnScheme.ENERGY_PRICE, Path.of("its_c_b88dee50-5484-4136-901d-050d8c1c97d1"), FileType.CSV),
391+
(UUID.fromString("c7b0d9d6-5044-4f51-80b4-f221d8b1f14b")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("c7b0d9d6-5044-4f51-80b4-f221d8b1f14b"), ColumnScheme.ENERGY_PRICE, Path.of("its_c_c7b0d9d6-5044-4f51-80b4-f221d8b1f14b"), FileType.CSV)
391392
]
392393

393394
when:
@@ -400,9 +401,9 @@ class CsvDataSourceTest extends Specification implements CsvTestDataMeta {
400401
def "The CsvDataSource is able to build correct uuid to meta information mapping when restricting column schemes"() {
401402
given:
402403
def expected = [
403-
(UUID.fromString("b88dee50-5484-4136-901d-050d8c1c97d1")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("b88dee50-5484-4136-901d-050d8c1c97d1"), ColumnScheme.ENERGY_PRICE, Path.of("its_c_b88dee50-5484-4136-901d-050d8c1c97d1")),
404-
(UUID.fromString("c7b0d9d6-5044-4f51-80b4-f221d8b1f14b")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("c7b0d9d6-5044-4f51-80b4-f221d8b1f14b"), ColumnScheme.ENERGY_PRICE, Path.of("its_c_c7b0d9d6-5044-4f51-80b4-f221d8b1f14b")),
405-
(UUID.fromString("fcf0b851-a836-4bde-8090-f44c382ed226")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("fcf0b851-a836-4bde-8090-f44c382ed226"), ColumnScheme.ACTIVE_POWER, Path.of("its_p_fcf0b851-a836-4bde-8090-f44c382ed226"))
404+
(UUID.fromString("b88dee50-5484-4136-901d-050d8c1c97d1")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("b88dee50-5484-4136-901d-050d8c1c97d1"), ColumnScheme.ENERGY_PRICE, Path.of("its_c_b88dee50-5484-4136-901d-050d8c1c97d1"), FileType.CSV),
405+
(UUID.fromString("c7b0d9d6-5044-4f51-80b4-f221d8b1f14b")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("c7b0d9d6-5044-4f51-80b4-f221d8b1f14b"), ColumnScheme.ENERGY_PRICE, Path.of("its_c_c7b0d9d6-5044-4f51-80b4-f221d8b1f14b"), FileType.CSV),
406+
(UUID.fromString("fcf0b851-a836-4bde-8090-f44c382ed226")): new FileIndividualTimeSeriesMetaInformation(UUID.fromString("fcf0b851-a836-4bde-8090-f44c382ed226"), ColumnScheme.ACTIVE_POWER, Path.of("its_p_fcf0b851-a836-4bde-8090-f44c382ed226"), FileType.CSV)
406407
]
407408

408409
when:
@@ -435,3 +436,4 @@ class CsvDataSourceTest extends Specification implements CsvTestDataMeta {
435436
actual.get("g0").fullFilePath == Path.of("lpts_g0")
436437
}
437438
}
439+

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceTest.groovy

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import static edu.ie3.datamodel.models.StandardUnits.ENERGY_PRICE
99

1010
import edu.ie3.datamodel.exceptions.SourceException
1111
import edu.ie3.datamodel.io.factory.timeseries.TimeBasedSimpleValueFactory
12+
import edu.ie3.datamodel.io.file.FileType
1213
import edu.ie3.datamodel.io.naming.FileNamingStrategy
1314
import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme
1415
import edu.ie3.datamodel.io.naming.timeseries.FileIndividualTimeSeriesMetaInformation
@@ -98,7 +99,7 @@ class CsvTimeSeriesSourceTest extends Specification implements CsvTestDataMeta {
9899

99100
def "The factory method in csv time series source refuses to build time series with unsupported column type"() {
100101
given:
101-
def metaInformation = new FileIndividualTimeSeriesMetaInformation(UUID.fromString("8bc9120d-fb9b-4484-b4e3-0cdadf0feea9"), ColumnScheme.WEATHER, Path.of("its_weather_8bc9120d-fb9b-4484-b4e3-0cdadf0feea9"))
102+
def metaInformation = new FileIndividualTimeSeriesMetaInformation(UUID.fromString("8bc9120d-fb9b-4484-b4e3-0cdadf0feea9"), ColumnScheme.WEATHER, Path.of("its_weather_8bc9120d-fb9b-4484-b4e3-0cdadf0feea9"), FileType.CSV)
102103

103104
when:
104105
CsvTimeSeriesSource.getSource(";", timeSeriesFolderPath, fileNamingStrategy, metaInformation)
@@ -110,7 +111,7 @@ class CsvTimeSeriesSourceTest extends Specification implements CsvTestDataMeta {
110111

111112
def "The factory method in csv time series source builds a time series source for all supported column types"() {
112113
given:
113-
def metaInformation = new FileIndividualTimeSeriesMetaInformation(uuid, columnScheme, path)
114+
def metaInformation = new FileIndividualTimeSeriesMetaInformation(uuid, columnScheme, path, FileType.CSV)
114115

115116
when:
116117
def actual = CsvTimeSeriesSource.getSource(";", timeSeriesFolderPath, fileNamingStrategy, metaInformation)
@@ -129,4 +130,5 @@ class CsvTimeSeriesSourceTest extends Specification implements CsvTestDataMeta {
129130
UUID.fromString("46be1e57-e4ed-4ef7-95f1-b2b321cb2047") | ColumnScheme.APPARENT_POWER_AND_HEAT_DEMAND | Path.of("its_pqh_46be1e57-e4ed-4ef7-95f1-b2b321cb2047") || 2 | HeatAndSValue
130131
UUID.fromString("eeccbe3c-a47e-448e-8eca-1f369d3c24e6") | ColumnScheme.VOLTAGE | Path.of("its_v_eeccbe3c-a47e-448e-8eca-1f369d3c24e6") || 2 | VoltageValue
131132
}
132-
}
133+
}
134+

src/test/groovy/edu/ie3/datamodel/io/source/csv/FileTimeSeriesMetaInformationSourceIT.groovy

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package edu.ie3.datamodel.io.source.csv
77

88
import edu.ie3.datamodel.io.naming.FileNamingStrategy
99
import edu.ie3.datamodel.io.naming.timeseries.ColumnScheme
10+
import edu.ie3.datamodel.io.file.FileType
1011
import edu.ie3.datamodel.io.naming.timeseries.FileIndividualTimeSeriesMetaInformation
1112
import edu.ie3.datamodel.io.source.file.FileTimeSeriesMetaInformationSource
1213
import spock.lang.Shared
@@ -25,14 +26,14 @@ class FileTimeSeriesMetaInformationSourceIT extends Specification implements Csv
2526
def "A CSV time series meta information source returns correct mapping of time series"() {
2627
given:
2728
def expectedTimeSeries = Set.of(
28-
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("2fcb3e53-b94a-4b96-bea4-c469e499f1a1"), ColumnScheme.ENERGY_PRICE, Path.of('its_c_2fcb3e53-b94a-4b96-bea4-c469e499f1a1')),
29-
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("76c9d846-797c-4f07-b7ec-2245f679f5c7"), ColumnScheme.ACTIVE_POWER_AND_HEAT_DEMAND, Path.of('its_ph_76c9d846-797c-4f07-b7ec-2245f679f5c7')),
30-
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("c8fe6547-fd85-4fdf-a169-e4da6ce5c3d0"), ColumnScheme.HEAT_DEMAND, Path.of('its_h_c8fe6547-fd85-4fdf-a169-e4da6ce5c3d0')),
31-
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("9185b8c1-86ba-4a16-8dea-5ac898e8caa5"), ColumnScheme.ACTIVE_POWER, Path.of('its_p_9185b8c1-86ba-4a16-8dea-5ac898e8caa5')),
32-
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("3fbfaa97-cff4-46d4-95ba-a95665e87c26"), ColumnScheme.APPARENT_POWER, Path.of('its_pq_3fbfaa97-cff4-46d4-95ba-a95665e87c26')),
33-
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("46be1e57-e4ed-4ef7-95f1-b2b321cb2047"), ColumnScheme.APPARENT_POWER_AND_HEAT_DEMAND, Path.of('its_pqh_46be1e57-e4ed-4ef7-95f1-b2b321cb2047')),
34-
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("1061af70-1c03-46e1-b960-940b956c429f"), ColumnScheme.APPARENT_POWER, Path.of('its_pq_1061af70-1c03-46e1-b960-940b956c429f')),
35-
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("eeccbe3c-a47e-448e-8eca-1f369d3c24e6"), ColumnScheme.VOLTAGE, Path.of("its_v_eeccbe3c-a47e-448e-8eca-1f369d3c24e6"))
29+
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("2fcb3e53-b94a-4b96-bea4-c469e499f1a1"), ColumnScheme.ENERGY_PRICE, Path.of('its_c_2fcb3e53-b94a-4b96-bea4-c469e499f1a1'), FileType.CSV),
30+
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("76c9d846-797c-4f07-b7ec-2245f679f5c7"), ColumnScheme.ACTIVE_POWER_AND_HEAT_DEMAND, Path.of('its_ph_76c9d846-797c-4f07-b7ec-2245f679f5c7'), FileType.CSV),
31+
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("c8fe6547-fd85-4fdf-a169-e4da6ce5c3d0"), ColumnScheme.HEAT_DEMAND, Path.of('its_h_c8fe6547-fd85-4fdf-a169-e4da6ce5c3d0'), FileType.CSV),
32+
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("9185b8c1-86ba-4a16-8dea-5ac898e8caa5"), ColumnScheme.ACTIVE_POWER, Path.of('its_p_9185b8c1-86ba-4a16-8dea-5ac898e8caa5'), FileType.CSV),
33+
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("3fbfaa97-cff4-46d4-95ba-a95665e87c26"), ColumnScheme.APPARENT_POWER, Path.of('its_pq_3fbfaa97-cff4-46d4-95ba-a95665e87c26'), FileType.CSV),
34+
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("46be1e57-e4ed-4ef7-95f1-b2b321cb2047"), ColumnScheme.APPARENT_POWER_AND_HEAT_DEMAND, Path.of('its_pqh_46be1e57-e4ed-4ef7-95f1-b2b321cb2047'), FileType.CSV),
35+
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("1061af70-1c03-46e1-b960-940b956c429f"), ColumnScheme.APPARENT_POWER, Path.of('its_pq_1061af70-1c03-46e1-b960-940b956c429f'), FileType.CSV),
36+
new FileIndividualTimeSeriesMetaInformation(UUID.fromString("eeccbe3c-a47e-448e-8eca-1f369d3c24e6"), ColumnScheme.VOLTAGE, Path.of("its_v_eeccbe3c-a47e-448e-8eca-1f369d3c24e6"), FileType.CSV)
3637
)
3738

3839
when:
@@ -76,3 +77,4 @@ class FileTimeSeriesMetaInformationSourceIT extends Specification implements Csv
7677
result.empty
7778
}
7879
}
80+

0 commit comments

Comments
 (0)