Use first xtf file in testbed as base data

GeoWerkstatt · Dec 6, 2023 · 9df5f36 · 9df5f36
1 parent 3ec9be1
commit 9df5f36
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 12 deletions.
diff --git a/src/main/java/ch/geowerkstatt/interlis/testbed/runner/Runner.java b/src/main/java/ch/geowerkstatt/interlis/testbed/runner/Runner.java
@@ -3,6 +3,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
 public final class Runner {
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -28,7 +32,7 @@ public boolean run() {
         LOGGER.info("Starting validation of testbed at " + options.basePath());
 
         try {
-            if (!validateSuccessfulData()) {
+            if (!validateBaseData()) {
                 LOGGER.error("Validation of base data failed.");
                 return false;
             }
@@ -41,9 +45,20 @@ public boolean run() {
         return true;
     }
 
-    private boolean validateSuccessfulData() throws ValidatorException {
-        var filePath = options.baseDataFilePath();
-        LOGGER.info("Validating base data file " + filePath);
-        return validator.validate(filePath);
+    private boolean validateBaseData() throws ValidatorException {
+        Optional<Path> filePath;
+        try {
+            filePath = options.baseDataFilePath();
+        } catch (IOException e) {
+            throw new ValidatorException(e);
+        }
+
+        if (filePath.isEmpty()) {
+            LOGGER.error("No base data file found.");
+            return false;
+        }
+
+        LOGGER.info("Validating base data file " + filePath.get());
+        return validator.validate(filePath.get());
     }
 }
diff --git a/src/main/java/ch/geowerkstatt/interlis/testbed/runner/TestOptions.java b/src/main/java/ch/geowerkstatt/interlis/testbed/runner/TestOptions.java
@@ -1,9 +1,13 @@
 package ch.geowerkstatt.interlis.testbed.runner;
 
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 public record TestOptions(Path basePath, Path ilivalidatorPath) {
-    private static final String BASE_DATA_FILENAME = "Successful_Data.xtf";
+    private static final String DATA_FILE_EXTENSION = ".xtf";
     private static final String OUTPUT_DIR_NAME = "output";
 
     /**
@@ -21,8 +25,10 @@ public record TestOptions(Path basePath, Path ilivalidatorPath) {
      *
      * @return the path to the base data file.
      */
-    public Path baseDataFilePath() {
-        return basePath.resolve(BASE_DATA_FILENAME);
+    public Optional<Path> baseDataFilePath() throws IOException {
+        try (var dataFiles = findDataFiles(basePath)) {
+            return dataFiles.findFirst();
+        }
     }
 
     /**
@@ -33,4 +39,8 @@ public Path baseDataFilePath() {
     public Path outputPath() {
         return basePath.resolve(OUTPUT_DIR_NAME);
     }
+
+    private static Stream<Path> findDataFiles(Path basePath) throws IOException {
+        return Files.find(basePath, 1, (path, attributes) -> path.getFileName().toString().toLowerCase().endsWith(DATA_FILE_EXTENSION));
+    }
 }
diff --git a/src/test/data/testbed/data.xtf b/src/test/data/testbed/data.xtf
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ili:transfer xmlns:ili="http://www.interlis.ch/xtf/2.4/INTERLIS">
+    <ili:headersection>
+        <ili:models>
+        </ili:models>
+        <ili:sender>interlis-testbed-runner</ili:sender>
+    </ili:headersection>
+    <ili:datasection>
+    </ili:datasection>
+</ili:transfer>
diff --git a/src/test/java/ch/geowerkstatt/interlis/testbed/runner/RunnerTest.java b/src/test/java/ch/geowerkstatt/interlis/testbed/runner/RunnerTest.java
@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +34,7 @@ public void teardown() {
     }
 
     @Test
-    public void runValidatesBaseData() {
+    public void runValidatesBaseData() throws IOException {
         var validatedFiles = new ArrayList<Path>();
 
         var runner = new Runner(options, file -> {
@@ -45,10 +46,12 @@ public void runValidatesBaseData() {
 
         assertTrue(runResult, "Testbed run should have been successful.");
 
-        var baseDataFile = Path.of(BASE_PATH, "Successful_Data.xtf").toAbsolutePath().normalize();
-        assertEquals(baseDataFile, options.baseDataFilePath());
+        var expectedBaseDataFile = Path.of(BASE_PATH, "data.xtf").toAbsolutePath().normalize();
+        var baseDataFile = options.baseDataFilePath();
+        assertFalse(baseDataFile.isEmpty(), "Base data file should have been found.");
+        assertEquals(expectedBaseDataFile, baseDataFile.get());
 
-        var expectedFiles = List.of(baseDataFile);
+        var expectedFiles = List.of(expectedBaseDataFile);
         assertIterableEquals(expectedFiles, validatedFiles);
 
         var errors = appender.getMessages()