Commit 16c892e1 authored by Riegel's avatar Riegel
Browse files

Style: Insert line breaks

2 merge requests!28Version 3.17.0 Release,!26Add ZIP-archive support
Pipeline #10508 passed with stage
in 2 minutes and 13 seconds
Showing with 6 additions and 0 deletions
+6 -0
...@@ -27,6 +27,7 @@ public class ZipTest { ...@@ -27,6 +27,7 @@ public class ZipTest {
CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/mock_archive.zip"); CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/mock_archive.zip");
assertNotNull(cgmlArch); assertNotNull(cgmlArch);
cgmlArch.mountArchive(config); cgmlArch.mountArchive(config);
checkMockArchive(cgmlArch); checkMockArchive(cgmlArch);
} }
...@@ -46,15 +47,18 @@ public class ZipTest { ...@@ -46,15 +47,18 @@ public class ZipTest {
CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/mock_archive.zip"); CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/mock_archive.zip");
assertNotNull(cgmlArch); assertNotNull(cgmlArch);
cgmlArch.mountArchive(config); cgmlArch.mountArchive(config);
Path tmpDir = null; Path tmpDir = null;
try { try {
tmpDir = Files.createTempDirectory("testTmp"); tmpDir = Files.createTempDirectory("testTmp");
tmpDir.toFile().deleteOnExit(); tmpDir.toFile().deleteOnExit();
String expPath = tmpDir.toString() + "/export.zip"; String expPath = tmpDir.toString() + "/export.zip";
cgmlArch.exportToZipFile(expPath); cgmlArch.exportToZipFile(expPath);
CityGmlZipArchive cgmlExport = CityGmlZipArchive.register(expPath); CityGmlZipArchive cgmlExport = CityGmlZipArchive.register(expPath);
assertNotNull(cgmlExport); assertNotNull(cgmlExport);
cgmlExport.mountArchive(config); cgmlExport.mountArchive(config);
checkMockArchive(cgmlExport); checkMockArchive(cgmlExport);
} finally { } finally {
if (tmpDir != null) { if (tmpDir != null) {
...@@ -86,6 +90,7 @@ public class ZipTest { ...@@ -86,6 +90,7 @@ public class ZipTest {
CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/validate.zip"); CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/validate.zip");
assertNotNull(cgmlArch); assertNotNull(cgmlArch);
cgmlArch.mountArchive(valConfig); cgmlArch.mountArchive(valConfig);
assertNull(cgmlArch.getEntry("valCorrect.gml").getErrorType()); assertNull(cgmlArch.getEntry("valCorrect.gml").getErrorType());
assertEquals(ZipEntryErrorType.INVALID_CITY_GML_FILE, cgmlArch.getEntry("valFaulty.gml").getErrorType()); assertEquals(ZipEntryErrorType.INVALID_CITY_GML_FILE, cgmlArch.getEntry("valFaulty.gml").getErrorType());
} }
...@@ -95,6 +100,7 @@ public class ZipTest { ...@@ -95,6 +100,7 @@ public class ZipTest {
CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/implicit.zip"); CityGmlZipArchive cgmlArch = CityGmlZipArchive.register("src/test/resources/zip/implicit.zip");
assertNotNull(cgmlArch); assertNotNull(cgmlArch);
cgmlArch.mountArchive(config); cgmlArch.mountArchive(config);
CityDoctorModel mainModel = cgmlArch.getEntry("Main_model.gml").getModel(); CityDoctorModel mainModel = cgmlArch.getEntry("Main_model.gml").getModel();
assertEquals(18, mainModel.getGenericCityObjects().size()); assertEquals(18, mainModel.getGenericCityObjects().size());
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment