[Ili2pgValidate] Add another integration test

sogis · Mar 13, 2024 · 9d39097 · 9d39097
1 parent 67c550d
commit 9d39097
Show file tree

Hide file tree

Showing 11 changed files with 737 additions and 4 deletions.
diff --git a/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/Ili2pgValidateDatasetTest.java b/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/Ili2pgValidateDatasetTest.java
@@ -29,13 +29,24 @@ public class Ili2pgValidateDatasetTest {
         .waitingFor(Wait.forLogMessage(WAIT_PATTERN, 2));
 
     @Test
-    public void validateData_Ok() throws Exception {
+    public void validateSingleDataset_Ok() throws Exception {
         // Run task
         GradleVariable[] gvs = {GradleVariable.newGradleProperty(IntegrationTestUtilSql.VARNAME_PG_CON_URI, postgres.getJdbcUrl())};
-        IntegrationTestUtil.runJob("src/integrationTest/jobs/Ili2pgValidateDataset", gvs);
+        IntegrationTestUtil.runJob("src/integrationTest/jobs/Ili2pgValidateSingleDataset", gvs);
 
         // Check result
-        String logFileContent = new String(Files.readAllBytes(Paths.get("src/integrationTest/jobs/Ili2pgValidateDataset/validation.log")));
+        String logFileContent = new String(Files.readAllBytes(Paths.get("src/integrationTest/jobs/Ili2pgValidateSingleDataset/validation.log")));
+        assertTrue(logFileContent.contains("Info: ...validate done"));        
+    }
+
+    @Test
+    public void validateMultipleDataset_Ok() throws Exception {
+        // Run task
+        GradleVariable[] gvs = {GradleVariable.newGradleProperty(IntegrationTestUtilSql.VARNAME_PG_CON_URI, postgres.getJdbcUrl())};
+        IntegrationTestUtil.runJob("src/integrationTest/jobs/Ili2pgValidateMultipleDatasets", gvs);
+
+        // Check result
+        String logFileContent = new String(Files.readAllBytes(Paths.get("src/integrationTest/jobs/Ili2pgValidateMultipleDatasets/validation.log")));
         assertTrue(logFileContent.contains("Info: ...validate done"));        
     }
 

diff --git a/...est/jobs/Ili2pgValidateDataset/.gitignore → ...Ili2pgValidateMultipleDatasets/.gitignore b/...est/jobs/Ili2pgValidateDataset/.gitignore → ...Ili2pgValidateMultipleDatasets/.gitignore
diff --git a/...eDataset/SO_AFU_Schutzbauten_20231212.ili → ...Datasets/SO_AFU_Schutzbauten_20231212.ili b/...eDataset/SO_AFU_Schutzbauten_20231212.ili → ...Datasets/SO_AFU_Schutzbauten_20231212.ili
diff --git a/...t/jobs/Ili2pgValidateDataset/build.gradle → ...i2pgValidateMultipleDatasets/build.gradle b/...t/jobs/Ili2pgValidateDataset/build.gradle → ...i2pgValidateMultipleDatasets/build.gradle
@@ -7,7 +7,7 @@ def db_uri = findProperty(GRETLTEST_DBURI) != null ? findProperty(GRETLTEST_DBUR
 
 def db_user = "ddluser"
 def db_pass = "ddluser"
-def db_schema = "afu_schutzbauten_v1"
+def db_schema = "afu_schutzbauten_v1_multi"
 
 defaultTasks 'validate'
 
@@ -57,6 +57,7 @@ tasks.register('validate', Ili2pgValidate) {
     database = [db_uri, db_user, db_pass]
     modeldir = rootProject.projectDir.toString() + ";http://models.interlis.ch"
     dbschema = db_schema
+    // Prüfe mit einer Liste von Datasets
     dataset = ["agi.testeinzelobjekt1", "agi.testeinzelobjekt2"]
     logFile = file("validation.log")
 }

diff --git a/...aset/ch.so.agi.testeinzelobjekt_valid.xtf → ...sets/ch.so.agi.testeinzelobjekt_valid.xtf b/...aset/ch.so.agi.testeinzelobjekt_valid.xtf → ...sets/ch.so.agi.testeinzelobjekt_valid.xtf
diff --git a/...obs/Ili2pgValidateDataset/settings.gradle → ...gValidateMultipleDatasets/settings.gradle b/...obs/Ili2pgValidateDataset/settings.gradle → ...gValidateMultipleDatasets/settings.gradle
diff --git a/gretl/src/integrationTest/jobs/Ili2pgValidateSingleDataset/.gitignore b/gretl/src/integrationTest/jobs/Ili2pgValidateSingleDataset/.gitignore
@@ -0,0 +1 @@
+*.log