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 61289f2f497dc11184defc205f5c6fe709bf6854..a92be44fb11856adbda288c41bd7501784fff39e 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 @@ -27,6 +27,7 @@ public class ZipTest { CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/mock_archive.zip"); assertNotNull(cgmlArch); cgmlArch.mountArchive(config); + checkMockArchive(cgmlArch); } @@ -46,15 +47,18 @@ public class ZipTest { CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/mock_archive.zip"); assertNotNull(cgmlArch); cgmlArch.mountArchive(config); + Path tmpDir = null; try { tmpDir = Files.createTempDirectory("testTmp"); tmpDir.toFile().deleteOnExit(); String expPath = tmpDir.toString() + "/export.zip"; + cgmlArch.exportToZipFile(expPath); CityGmlZipArchive cgmlExport = CityGmlZipArchive.register(expPath); assertNotNull(cgmlExport); cgmlExport.mountArchive(config); + checkMockArchive(cgmlExport); } finally { if (tmpDir != null) { @@ -86,6 +90,7 @@ public class ZipTest { CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/validate.zip"); assertNotNull(cgmlArch); cgmlArch.mountArchive(valConfig); + assertNull(cgmlArch.getEntry("valCorrect.gml").getErrorType()); assertEquals(ZipEntryErrorType.INVALID_CITY_GML_FILE, cgmlArch.getEntry("valFaulty.gml").getErrorType()); } @@ -95,6 +100,7 @@ public class ZipTest { CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/implicit.zip"); assertNotNull(cgmlArch); cgmlArch.mountArchive(config); + CityDoctorModel mainModel = cgmlArch.getEntry("Main_model.gml").getModel(); assertEquals(18, mainModel.getGenericCityObjects().size()); }