Fix: Fix test failures

CityDoctorParent/CityDoctorEdge/src/test/java/de/hft/stuttgart/citydoctor2/edge/MeshSurfaceUtilsTest.java

@@ -1259,7 +1259,7 @@ public class MeshSurfaceUtilsTest {
 	public void testKaiserwallComplexBuilding() throws CityGmlParseException, InvalidGmlFileException {
 		ParserConfiguration config = new ParserConfiguration(8, false);
 		CityDoctorModel model = CityGmlParser.parseCityGmlFile("src/test/resources/KaiserwallComplexBuilding.gml", config);
-		Building building = model.getBuildings().get(0);
+		Building building = model.getBuildings().toList().get(0);
 		Geometry geom = building.getBuildingInstallations().get(0).getGeometries().get(0);
 		assertNotNull(geom);
 		MeshSurface surface = MeshSurface.of(geom);

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/database/CacheManager.java

 package de.hft.stuttgart.citydoctor2.database;
 
+import org.apache.commons.io.FilenameUtils;
+
+import java.io.File;
+
 public class CacheManager {
 
     private static FeatureCache cache = null;
 
-    public static CityObjectCache getFeatureCache(String filename) {
+    private CacheManager() {}
+
+    public static FeatureCache getFeatureCache(File file) {
+        if (file == null){
+            throw new IllegalArgumentException("File is null");
+        }
+        String filename = FilenameUtils.removeExtension(file.getName());
         if (cache == null){
             cache = new FeatureCache(filename);
         } else {
@@ -13,7 +23,7 @@ public class CacheManager {
         return cache;
     }
 
-    public static CityObjectCache getUnconnectedCache(){
+    public static UnconnectedCache getUnconnectedCache(){
         return new UnconnectedCache();
     }
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/datastructure/CityDoctorModel.java

@@ -69,7 +69,7 @@ public class CityDoctorModel {
     private final CityObjectCache cache;
 
     public CityDoctorModel(ParserConfiguration config, File file) {
-        this(config, file, CacheManager.getFeatureCache(FilenameUtils.removeExtension(file.getName())));
+        this(config, file, CacheManager.getFeatureCache(file));
     }
 
     public CityDoctorModel(ParserConfiguration config, File file, CityObjectCache cache) {
@@ -244,6 +244,18 @@ public class CityDoctorModel {
         cache.put(coBuilding);
     }
 
+    public void removeFeature(GmlId id){
+        buildings.remove(id);
+        vegetation.remove(id);
+        bridges.remove(id);
+        land.remove(id);
+        roads.remove(id);
+        tunnels.remove(id);
+        water.remove(id);
+        cityfurniture.remove(id);
+        genericObjects.remove(id);
+    }
+
     public Stream<Building> getBuildings() {
         return buildings.stream().map(co -> (Building) cache.get(co));
     }
@@ -459,6 +471,7 @@ public class CityDoctorModel {
         if (index == -1) {
             throw new IllegalStateException(COULD_NOT_FIND_FEATURE + currentFeature + " in transportation objects");
         }
+        cache.replace(currentFeature.getGmlId(), nextFeature);
         roads.set(index, nextFeature.getGmlId());
     }
 
@@ -467,6 +480,7 @@ public class CityDoctorModel {
         if (index == -1) {
             throw new IllegalStateException(COULD_NOT_FIND_FEATURE + currentFeature + " in tunnels");
         }
+        cache.replace(currentFeature.getGmlId(), nextFeature);
         tunnels.set(index, nextFeature.getGmlId());
     }
 
@@ -475,6 +489,7 @@ public class CityDoctorModel {
         if (index == -1) {
             throw new IllegalStateException(COULD_NOT_FIND_FEATURE + currentFeature + " in bridges");
         }
+        cache.replace(currentFeature.getGmlId(), nextFeature);
         bridges.set(index, nextFeature.getGmlId());
     }
 
@@ -483,6 +498,7 @@ public class CityDoctorModel {
         if (index == -1) {
             throw new IllegalStateException(COULD_NOT_FIND_FEATURE + currentFeature + " in buildings");
         }
+        cache.replace(currentFeature.getGmlId(), nextFeature);
         buildings.set(index, nextFeature.getGmlId());
     }
 

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/parser/CityGmlParser.java

@@ -45,6 +45,7 @@ import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
+import de.hft.stuttgart.citydoctor2.datastructure.GmlId;
 import de.hft.stuttgart.citydoctor2.datastructure.ImplicitGeometryHolder;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
@@ -842,8 +843,13 @@ public class CityGmlParser {
     }
 
     private static void drainCityModel(CityDoctorModel model, CityGmlConsumer cityObjectConsumer) {
+        List<GmlId> id = new ArrayList<>();
+        model.createFeatureStream().forEach(co -> {
+            cityObjectConsumer.accept(co);
+            id.add(co.getGmlId());
+        });
+        id.forEach(model::removeFeature);
 
-        model.createFeatureStream().forEach(cityObjectConsumer::accept);
     }
 
 

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/check/FilterTest.java

@@ -45,12 +45,12 @@ public class FilterTest {
 		Checker c = new Checker(config, model);
 		c.runChecks();
 
-		Building b = model.getBuildings().get(0);
+		Building b = model.getBuildings().toList().get(0);
 		Geometry geom = b.getGeometries().get(0);
 
 		assertFalse(geom.hasCheckResults());
 
-		TransportationObject to = model.getTransportation().get(0);
+		TransportationObject to = model.getTransportation().toList().get(0);
 		Geometry geom2 = to.getGeometries().get(0);
 
 		assertTrue(geom2.getPolygons().get(0).hasCheckResults());
@@ -65,12 +65,12 @@ public class FilterTest {
 		Checker c = new Checker(config, model);
 		c.runChecks();
 
-		Building b = model.getBuildings().get(0);
+		Building b = model.getBuildings().toList().get(0);
 		Geometry geom = b.getGeometries().get(0);
 
 		assertFalse(geom.hasCheckResults());
 
-		TransportationObject to = model.getTransportation().get(0);
+		TransportationObject to = model.getTransportation().toList().get(0);
 		Geometry geom2 = to.getGeometries().get(0);
 
 		assertTrue(geom2.getPolygons().get(0).hasCheckResults());

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/SolidSelfIntCheckFalsePositiveBigMeshTest.java

@@ -35,7 +35,7 @@ public class SolidSelfIntCheckFalsePositiveBigMeshTest {
 		CityDoctorModel m = CityGmlParser.parseCityGmlFile(gml_filepath, config.getParserConfiguration());
 		Checker c = new Checker(config, m);
 		c.runChecks();
-		Building building = m.getBuildings().get(0);
+		Building building = m.getBuildings().toList().get(0);
 		/*
 		 *  The examples have no actual self-intersections, but can contain other actual model defects.
 		 *  If an error is detected, it is thus required to check if the

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/checks/geometry/SolidSelfIntCheckTest.java

@@ -75,7 +75,7 @@ public class SolidSelfIntCheckTest {
 		CityDoctorModel m = CityGmlParser.parseCityGmlFile("src/test/resources/SolidSelfIntTest1.gml", config.getParserConfiguration());
 		Checker c = new Checker(config, m);
 		c.runChecks();
-		assertFalse(m.getBuildings().get(0).containsAnyError());
+		assertFalse(m.getBuildings().toList().get(0).containsAnyError());
 	}
 	
 	
@@ -85,7 +85,7 @@ public class SolidSelfIntCheckTest {
 		CityDoctorModel m = CityGmlParser.parseCityGmlFile(gml_filepath, config.getParserConfiguration());
 		Checker c = new Checker(config, m);
 		c.runChecks();
-		Building building = m.getBuildings().get(0);
+		Building building = m.getBuildings().toList().get(0);
 		/*
 		 *  The examples have no actual self-intersections, but can contain other actual model defects.
 		 *  If an error is detected, it is thus required to check if the

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/AllPolygonWrongOrientedTest.java

@@ -48,7 +48,7 @@ public class AllPolygonWrongOrientedTest {
 		Checker c = new Checker(config, model);
 		c.runChecks();
 		
-		Building b = model.getBuildings().get(0);
+		Building b = model.getBuildings().toList().get(0);
 		
 		assertFalse(b.containsError(CheckId.C_GE_S_ALL_POLYGONS_WRONG_ORIENTATION));
 	}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/ConCompCheckTest.java

@@ -51,7 +51,7 @@ public class ConCompCheckTest extends TestCleanUp {
 		Checker c = new Checker(m);
 		c.runChecks();
 		
-		Geometry geom = m.getBuildings().get(0).getGeometries().get(0);
+		Geometry geom = m.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = geom.getCheckResult(CheckId.C_GE_S_MULTIPLE_CONNECTED_COMPONENTS);
 		assertNotNull(cr);
 		assertEquals(ResultStatus.ERROR, cr.getResultStatus());
@@ -65,7 +65,7 @@ public class ConCompCheckTest extends TestCleanUp {
 		Checker c = new Checker(m);
 		c.runChecks();
 
-		Geometry geom = m.getBuildings().get(0).getGeometries().get(0);
+		Geometry geom = m.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = geom.getCheckResult(CheckId.C_GE_S_MULTIPLE_CONNECTED_COMPONENTS);
 		assertNotNull(cr);
 		assertEquals(ResultStatus.ERROR, cr.getResultStatus());

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/DupPointsCheckTest.java

@@ -79,7 +79,7 @@ public class DupPointsCheckTest {
 	@Test
 	public void testDupPoints3() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel m = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml");
-		for (Polygon p : m.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : m.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			LinearRing r = p.getExteriorRing();
 			CheckResult cr = r.getCheckResult(CheckId.C_GE_R_DUPLICATE_POINT);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/HoleOutsideSystemTest.java

@@ -43,7 +43,7 @@ public class HoleOutsideSystemTest {
 	@Test
 	public void testHoleOutside1() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-PO-0001-T0002.gml");
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			CheckResult cr = p.getCheckResult(CheckId.C_GE_P_HOLE_OUTSIDE);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());
 		}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/InnerRingsNestedSystemTest.java

@@ -43,7 +43,7 @@ public class InnerRingsNestedSystemTest {
 	@Test
 	public void innerRingsNested1() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-PO-0001-T0002.gml");
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			CheckResult cr = p.getCheckResult(CheckId.C_GE_P_INNER_RINGS_NESTED);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());
 		}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/InteriorDisconnectedSystemTest.java

@@ -43,7 +43,7 @@ public class InteriorDisconnectedSystemTest {
 	@Test
 	public void testInteriorDisconnected1() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-PO-0001-T0002.gml");
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			CheckResult cr = p.getCheckResult(CheckId.C_GE_P_INTERIOR_DISCONNECTED);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());
 		}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/MultipleComponentTest.java

@@ -43,7 +43,7 @@ public class MultipleComponentTest {
 	@Test
 	public void testNoMultipleComponents() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml");
-		Geometry g = c.getBuildings().get(0).getGeometries().get(0);
+		Geometry g = c.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = g.getCheckResult(CheckId.C_GE_S_MULTIPLE_CONNECTED_COMPONENTS);
 		assertEquals(ResultStatus.OK, cr.getResultStatus());
 	}
@@ -51,7 +51,7 @@ public class MultipleComponentTest {
 	@Test
 	public void testMultipleComponents() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-SO-0005-T0001.gml");
-		Geometry g = c.getBuildings().get(0).getGeometries().get(0);
+		Geometry g = c.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = g.getCheckResult(CheckId.C_GE_S_MULTIPLE_CONNECTED_COMPONENTS);
 		assertEquals(ResultStatus.ERROR, cr.getResultStatus());
 		assertEquals(ErrorId.GE_S_MULTIPLE_CONNECTED_COMPONENTS, cr.getError().getErrorId());

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/NonManifoldEdgeSystemTest.java

@@ -46,7 +46,7 @@ public class NonManifoldEdgeSystemTest {
 	@Test
 	public void testNonManifoldEdge1() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml");
-		Geometry g = c.getBuildings().get(0).getGeometries().get(0);
+		Geometry g = c.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = g.getCheckResult(CheckId.C_GE_S_NON_MANIFOLD_EDGE);
 		assertEquals(ResultStatus.OK, cr.getResultStatus());
 	}
@@ -59,7 +59,7 @@ public class NonManifoldEdgeSystemTest {
 		paramMap.put(RequirementId.R_GE_P_NON_PLANAR.toString(), parameter);
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-SO-0004-T0001.gml",
 				paramMap);
-		Geometry g = c.getBuildings().get(0).getGeometries().get(0);
+		Geometry g = c.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = g.getCheckResult(CheckId.C_GE_S_NON_MANIFOLD_EDGE);
 		assertEquals(ResultStatus.ERROR, cr.getResultStatus());
 		assertEquals(ErrorId.GE_S_NON_MANIFOLD_EDGE, cr.getError().getErrorId());

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/NonManifoldVertexSystemTest.java

@@ -43,7 +43,7 @@ public class NonManifoldVertexSystemTest {
 	@Test
 	public void testNonManifoldVertex1() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml");
-		Geometry g = c.getBuildings().get(0).getGeometries().get(0);
+		Geometry g = c.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = g.getCheckResult(CheckId.C_GE_S_NON_MANIFOLD_VERTEX);
 		assertEquals(ResultStatus.OK, cr.getResultStatus());
 	}
@@ -51,7 +51,7 @@ public class NonManifoldVertexSystemTest {
 	@Test
 	public void testNonManifoldVertex2() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-SO-0003-T0001.gml");
-		Geometry g = c.getBuildings().get(0).getGeometries().get(0);
+		Geometry g = c.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = g.getCheckResult(CheckId.C_GE_S_NON_MANIFOLD_VERTEX);
 		assertEquals(ResultStatus.ERROR, cr.getResultStatus());
 		assertEquals(ErrorId.GE_S_NON_MANIFOLD_VERTEX, cr.getError().getErrorId());

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/NumPointsCheckTest.java

@@ -80,7 +80,7 @@ public class NumPointsCheckTest {
 	public void testNumPoints3() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS.gml");
 
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			LinearRing r = p.getExteriorRing();
 			assertEquals(ResultStatus.OK, r.getCheckResult(CheckId.C_GE_R_TOO_FEW_POINTS).getResultStatus());
 		}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/OrientationSameSystemTest.java

@@ -43,7 +43,7 @@ public class OrientationSameSystemTest {
 	@Test
 	public void testOrientationSame1() throws CityGmlParseException, IOException, InvalidGmlFileException {
 		CityDoctorModel c = TestUtil.loadAndCheckCityModel("src/test/resources/SimpleSolid_SrefBS-GE-gml-PO-0001-T0002.gml");
-		for (Polygon p : c.getBuildings().get(0).getGeometries().get(0).getPolygons()) {
+		for (Polygon p : c.getBuildings().toList().get(0).getGeometries().get(0).getPolygons()) {
 			CheckResult cr = p.getCheckResult(CheckId.C_GE_P_ORIENTATION_RINGS_SAME);
 			assertEquals(ResultStatus.OK, cr.getResultStatus());
 		}

CityDoctorParent/CityDoctorValidation/src/test/java/de/hft/stuttgart/citydoctor2/systemtest/OuterEdgeCheckTest.java

@@ -71,7 +71,7 @@ public class OuterEdgeCheckTest {
 		expectedErrorEdges.add(new Vertex(1.0, 0.0, 3.5));
 		expectedErrorEdges.add(new Vertex(2.0, 0.0, 3.0));
 		
-		Geometry geom = m.getBuildings().get(0).getGeometries().get(0);
+		Geometry geom = m.getBuildings().toList().get(0).getGeometries().get(0);
 		CheckResult cr = geom.getCheckResult(CheckId.C_GE_S_NOT_CLOSED);
 		Assert.assertEquals(ResultStatus.ERROR, cr.getResultStatus());
 	}