Fix: Fix tests after data model refactor

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnelTest.java

@@ -39,7 +39,6 @@ public class AbstractTunnelTest {
         Installation mockInstallation = mock(Installation.class);
         TunnelHollow mockTunnelHollow = mock(TunnelHollow.class);
         TunnelFurniture mockTunnelFurniture = mock(TunnelFurniture.class);
-        TunnelPart mockTunnelPart = mock(TunnelPart.class);
         TunnelConstructiveElement mockTunnelConstructiveElement = mock(TunnelConstructiveElement.class);
         BoundarySurface mockBoundarySurface = mock(BoundarySurface.class);
         Geometry mockGeometry = mock(Geometry.class);
@@ -47,7 +46,6 @@ public class AbstractTunnelTest {
         at.addInstallation(mockInstallation);
         at.addRoom(mockTunnelHollow);
         at.addFurniture(mockTunnelFurniture);
-        at.addTunnelPart(mockTunnelPart);
         at.addConstructiveElement(mockTunnelConstructiveElement);
         at.addBoundarySurface(mockBoundarySurface);
         at.addGeometry(mockGeometry);
@@ -59,7 +57,6 @@ public class AbstractTunnelTest {
         verify(mockInstallation).accept(c);
         verify(mockTunnelHollow).accept(c);
         verify(mockTunnelFurniture).accept(c);
-        verify(mockTunnelPart).accept(c);
         verify(mockTunnelConstructiveElement).accept(c);
         verify(mockBoundarySurface).accept(c);
         verify(mockGeometry).accept(c);

CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObjectTest.java

@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.citygml4j.core.model.bridge.AbstractBridge;
+import org.citygml4j.core.model.bridge.Bridge;
 import org.citygml4j.core.model.deprecated.bridge.DeprecatedPropertiesOfAbstractBridge;
 import org.citygml4j.core.util.geometry.GeometryFactory;
 import org.citygml4j.core.visitor.ObjectVisitor;
@@ -54,7 +55,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testAccept() {
-		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(Bridge.class));
 		bo.addBoundarySurface(new BoundarySurface(null));
 		AtomicInteger boCounter = new AtomicInteger(0);
 		AtomicInteger bsCounter = new AtomicInteger(0);
@@ -83,7 +84,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testVisitorPropagation() {
-		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(Bridge.class));
 
 		BridgeObjectPart partMock = mock(BridgeObjectPart.class);
 		BridgeRoom mockRoom = mock(BridgeRoom.class);
@@ -116,7 +117,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testPrepareForChecking() {
-		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(Bridge.class));
 		Geometry geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
 		Geometry spyGeom = Mockito.spy(geom);
 
@@ -128,7 +129,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testContainsError() {
-		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(Bridge.class));
 		assertFalse(bo.containsError(CheckId.C_GE_P_HOLE_OUTSIDE));
 		assertFalse(bo.containsError(CheckId.C_GE_P_NON_PLANAR));
 		bo.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class)));
@@ -142,7 +143,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testClearAllContainedCheckResults() {
-		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(Bridge.class));
 		bo.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.OK, null));
 
 		assertEquals(1, bo.getAllCheckResults().size());
@@ -152,7 +153,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testContainsAnyError() {
-		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(Bridge.class));
 		assertFalse(bo.containsAnyError());
 		bo.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.OK, null));
 		assertFalse(bo.containsAnyError());
@@ -163,7 +164,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testCollectContainedErrors() {
-		BridgeObject bo = new BridgeObject(mock(AbstractBridge.class));
+		BridgeObject bo = new BridgeObject(mock(Bridge.class));
 		bo.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class)));
 		List<CheckError> errors = new ArrayList<>();
 		bo.collectContainedErrors(errors);
@@ -172,12 +173,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testReCreateGeometriesSolid() {
-		org.citygml4j.core.model.bridge.AbstractBridge gmlBr = new AbstractBridge() {
-			@Override
-			public void accept(ObjectVisitor visitor) {
-
-			}
-		};
+		org.citygml4j.core.model.bridge.Bridge gmlBr = new Bridge() ;
 		BridgeObject bo = new BridgeObject(gmlBr);
 		bo.addGeometry(GeometryTestUtils.createDummyGeometry(GeometryType.SOLID, Lod.LOD1));
 		bo.addGeometry(GeometryTestUtils.createDummyGeometry(GeometryType.SOLID, Lod.LOD2));
@@ -195,12 +191,7 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testReCreateGeometriesMultiSurface() {
-		org.citygml4j.core.model.bridge.AbstractBridge gmlBr = new AbstractBridge() {
-			@Override
-			public void accept(ObjectVisitor visitor) {
-
-			}
-		};
+		org.citygml4j.core.model.bridge.Bridge gmlBr = new Bridge() ;
 		BridgeObject bo = new BridgeObject(gmlBr);
 		bo.addGeometry(GeometryTestUtils.createDummyGeometry(GeometryType.MULTI_SURFACE, Lod.LOD0));
 		bo.addGeometry(GeometryTestUtils.createDummyGeometry(GeometryType.MULTI_SURFACE, Lod.LOD1));
@@ -227,10 +218,10 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testUnsetGmlGeometries() {
-		AbstractBridge abMock = mock(AbstractBridge.class);
+		Bridge bMock = mock(Bridge.class);
 		DeprecatedPropertiesOfAbstractBridge propsMock = mock(DeprecatedPropertiesOfAbstractBridge.class);
-		when(abMock.getDeprecatedProperties()).thenReturn(propsMock);
-		BridgeObject bo = new BridgeObject(abMock);
+		when(bMock.getDeprecatedProperties()).thenReturn(propsMock);
+		BridgeObject bo = new BridgeObject(bMock);
 		BoundarySurface bsMock = mock(BoundarySurface.class);
 		bo.addBoundarySurface(bsMock);
 		doAnswer(invocation -> {
@@ -242,27 +233,27 @@ public class BridgeObjectTest {
 		verify(bsMock).accept(any(UnsetGeometriesVisitor.class));
 		verify(bsMock).unsetGmlGeometries();
 		verify(propsMock).setLod1MultiSurface(null);
-		verify(abMock).setLod2MultiSurface(null);
-		verify(abMock).setLod3MultiSurface(null);
+		verify(bMock).setLod2MultiSurface(null);
+		verify(bMock).setLod3MultiSurface(null);
 		verify(propsMock).setLod4MultiSurface(null);
 		
-		verify(abMock).setLod1Solid(null);
-		verify(abMock).setLod2Solid(null);
-		verify(abMock).setLod3Solid(null);
+		verify(bMock).setLod1Solid(null);
+		verify(bMock).setLod2Solid(null);
+		verify(bMock).setLod3Solid(null);
 		verify(propsMock).setLod4Solid(null);
 	}
 
 	@Test
 	public void testGetFeatureType() {
-		AbstractBridge abMock = mock(AbstractBridge.class);
-		BridgeObject bo = new BridgeObject(abMock);
+		Bridge bMock = mock(Bridge.class);
+		BridgeObject bo = new BridgeObject(bMock);
 		assertEquals(FeatureType.BRIDGE, bo.getFeatureType());
 	}
 
 	@Test
 	public void testGetType() {
-		AbstractBridge abMock = mock(AbstractBridge.class);
-		BridgeObject bo = new BridgeObject( abMock);
+		Bridge bMock = mock(Bridge.class);
+		BridgeObject bo = new BridgeObject(bMock);
 		assertEquals(BridgeType.BRIDGE, bo.getType());
 		bo.setType(BridgeType.BRIDGE_PART);
 		assertEquals(BridgeType.BRIDGE_PART, bo.getType());
@@ -270,9 +261,9 @@ public class BridgeObjectTest {
 
 	@Test
 	public void testGetGmlObject() {
-		AbstractBridge abMock = mock(AbstractBridge.class);
-		BridgeObject bo = new BridgeObject(abMock);
-		assertEquals(abMock, bo.getGmlObject());
+		Bridge bMock = mock(Bridge.class);
+		BridgeObject bo = new BridgeObject(bMock);
+		assertEquals(bMock, bo.getGmlObject());
 		AbstractBridge abMock2 = mock(AbstractBridge.class);
 		bo.setGmlObject(abMock2);
 		assertEquals(abMock2, bo.getGmlObject());

CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java

@@ -605,7 +605,6 @@ public class Checker {
                 if(!exec.awaitTermination(1, TimeUnit.MINUTES)){
                     exec.shutdownNow();
                 }
-
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
                 logger.error(Localization.getText("Checker.shutdownInterrupted"));

CityDoctorParent/Extensions/CityDoctorAutoPro/src/main/java/de/hft/stuttgart/citydoctor2/gui/AutoProWindow.java

@@ -654,9 +654,9 @@ public class AutoProWindow extends JDialog implements ItemListener {
 					}
 				}
 			}
-			else if(0 != building.getInstallations().size())
+			else if(0 != building.getBuildingInstallations().size())
 			{
-				for(Installation buildingInstallation: building.getInstallations())
+				for(Installation buildingInstallation: building.getBuildingInstallations())
 				{
 					for(Geometry geometry : buildingInstallation.getGeometries())
 					{