Merge pull request #13760 from SORMAS-Foundation/bugfix-history_tables_test

Fixed issue with history tables test

Author: raulbob

sormas-backend/src/test/java/de/symeda/sormas/backend/common/HistoryTablesTest.java

@@ -12,10 +12,14 @@
 import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
@@ -27,25 +31,28 @@
 import org.testcontainers.containers.JdbcDatabaseContainer;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.images.builder.ImageFromDockerfile;
-import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
 
 import de.hilling.junit.cdi.CdiTestJunitExtension;
 import de.hilling.junit.cdi.annotations.BypassTestInterceptor;
 import de.symeda.sormas.backend.adverseeventsfollowingimmunization.entity.Aefi;
 import de.symeda.sormas.backend.adverseeventsfollowingimmunization.entity.AefiInvestigation;
 import de.symeda.sormas.backend.epipulse.EpipulseDatasourceConfiguration;
+import de.symeda.sormas.backend.epipulse.EpipulseExport;
 import de.symeda.sormas.backend.epipulse.EpipulseLocationConfiguration;
 import de.symeda.sormas.backend.epipulse.EpipulseSubjectcodeConfiguration;
 
 @ExtendWith(CdiTestJunitExtension.class)
 public class HistoryTablesTest {
 
-	private static final List<String> NO_HISTORY_REQUIRED_TABLES = Arrays.asList(
-		Aefi.AEFI_VACCINATIONS_TABLE_NAME,
-		AefiInvestigation.AEFI_INVESTIGATION_VACCINATIONS_TABLE_NAME,
-		EpipulseSubjectcodeConfiguration.TABLE_NAME,
-		EpipulseDatasourceConfiguration.TABLE_NAME,
-		EpipulseLocationConfiguration.TABLE_NAME);
+	private static final Set<String> NO_HISTORY_REQUIRED_TABLES = Collections.unmodifiableSet(
+		new HashSet<>(
+			Arrays.asList(
+				Aefi.AEFI_VACCINATIONS_TABLE_NAME,
+				AefiInvestigation.AEFI_INVESTIGATION_VACCINATIONS_TABLE_NAME,
+				EpipulseSubjectcodeConfiguration.TABLE_NAME,
+				EpipulseDatasourceConfiguration.TABLE_NAME,
+				EpipulseLocationConfiguration.TABLE_NAME,
+				EpipulseExport.TABLE_NAME)));
 
 	/**
 	 * Test that the *_history tables have the same columns as the corresponding production tables
@@ -84,7 +91,7 @@ public void testHistoryTablesMatch() throws IOException, URISyntaxException {
 			Files.readAllBytes(Paths.get(Objects.requireNonNull(getClass().getClassLoader().getResource("checkHistoryTables.sql")).toURI())));
 		@SuppressWarnings("unchecked")
 		List<Object[]> results = (List<Object[]>) em.createNativeQuery(checkHistoryTablesSql).getResultList();
-		results.removeIf(o -> StringUtils.containsAny(o[1].toString(), NO_HISTORY_REQUIRED_TABLES.toArray(String[]::new)));
+		results = results.stream().filter(objects -> !NO_HISTORY_REQUIRED_TABLES.contains(objects[1].toString())).collect(Collectors.toList());
 		StringBuilder result = new StringBuilder();
 		results.forEach(objects -> {
 			result.append("\n");