From 491b8247a2e243891ba78f5017777e165d33c3f4 Mon Sep 17 00:00:00 2001
From: Riegel <alexander.riegel@hft-stuttgart.de>
Date: Thu, 12 Dec 2024 12:33:56 +0100
Subject: [PATCH] Test: Move CityGml zip-file validation test
---
.../stuttgart/citydoctor2/zip/ZipTest.java | 14 ------------
.../citydoctor2/check/CheckerTest.java | 22 ++++++++++++++++---
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java
index 2d3b9b4..8c0b41c 100644
--- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java
+++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java
@@ -89,20 +89,6 @@ public class ZipTest {
assertEquals(ZipEntryErrorType.INVALID_CITY_GML_FILE, cgmlArch.getEntry("valFaulty.gml").getErrorType());
}
- @Test
- public void testCityDoctorValidation(){
- CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/mock_archive.zip");
- assertNotNull(cgmlArch);
- cgmlArch.mountArchive(config);
-
- cgmlArch.streamValidateCityGml();
- for (CityGmlZipEntry entry: cgmlArch.getEntries()) {
- assertNotNull(entry);
- assertNotNull(entry.getModel());
- assertTrue(entry.getModel().isValidated());
- assertFalse(entry.getModel().getBuildings().get(0).containsAnyError());
- }
- }
@Test
public void testImplicitParsing(){
diff --git a/CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/check/CheckerTest.java b/CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/check/CheckerTest.java
index 9355b7a..8e2df6a 100644
--- a/CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/check/CheckerTest.java
+++ b/CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/check/CheckerTest.java
@@ -18,12 +18,12 @@
*/
package de.hft.stuttgart.citydoctor2.check;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import java.io.File;
import java.io.IOException;
+import de.hft.stuttgart.citydoctor2.parser.ParserConfiguration;
+import de.hft.stuttgart.citydoctor2.zip.CityGmlZipArchive;
+import de.hft.stuttgart.citydoctor2.zip.CityGmlZipEntry;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -36,6 +36,10 @@ import de.hft.stuttgart.citydoctor2.parser.CityGmlParseException;
import de.hft.stuttgart.citydoctor2.parser.CityGmlParser;
import de.hft.stuttgart.citydoctor2.parser.InvalidGmlFileException;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
*
* @author Matthias Betz
@@ -114,4 +118,16 @@ public class CheckerTest {
f3.delete();
}
}
+
+ @Test
+ public void testZipEntryChecking() throws CityGmlParseException, IOException, InvalidGmlFileException, CityDoctorWriteException {
+ CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zipArchive.zip");
+ assertNotNull(cgmlArch);
+ cgmlArch.mountArchive(new ParserConfiguration(8,false));
+ ValidationConfiguration config = ValidationConfiguration.loadStandardValidationConfig();
+ for (CityGmlZipEntry entry : cgmlArch.getEntries()){
+ Checker.streamCheck(entry, null, null, config, null );
+ }
+ }
+
}
--
GitLab