Exclude update-process for tests #462

hbz · Oct 12, 2023 · 780d575 · 780d575
1 parent bddc3fe
commit 780d575
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/app/transformation/TransformAll.java b/app/transformation/TransformAll.java
@@ -53,15 +53,19 @@ public static void process(final String startOfUpdates,
 		String sigelBulkOutput = outputPath + "-sigelBulk";
 		String sigelUpdatesOutput = outputPath + "-sigelUpdates";		
 		TransformSigel.processBulk(sigelBulkOutput, geoServer, wikidataLookupFilename); //Start processing  Sigel pica binary bulk.
-		TransformSigel.processUpdates(startOfUpdates, sigelUpdatesOutput, geoServer, wikidataLookupFilename); //Start process Sigel Pica XML Updates via OAI-PMH.
-		TransformDbs.process(dbsOutput, geoServer,wikidataLookupFilename); //Start process DBS data.
+		if (startOfUpdates != "") { // exclude updates for the tests, which set startOfUpdates to ""
+			TransformSigel.processUpdates(startOfUpdates, sigelUpdatesOutput, geoServer, wikidataLookupFilename); //Start process Sigel Pica XML Updates via OAI-PMH.
+			}
+		TransformDbs.process(dbsOutput, geoServer,wikidataLookupFilename); //Start process DBS CSV data.
 
 		// DBS-Data, Sigel Bulk and Updates are joined in a single ES-Bulk-file.
 		// DBS data first, so that ES prefers Sigel entries that come later and overwrite DBS entries if available.
 		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
@@ -27,7 +27,7 @@ public abstract class ElasticsearchTest {
 
 	@BeforeClass
 	public static void makeIndex() throws IOException {
-		TransformAll.process("", 0, TransformAll.DATA_OUTPUT_FILE, "", "../test/conf/wikidataLookup.tsv");
+		TransformAll.process("", TransformAll.DATA_OUTPUT_FILE, "", "../test/conf/wikidataLookup.tsv");
 		Index.initialize(TransformAll.DATA_OUTPUT_FILE);
 	}
 

diff --git a/test/transformation/TestTransformAll.java b/test/transformation/TestTransformAll.java
@@ -40,16 +40,14 @@ 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;
 	private static final String wikidataLookupFilename = "../test/conf/wikidataLookup.tsv";
 
 	@BeforeClass
 	public static void setUp() throws IOException {
 		File output = new File(TransformAll.DATA_OUTPUT_FILE);
 		assertThat(!output.exists() || output.delete()).as("no output file")
 				.isTrue();
-		TransformAll.process("", 0, TransformAll.DATA_OUTPUT_FILE, "", wikidataLookupFilename);
+		TransformAll.process("", TransformAll.DATA_OUTPUT_FILE, "", wikidataLookupFilename);
 	}
 
 	@AfterClass
@@ -61,15 +59,15 @@ public static void tearDown() {
 
 	@Test
 	public void multiLangAlternateName() throws IOException {
-		assertThat(new String(
+				assertThat(new String(
 				Files.readAllBytes(Paths.get(TransformAll.DATA_OUTPUT_FILE))))
 						.as("transformation output with multiLangAlternateName")
 						.contains("Leibniz Institute").contains("Berlin SBB");
 	}
 
 	@Test
 	public void separateUrlAndProvidesFields() throws IOException {
-		assertThat(new String(
+				assertThat(new String(
 				Files.readAllBytes(Paths.get(TransformAll.DATA_OUTPUT_FILE))))
 						.as("transformation output with `url` and `provides`")
 						.contains("https://www.livivo.de/?idb=ZBMED")
@@ -78,7 +76,7 @@ public void separateUrlAndProvidesFields() throws IOException {
 
 	@Test
 	public void preferSigelData() throws IOException {
-		assertThat(new String(
+				assertThat(new String(
 				Files.readAllBytes(Paths.get(TransformAll.DATA_OUTPUT_FILE))))
 						.as("transformation output with preferred Sigel data")
 						.contains("Hauptabteilung")//