Merge pull request #312 from ie3-institute/ms/#141-rename-sub-package…

…-directories-in-test-resources Renaming sub-package directories.
ie3-institute · Aug 16, 2022 · e0a002b · e0a002b
2 parents e798977 + d14c25c
commit e0a002b
Show file tree

Hide file tree

Showing 25 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Adapt test to new PowerSystemUtils snapshot  [#294](https://github.com/ie3-institute/simona/issues/294)
 - Simplified ParticipantConfigUtil [#273](https://github.com/ie3-institute/simona/issues/273)
 - Consolidated and enhanced SimScheduler tests [#285](https://github.com/ie3-institute/simona/issues/285)
+- Renaming sub-package directories [#141](https://github.com/ie3-institute/simona/issues/141)
 
 ### Fixed
 - Location of `vn_simona` test grid (was partially in Berlin and Dortmund) [#72](https://github.com/ie3-institute/simona/issues/72)

diff --git a/src/test/groovy/edu/ie3/simona/model/participant/PVModelIT.groovy b/src/test/groovy/edu/ie3/simona/model/participant/PVModelIT.groovy
@@ -128,7 +128,7 @@ trait PVModelITHelper {
 		"load the grid input data from the corresponding resources folder"
 
 		def csvGridSource = CsvGridSource.readGrid("it_grid", ";",
-				this.getClass().getResource("pv/it/grid_data").file,
+				this.getClass().getResource("_pv/it/grid_data").file,
 				new FileNamingStrategy())
 
 		def simulationStartDate = TimeUtil.withDefaults.toZonedDateTime("2011-01-01 00:00:00")
@@ -165,7 +165,7 @@ trait PVModelITHelper {
 
 	HashMap<ZonedDateTime, HashMap<String, WeatherMessage.WeatherData>> getWeatherData() {
 		"read the weather data from the provided weather data file"
-		final String fileName = "pv/it/weather.tar.gz"
+		final String fileName = "_pv/it/weather.tar.gz"
 		final def csvRecords = getCsvRecords(fileName)
 
 		HashMap<ZonedDateTime, HashMap<String, WeatherMessage.WeatherData>> weatherMap = new HashMap<>()
@@ -203,7 +203,7 @@ trait PVModelITHelper {
 
 	HashMap<ZonedDateTime, HashMap<String, Quantity<Power>>> getResultsData() {
 		"read the results data from the provided file"
-		final String fileName = "pv/it/results2.tar.gz"
+		final String fileName = "_pv/it/results2.tar.gz"
 		def csvRecords = getCsvRecords(fileName)
 
 		// we skip the first line and use hardcoded headers, because the first line is garbled

diff --git a/...articipant/pv/it/grid_data/node_input.csv → ...rticipant/_pv/it/grid_data/node_input.csv b/...articipant/pv/it/grid_data/node_input.csv → ...rticipant/_pv/it/grid_data/node_input.csv
diff --git a/.../participant/pv/it/grid_data/pv_input.csv → ...participant/_pv/it/grid_data/pv_input.csv b/.../participant/pv/it/grid_data/pv_input.csv → ...participant/_pv/it/grid_data/pv_input.csv
diff --git a/...a/model/participant/pv/it/results2.tar.gz → .../model/participant/_pv/it/results2.tar.gz b/...a/model/participant/pv/it/results2.tar.gz → .../model/participant/_pv/it/results2.tar.gz
diff --git a/...na/model/participant/pv/it/weather.tar.gz → ...a/model/participant/_pv/it/weather.tar.gz b/...na/model/participant/pv/it/weather.tar.gz → ...a/model/participant/_pv/it/weather.tar.gz
diff --git a/..._9185b8c1-86ba-4a16-8dea-5ac898e8caa5.csv → ..._9185b8c1-86ba-4a16-8dea-5ac898e8caa5.csv b/..._9185b8c1-86ba-4a16-8dea-5ac898e8caa5.csv → ..._9185b8c1-86ba-4a16-8dea-5ac898e8caa5.csv
diff --git a/..._3fbfaa97-cff4-46d4-95ba-a95665e87c26.csv → ..._3fbfaa97-cff4-46d4-95ba-a95665e87c26.csv b/..._3fbfaa97-cff4-46d4-95ba-a95665e87c26.csv → ..._3fbfaa97-cff4-46d4-95ba-a95665e87c26.csv
diff --git a/...ervice/primary/it/time_series_mapping.csv → ...rvice/primary/_it/time_series_mapping.csv b/...ervice/primary/it/time_series_mapping.csv → ...rvice/primary/_it/time_series_mapping.csv
diff --git a/...rimary/timeseries/time_series_mapping.sql → ...imary/_timeseries/time_series_mapping.sql b/...rimary/timeseries/time_series_mapping.sql → ...imary/_timeseries/time_series_mapping.sql
diff --git a/...vice/primary/timeseries/time_series_p.sql → ...ice/primary/_timeseries/time_series_p.sql b/...vice/primary/timeseries/time_series_p.sql → ...ice/primary/_timeseries/time_series_p.sql
diff --git a/...ce/primary/timeseries/time_series_pqh.sql → ...e/primary/_timeseries/time_series_pqh.sql b/...ce/primary/timeseries/time_series_pqh.sql → ...e/primary/_timeseries/time_series_pqh.sql
diff --git a/.../setup/ext-sim-loader/jars/irrelevant.txt → ...setup/ext-sim-loader/_jars/irrelevant.txt b/.../setup/ext-sim-loader/jars/irrelevant.txt → ...setup/ext-sim-loader/_jars/irrelevant.txt
diff --git a/...up/ext-sim-loader/jars/mock_ext_sim-2.jar → ...p/ext-sim-loader/_jars/mock_ext_sim-2.jar b/...up/ext-sim-loader/jars/mock_ext_sim-2.jar → ...p/ext-sim-loader/_jars/mock_ext_sim-2.jar
diff --git a/...m-loader/jars/mock_ext_sim-empty_file.jar → ...-loader/_jars/mock_ext_sim-empty_file.jar b/...m-loader/jars/mock_ext_sim-empty_file.jar → ...-loader/_jars/mock_ext_sim-empty_file.jar
diff --git a/...ars/mock_ext_sim-missing_service_file.jar → ...ars/mock_ext_sim-missing_service_file.jar b/...ars/mock_ext_sim-missing_service_file.jar → ...ars/mock_ext_sim-missing_service_file.jar
diff --git a/...jars/mock_ext_sim-two_implementations.jar → ...jars/mock_ext_sim-two_implementations.jar b/...jars/mock_ext_sim-two_implementations.jar → ...jars/mock_ext_sim-two_implementations.jar
diff --git a/...ars/mock_ext_sim-wrong_implementation.jar → ...ars/mock_ext_sim-wrong_implementation.jar b/...ars/mock_ext_sim-wrong_implementation.jar → ...ars/mock_ext_sim-wrong_implementation.jar
diff --git a/...etup/ext-sim-loader/jars/mock_ext_sim.jar → ...tup/ext-sim-loader/_jars/mock_ext_sim.jar b/...etup/ext-sim-loader/jars/mock_ext_sim.jar → ...tup/ext-sim-loader/_jars/mock_ext_sim.jar
diff --git a/...tup/ext-sim-loader/no-jars/irrelevant.txt → ...up/ext-sim-loader/_no-jars/irrelevant.txt b/...tup/ext-sim-loader/no-jars/irrelevant.txt → ...up/ext-sim-loader/_no-jars/irrelevant.txt
diff --git a/src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceProxySpec.scala b/src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceProxySpec.scala
@@ -80,7 +80,7 @@ class PrimaryServiceProxySpec
     .get(
       this.getClass
         .getResource(
-          "it"
+          "_it"
         )
         .toURI
     )

diff --git a/src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceProxySqlIT.scala b/src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceProxySqlIT.scala
@@ -60,7 +60,7 @@ class PrimaryServiceProxySqlIT
 
   override protected def beforeAll(): Unit = {
     // Copy sql import scripts into docker
-    val sqlImportFile = getMountableFile("timeseries/")
+    val sqlImportFile = getMountableFile("_timeseries/")
     container.copyFileToContainer(sqlImportFile, "/home/")
 
     Iterable(

diff --git a/src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceWorkerSpec.scala b/src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceWorkerSpec.scala
@@ -64,7 +64,7 @@ class PrimaryServiceWorkerSpec
     .get(
       this.getClass
         .getResource(
-          "it"
+          "_it"
         )
         .toURI
     )

diff --git a/src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceWorkerSqlIT.scala b/src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceWorkerSqlIT.scala
@@ -68,7 +68,7 @@ class PrimaryServiceWorkerSqlIT
 
   override protected def beforeAll(): Unit = {
     // Copy sql import scripts into docker
-    val sqlImportFile = getMountableFile("timeseries/")
+    val sqlImportFile = getMountableFile("_timeseries/")
     container.copyFileToContainer(sqlImportFile, "/home/")
 
     Iterable("time_series_p.sql", "time_series_pqh.sql")

diff --git a/src/test/scala/edu/ie3/simona/sim/setup/ExtSimLoaderSpec.scala b/src/test/scala/edu/ie3/simona/sim/setup/ExtSimLoaderSpec.scala
@@ -16,8 +16,8 @@ class ExtSimLoaderSpec extends UnitSpec {
 
   private val resourceDir = "ext-sim-loader"
 
-  private val noJarsDir = s"$resourceDir/no-jars"
-  private val jarsDir = s"$resourceDir/jars"
+  private val noJarsDir = s"$resourceDir/_no-jars"
+  private val jarsDir = s"$resourceDir/_jars"
 
   private val workingJar = s"$jarsDir/mock_ext_sim.jar"
   private val workingJar2 = s"$jarsDir/mock_ext_sim-2.jar"
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,7 +80,7 @@ class PrimaryServiceProxySpec @@
         .get(
           this.getClass
             .getResource(
-              "it"
+              "_it"
             )
             .toURI
         )
@@ Expand Down @@