From ae6fd45622f739738ee932d3acec89c1f4ac1286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20B=C3=BClte?= Date: Tue, 22 Aug 2023 20:16:39 +0200 Subject: [PATCH] Exclude update-process for tests #462 --- app/transformation/TransformAll.java | 8 ++++++-- test/index/ElasticsearchTest.java | 2 +- test/transformation/TestTransformAll.java | 8 +++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/transformation/TransformAll.java b/app/transformation/TransformAll.java index 4d560cb9..6ae97ed2 100644 --- a/app/transformation/TransformAll.java +++ b/app/transformation/TransformAll.java @@ -52,7 +52,9 @@ public static void process(String startOfUpdates, String sigelBulkOutput = outputPath + "-sigelBulk"; String sigelUpdatesOutput = outputPath + "-sigelUpdates"; TransformSigel.processBulk(sigelBulkOutput, geoServer); //Start processing Sigel pica binary bulk. - TransformSigel.processUpdates(startOfUpdates, sigelUpdatesOutput, geoServer); //Start process Sigel Pica XML Updates via OAI-PMH. + if (startOfUpdates != "") { // exclude updates for the tests, which set startOfUpdates to "" + TransformSigel.processUpdates(startOfUpdates, sigelUpdatesOutput, geoServer); //Start process Sigel Pica XML Updates via OAI-PMH. + } TransformDbs.process(dbsOutput, geoServer); //Start process DBS data. // DBS-Data, Sigel Bulk and Updates are joined in a single ES-Bulk-file. @@ -60,7 +62,9 @@ public static void process(String startOfUpdates, try (FileWriter resultWriter = new FileWriter(outputPath)) { writeAll(dbsOutput, resultWriter); writeAll(sigelBulkOutput, resultWriter); - writeAll(sigelUpdatesOutput, resultWriter); + if (startOfUpdates != "") { // exclude updates for the tests, which set startOfUpdates to "" + writeAll(sigelUpdatesOutput, resultWriter); + } } } diff --git a/test/index/ElasticsearchTest.java b/test/index/ElasticsearchTest.java index 5401baf6..76e93a4b 100644 --- a/test/index/ElasticsearchTest.java +++ b/test/index/ElasticsearchTest.java @@ -27,7 +27,7 @@ public abstract class ElasticsearchTest { @BeforeClass public static void makeIndex() throws IOException { - TransformAll.process("", 0, TransformAll.DATA_OUTPUT_FILE, ""); + TransformAll.process("", TransformAll.DATA_OUTPUT_FILE, ""); Index.initialize(TransformAll.DATA_OUTPUT_FILE); } diff --git a/test/transformation/TestTransformAll.java b/test/transformation/TestTransformAll.java index 6d9098df..462f2c54 100644 --- a/test/transformation/TestTransformAll.java +++ b/test/transformation/TestTransformAll.java @@ -39,8 +39,6 @@ public class TestTransformAll { private static final String SIGEL_DUMP_LOCATION = TransformAll.DATA_INPUT_DIR + "sigel.dat"; - private static final String DUMP_XPATH = - "/" + TransformSigel.DUMP_TOP_LEVEL_TAG + "/" + TransformSigel.XPATH; @BeforeClass public static void setUp() { @@ -58,7 +56,7 @@ public static void tearDown() { @Test public void multiLangAlternateName() throws IOException { - TransformAll.process("", 0, TransformAll.DATA_OUTPUT_FILE, ""); + TransformAll.process("", TransformAll.DATA_OUTPUT_FILE, ""); assertThat(new String( Files.readAllBytes(Paths.get(TransformAll.DATA_OUTPUT_FILE)))) .as("transformation output with multiLangAlternateName") @@ -67,7 +65,7 @@ public void multiLangAlternateName() throws IOException { @Test public void separateUrlAndProvidesFields() throws IOException { - TransformAll.process("", 0, TransformAll.DATA_OUTPUT_FILE, ""); + TransformAll.process("", TransformAll.DATA_OUTPUT_FILE, ""); assertThat(new String( Files.readAllBytes(Paths.get(TransformAll.DATA_OUTPUT_FILE)))) .as("transformation output with `url` and `provides`") @@ -77,7 +75,7 @@ public void separateUrlAndProvidesFields() throws IOException { @Test public void preferSigelData() throws IOException { - TransformAll.process("", 0, TransformAll.DATA_OUTPUT_FILE, ""); + TransformAll.process("", TransformAll.DATA_OUTPUT_FILE, ""); assertThat(new String( Files.readAllBytes(Paths.get(TransformAll.DATA_OUTPUT_FILE)))) .as("transformation output with preferred Sigel data")