Test: Streamline testcases

CityDoctorParent/Extensions/CityDoctorZipLoader/src/test/java/de/hft/stuttgart/citydoctor2/ziploader/ZipTest.java

@@ -9,6 +9,8 @@ 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.*;
 
@@ -22,6 +24,10 @@ public class ZipTest {
     @Test
     public void testUnzipping() {
         CityGmlArchive cgmlArch = CityGmlArchive.fromZipFile("src/test/resources/mock_archive.zip", config);
+        checkMockArchive(cgmlArch);
+    }
+
+    private void checkMockArchive(CityGmlArchive cgmlArch){
         assertNotNull(cgmlArch);
         assertEquals(5,cgmlArch.getEntries().size());
         for (CityGmlZipEntry entry : cgmlArch.getEntries()) {
@@ -29,18 +35,10 @@ public class ZipTest {
             assertTrue(entry.getFileName().matches("^mock[1-5].gml$"));
             assertFalse(entry instanceof ErroneousEntry);
             assertNotNull(entry.getModel());
+            assertEquals(1, entry.getModel().getNumberOfFeatures());
         }
     }
 
-    @Test
-    public void testZippingWithFaultyFilepath(){
-        CityGmlArchive cgmlArch = CityGmlArchive.fromZipFile("src/test/resources/mock_archive.zip", config);
-        excRule.expect(IllegalArgumentException.class);
-        excRule.expectMessage("Target zip-filepath must end with '.zip'");
-        cgmlArch.exportToZipFile("src/test/resources/mock");
-    }
-
-
     @Test
     public void testZipping() throws IOException {
         CityGmlArchive cgmlArch = CityGmlArchive.fromZipFile("src/test/resources/mock_archive.zip", config);
@@ -51,14 +49,7 @@ public class ZipTest {
             String expPath = tmpDir.toString() + "/export.zip";
             cgmlArch.exportToZipFile(expPath);
             CityGmlArchive cgmlExport = CityGmlArchive.fromZipFile(expPath, config);
-            assertNotNull(cgmlExport);
-            assertEquals(5, cgmlExport.getEntries().size());
-            for (CityGmlZipEntry entry : cgmlExport.getEntries()) {
-                assertNotNull(entry);
-                assertTrue(entry.getFileName().matches("^mock[1-5].gml$"));
-                assertFalse(entry instanceof ErroneousEntry);
-                assertNotNull(entry.getModel());
-            }
+            checkMockArchive(cgmlExport);
         } catch (Exception e) {
             // Rethrow Exceptions to ensure deletion of tmpDir with finally block
             throw e;