diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipArchive.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipArchive.java index 45101fd835432ea81e281de3e6aa64e7dbbab970..6754015bf468301ffdb51cdb9bad1bf6090cf120 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipArchive.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/CityGmlZipArchive.java @@ -97,4 +97,8 @@ public class CityGmlZipArchive implements Serializable { public List<CityGmlZipEntry> getEntries() { return entries; } + + public void streamValidateCityGml() { + return; + } } 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 a92be44fb11856adbda288c41bd7501784fff39e..31e73ee248c9c4fadd390fb9e6c0e0ea7e9b910b 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 @@ -10,8 +10,6 @@ import org.junit.rules.ExpectedException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; import static org.junit.Assert.*; @@ -85,7 +83,7 @@ public class ZipTest { } @Test - public void testValidation(){ + public void testXMLValidation(){ ParserConfiguration valConfig = new ParserConfiguration(8,true); CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/validate.zip"); assertNotNull(cgmlArch); @@ -95,6 +93,21 @@ 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(){ CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/implicit.zip");