Skip to content

Commit 6dd159c

Browse files
t-obert-ober
authored
Merge branch 'dev' into ck/#00-adaptEvModelDocs
2 parents 72f2ad2 + 3d9e270 commit 6dd159c

File tree

119 files changed

+162
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+162
-142
lines changed

‎.gitattributes‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# The following file will be copied to a unix Docker image and imported to InfluxDB data base. Therefore, the line
22
# ending plays a crucial role. This prevents the endings from being adjusted with 'core.autocrlf=true'
3-
src/test/resources/testContainerFiles/influxDb/cosmo/weather.txt eol=lf
4-
src/test/resources/testContainerFiles/influxDb/icon/weather.txt eol=lf
3+
src/test/resources/edu/ie3/datamodel/io/source/influxdb/_weather/cosmo/weather.txt eol=lf
4+
src/test/resources/edu/ie3/datamodel/io/source/influxdb/_weather/icon/weather.txt eol=lf
5+

‎src/test/groovy/edu/ie3/datamodel/io/connectors/CsvFileConnectorTest.groovy‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ class CsvFileConnectorTest extends Specification {
5353
"its_p_fcf0b851-a836-4bde-8090-f44c382ed226.csv",
5454
"its_pqh_5022a70e-a58f-4bac-b8ec-1c62376c216b.csv",
5555
"its_c_b88dee50-5484-4136-901d-050d8c1c97d1.csv",
56-
"its_c_c7b0d9d6-5044-4f51-80b4-f221d8b1f14b.csv",
57-
"its_weather_085d98ee-09a2-4de4-b119-83949690d7b6.csv"
56+
"its_c_c7b0d9d6-5044-4f51-80b4-f221d8b1f14b.csv"
5857
]
5958
pathsToIgnore = [
6059
"file_to_be_ignored.txt"
@@ -85,8 +84,7 @@ class CsvFileConnectorTest extends Specification {
8584
(UUID.fromString("fcf0b851-a836-4bde-8090-f44c382ed226")): new CsvIndividualTimeSeriesMetaInformation(UUID.fromString("fcf0b851-a836-4bde-8090-f44c382ed226"), ColumnScheme.ACTIVE_POWER, "its_p_fcf0b851-a836-4bde-8090-f44c382ed226"),
8685
(UUID.fromString("5022a70e-a58f-4bac-b8ec-1c62376c216b")): new CsvIndividualTimeSeriesMetaInformation(UUID.fromString("5022a70e-a58f-4bac-b8ec-1c62376c216b"), ColumnScheme.APPARENT_POWER_AND_HEAT_DEMAND, "its_pqh_5022a70e-a58f-4bac-b8ec-1c62376c216b"),
8786
(UUID.fromString("b88dee50-5484-4136-901d-050d8c1c97d1")): new CsvIndividualTimeSeriesMetaInformation(UUID.fromString("b88dee50-5484-4136-901d-050d8c1c97d1"), ColumnScheme.ENERGY_PRICE, "its_c_b88dee50-5484-4136-901d-050d8c1c97d1"),
88-
(UUID.fromString("c7b0d9d6-5044-4f51-80b4-f221d8b1f14b")): new CsvIndividualTimeSeriesMetaInformation(UUID.fromString("c7b0d9d6-5044-4f51-80b4-f221d8b1f14b"), ColumnScheme.ENERGY_PRICE, "its_c_c7b0d9d6-5044-4f51-80b4-f221d8b1f14b"),
89-
(UUID.fromString("085d98ee-09a2-4de4-b119-83949690d7b6")): new CsvIndividualTimeSeriesMetaInformation(UUID.fromString("085d98ee-09a2-4de4-b119-83949690d7b6"), ColumnScheme.WEATHER, "its_weather_085d98ee-09a2-4de4-b119-83949690d7b6")
87+
(UUID.fromString("c7b0d9d6-5044-4f51-80b4-f221d8b1f14b")): new CsvIndividualTimeSeriesMetaInformation(UUID.fromString("c7b0d9d6-5044-4f51-80b4-f221d8b1f14b"), ColumnScheme.ENERGY_PRICE, "its_c_c7b0d9d6-5044-4f51-80b4-f221d8b1f14b")
9088
]
9189

9290
when:

‎src/test/groovy/edu/ie3/datamodel/io/connectors/SqlConnectorIT.groovy‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
package edu.ie3.datamodel.io.connectors
77

8+
import edu.ie3.test.helper.TestContainerHelper
89
import org.testcontainers.containers.PostgreSQLContainer
910
import org.testcontainers.spock.Testcontainers
1011
import org.testcontainers.utility.MountableFile
@@ -14,7 +15,7 @@ import spock.lang.Specification
1415
import java.sql.SQLException
1516

1617
@Testcontainers
17-
class SqlConnectorIT extends Specification {
18+
class SqlConnectorIT extends Specification implements TestContainerHelper {
1819
@Shared
1920
PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer("postgres:14.2")
2021

@@ -23,7 +24,7 @@ class SqlConnectorIT extends Specification {
2324

2425
def setupSpec() {
2526
// Copy sql import script into docker
26-
MountableFile sqlImportFile = MountableFile.forClasspathResource("/testcontainersFiles/sql/connector/connectorTest.sql")
27+
MountableFile sqlImportFile = getMountableFile("_sql/connectorTest.sql")
2728
postgreSQLContainer.copyFileToContainer(sqlImportFile, "/home/connectorTest.sql")
2829
// Execute import script
2930
postgreSQLContainer.execInContainer("psql", "-Utest", "-f/home/connectorTest.sql")

‎src/test/groovy/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSourceCosmoIT.groovy‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import edu.ie3.datamodel.models.timeseries.individual.IndividualTimeSeries
1111
import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue
1212
import edu.ie3.datamodel.models.value.WeatherValue
1313
import edu.ie3.test.common.CosmoWeatherTestData
14+
import edu.ie3.test.helper.TestContainerHelper
1415
import edu.ie3.test.helper.WeatherSourceTestHelper
1516
import edu.ie3.util.TimeUtil
1617
import edu.ie3.util.interval.ClosedInterval
@@ -25,13 +26,14 @@ import spock.lang.Specification
2526
import java.time.ZoneId
2627

2728
@Testcontainers
28-
class CouchbaseWeatherSourceCosmoIT extends Specification implements WeatherSourceTestHelper {
29+
class CouchbaseWeatherSourceCosmoIT extends Specification implements TestContainerHelper, WeatherSourceTestHelper {
2930

3031
@Shared
3132
BucketDefinition bucketDefinition = new BucketDefinition("ie3_in")
3233

3334
@Shared
34-
CouchbaseContainer couchbaseContainer = new CouchbaseContainer("couchbase/server:6.0.2").withBucket(bucketDefinition)
35+
CouchbaseContainer couchbaseContainer = new CouchbaseContainer("couchbase/server:6.0.2")
36+
.withBucket(bucketDefinition)
3537
.withExposedPorts(8091, 8092, 8093, 8094, 11210)
3638

3739
@Shared
@@ -41,8 +43,8 @@ class CouchbaseWeatherSourceCosmoIT extends Specification implements WeatherSour
4143

4244
def setupSpec() {
4345
// Copy import file with json array of documents into docker
44-
MountableFile couchbaseWeatherJsonsFile = MountableFile.forClasspathResource("/testcontainersFiles/couchbase/cosmo/weather.json")
45-
couchbaseContainer.copyFileToContainer(couchbaseWeatherJsonsFile, "/home/weather.json")
46+
MountableFile couchbaseWeatherJsonsFile = getMountableFile("_weather/cosmo/weather.json")
47+
couchbaseContainer.copyFileToContainer(couchbaseWeatherJsonsFile, "/home/weather_cosmo.json")
4648

4749
// create an index for the document keys
4850
couchbaseContainer.execInContainer("cbq",
@@ -59,7 +61,7 @@ class CouchbaseWeatherSourceCosmoIT extends Specification implements WeatherSour
5961
"--password", couchbaseContainer.password,
6062
"--format", "list",
6163
"--generate-key", "weather::%" + coordinateIdColumnName + "%::%time%",
62-
"--dataset", "file:///home/weather.json")
64+
"--dataset", "file:///home/weather_cosmo.json")
6365

6466
def connector = new CouchbaseConnector(couchbaseContainer.connectionString, bucketDefinition.name, couchbaseContainer.username, couchbaseContainer.password)
6567
def dtfPattern = "yyyy-MM-dd'T'HH:mm:ssxxx"

‎src/test/groovy/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSourceIconIT.groovy‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ import edu.ie3.datamodel.io.factory.timeseries.IconTimeBasedWeatherValueFactory
1010
import edu.ie3.datamodel.models.timeseries.individual.IndividualTimeSeries
1111
import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue
1212
import edu.ie3.test.common.IconWeatherTestData
13+
import edu.ie3.test.helper.TestContainerHelper
1314
import edu.ie3.test.helper.WeatherSourceTestHelper
1415
import edu.ie3.util.TimeUtil
1516
import edu.ie3.util.interval.ClosedInterval
1617
import org.testcontainers.couchbase.BucketDefinition
1718
import org.testcontainers.couchbase.CouchbaseContainer
1819
import org.testcontainers.spock.Testcontainers
19-
import org.testcontainers.utility.MountableFile
2020
import spock.lang.Shared
2121
import spock.lang.Specification
2222

2323
import java.time.ZoneId
2424

2525
@Testcontainers
26-
class CouchbaseWeatherSourceIconIT extends Specification implements WeatherSourceTestHelper {
26+
class CouchbaseWeatherSourceIconIT extends Specification implements TestContainerHelper, WeatherSourceTestHelper {
2727

2828
@Shared
2929
BucketDefinition bucketDefinition = new BucketDefinition("ie3_in")
@@ -39,8 +39,8 @@ class CouchbaseWeatherSourceIconIT extends Specification implements WeatherSourc
3939

4040
def setupSpec() {
4141
// Copy import file with json array of documents into docker
42-
def couchbaseWeatherJsonsFile = MountableFile.forClasspathResource("/testcontainersFiles/couchbase/icon/weather.json")
43-
couchbaseContainer.copyFileToContainer(couchbaseWeatherJsonsFile, "/home/weather.json")
42+
def couchbaseWeatherJsonsFile = getMountableFile("_weather/icon/weather.json")
43+
couchbaseContainer.copyFileToContainer(couchbaseWeatherJsonsFile, "/home/weather_icon.json")
4444

4545
// create an index for the document keys
4646
couchbaseContainer.execInContainer("cbq",
@@ -57,7 +57,7 @@ class CouchbaseWeatherSourceIconIT extends Specification implements WeatherSourc
5757
"--password", couchbaseContainer.password,
5858
"--format", "list",
5959
"--generate-key", "weather::%" + coordinateIdColumnName + "%::%time%",
60-
"--dataset", "file:///home/weather.json")
60+
"--dataset", "file:///home/weather_icon.json")
6161

6262
def connector = new CouchbaseConnector(couchbaseContainer.connectionString, bucketDefinition.name, couchbaseContainer.username, couchbaseContainer.password)
6363
def dtfPattern = "yyyy-MM-dd'T'HH:mm:ssxxx"

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,12 @@ class CsvDataSourceTest extends Specification {
6363

6464
@Shared
6565
String csvSep = ","
66-
String testBaseFolderPath = new File(getClass().getResource('/testGridFiles').toURI()).getAbsolutePath()
66+
@Shared
67+
String testBaseFolderPath = "testBaseFolderPath" // does not have to exist for this test
68+
@Shared
6769
FileNamingStrategy fileNamingStrategy = new FileNamingStrategy()
6870

71+
@Shared
6972
DummyCsvSource dummyCsvSource = new DummyCsvSource(csvSep, testBaseFolderPath, fileNamingStrategy)
7073

7174
def "A csv data source is able to find the correct first entity by uuid"() {

‎src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvGraphicSourceTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class CsvGraphicSourceTest extends Specification implements CsvTestDataMeta {
2121
def "A CsvGraphicSource should provide an instance of GraphicElements based on valid input data correctly"() {
2222
given:
2323
def typeSource = new CsvTypeSource(csvSep, typeFolderPath, fileNamingStrategy)
24-
def rawGridSource = new CsvRawGridSource(csvSep, gridFolderPath, fileNamingStrategy, typeSource)
24+
def rawGridSource = new CsvRawGridSource(csvSep, gridDefaultFolderPath, fileNamingStrategy, typeSource)
2525
def csvGraphicSource = new CsvGraphicSource(csvSep, graphicsFolderPath, fileNamingStrategy, typeSource, rawGridSource)
2626

2727
when:
@@ -40,7 +40,7 @@ class CsvGraphicSourceTest extends Specification implements CsvTestDataMeta {
4040
given:
4141
def typeSource = new CsvTypeSource(csvSep, typeFolderPath, fileNamingStrategy)
4242
def rawGridSource =
43-
new CsvRawGridSource(csvSep, gridFolderPath, fileNamingStrategy, typeSource) {
43+
new CsvRawGridSource(csvSep, gridDefaultFolderPath, fileNamingStrategy, typeSource) {
4444
@Override
4545
Set<NodeInput> getNodes() {
4646
return Collections.emptySet()

‎src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvIdCoordinateSourceCosmoIT.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class CsvIdCoordinateSourceCosmoIT extends Specification implements CsvTestDataM
2020
CsvIdCoordinateSource source
2121

2222
def setupSpec() {
23-
source = new CsvIdCoordinateSource(csvSep, coordinatesFolderPath + "_cosmo", fileNamingStrategy, new CosmoIdCoordinateFactory())
23+
source = new CsvIdCoordinateSource(csvSep, coordinatesCosmoFolderPath, fileNamingStrategy, new CosmoIdCoordinateFactory())
2424
}
2525

2626
def "The CsvCoordinateSource is able to create a valid stream from a coordinate file"() {

‎src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvIdCoordinateSourceIconIT.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class CsvIdCoordinateSourceIconIT extends Specification implements CsvTestDataMe
2020
CsvIdCoordinateSource source
2121

2222
def setupSpec() {
23-
source = new CsvIdCoordinateSource(csvSep, coordinatesFolderPath + "_icon", fileNamingStrategy, new IconIdCoordinateFactory())
23+
source = new CsvIdCoordinateSource(csvSep, coordinatesIconFolderPath, fileNamingStrategy, new IconIdCoordinateFactory())
2424
}
2525

2626
def "The CsvCoordinateSource is able to create a valid stream from a coordinate file"() {

‎src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvRawGridSourceTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class CsvRawGridSourceTest extends Specification implements CsvTestDataMeta {
2828

2929
def setupSpec() {
3030
CsvTypeSource typeSource = new CsvTypeSource(csvSep, typeFolderPath, fileNamingStrategy)
31-
source = new CsvRawGridSource(csvSep, gridFolderPath, fileNamingStrategy, typeSource)
31+
source = new CsvRawGridSource(csvSep, gridDefaultFolderPath, fileNamingStrategy, typeSource)
3232
}
3333

3434
def "The CsvRawGridSource is able to convert single valid AssetInputEntityData to ConnectorInputEntityData"() {
@@ -742,7 +742,7 @@ class CsvRawGridSourceTest extends Specification implements CsvTestDataMeta {
742742
def "The CsvRawGridSource returns an empty Optional, if one mandatory element for the RawGridElements is missing"() {
743743
given: "a source pointing to malformed grid data"
744744
CsvTypeSource typeSource = new CsvTypeSource(csvSep, typeFolderPath, fileNamingStrategy)
745-
source = new CsvRawGridSource(csvSep, gridFolderPath + "_malformed", fileNamingStrategy, typeSource)
745+
source = new CsvRawGridSource(csvSep, gridMalformedFolderPath, fileNamingStrategy, typeSource)
746746

747747
when: "loading a total grid structure from file"
748748
def actual = source.getGridData()
@@ -754,7 +754,7 @@ class CsvRawGridSourceTest extends Specification implements CsvTestDataMeta {
754754
def "The CsvRawGridSource returns an empty Optional, if the RawGridElements contain no single element"() {
755755
given: "a source pointing to malformed grid data"
756756
CsvTypeSource typeSource = new CsvTypeSource(csvSep, typeFolderPath, fileNamingStrategy)
757-
source = new CsvRawGridSource(csvSep, gridFolderPath + "_empty", fileNamingStrategy, typeSource)
757+
source = new CsvRawGridSource(csvSep, gridEmptyFolderPath, fileNamingStrategy, typeSource)
758758

759759
when: "loading a total grid structure from file"
760760
def actual = source.getGridData()

0 commit comments

Comments
 (0)