Skip to content
GitLab
"public/imgs/git@transfer.hft-stuttgart.de:ugl/website.git" did not exist on "3d7341ab3fd5f0844a7a0bbe45d43f4916665e17"
Commit 7f0c003c authored by Luna Riegel's avatar Luna Riegel
Browse files

Fix: Fix tests after data model refactor

parent ce88ccac
Hide whitespace changes
Inline Side-by-side
CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/AbstractTunnelTest.java
View file @ 7f0c003c
...@@ -39,7 +39,6 @@ public class AbstractTunnelTest { ...@@ -39,7 +39,6 @@ public class AbstractTunnelTest {
Installation mockInstallation = mock(Installation.class); Installation mockInstallation = mock(Installation.class);
TunnelHollow mockTunnelHollow = mock(TunnelHollow.class); TunnelHollow mockTunnelHollow = mock(TunnelHollow.class);
TunnelFurniture mockTunnelFurniture = mock(TunnelFurniture.class); TunnelFurniture mockTunnelFurniture = mock(TunnelFurniture.class);
TunnelPart mockTunnelPart = mock(TunnelPart.class);
TunnelConstructiveElement mockTunnelConstructiveElement = mock(TunnelConstructiveElement.class); TunnelConstructiveElement mockTunnelConstructiveElement = mock(TunnelConstructiveElement.class);
BoundarySurface mockBoundarySurface = mock(BoundarySurface.class); BoundarySurface mockBoundarySurface = mock(BoundarySurface.class);
Geometry mockGeometry = mock(Geometry.class); Geometry mockGeometry = mock(Geometry.class);
...@@ -47,7 +46,6 @@ public class AbstractTunnelTest { ...@@ -47,7 +46,6 @@ public class AbstractTunnelTest {
at.addInstallation(mockInstallation); at.addInstallation(mockInstallation);
at.addRoom(mockTunnelHollow); at.addRoom(mockTunnelHollow);
at.addFurniture(mockTunnelFurniture); at.addFurniture(mockTunnelFurniture);
at.addTunnelPart(mockTunnelPart);
at.addConstructiveElement(mockTunnelConstructiveElement); at.addConstructiveElement(mockTunnelConstructiveElement);
at.addBoundarySurface(mockBoundarySurface); at.addBoundarySurface(mockBoundarySurface);
at.addGeometry(mockGeometry); at.addGeometry(mockGeometry);
...@@ -59,7 +57,6 @@ public class AbstractTunnelTest { ...@@ -59,7 +57,6 @@ public class AbstractTunnelTest {
verify(mockInstallation).accept(c); verify(mockInstallation).accept(c);
verify(mockTunnelHollow).accept(c); verify(mockTunnelHollow).accept(c);
verify(mockTunnelFurniture).accept(c); verify(mockTunnelFurniture).accept(c);
verify(mockTunnelPart).accept(c);
verify(mockTunnelConstructiveElement).accept(c); verify(mockTunnelConstructiveElement).accept(c);
verify(mockBoundarySurface).accept(c); verify(mockBoundarySurface).accept(c);
verify(mockGeometry).accept(c); verify(mockGeometry).accept(c);
......
CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/datastructure/BridgeObjectTest.java
View file @ 7f0c003c
...@@ -33,6 +33,7 @@ import java.util.List; ...@@ -33,6 +33,7 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import org.citygml4j.core.model.bridge.AbstractBridge; 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.model.deprecated.bridge.DeprecatedPropertiesOfAbstractBridge;
import org.citygml4j.core.util.geometry.GeometryFactory; import org.citygml4j.core.util.geometry.GeometryFactory;
import org.citygml4j.core.visitor.ObjectVisitor; import org.citygml4j.core.visitor.ObjectVisitor;
...@@ -54,7 +55,7 @@ public class BridgeObjectTest { ...@@ -54,7 +55,7 @@ public class BridgeObjectTest {
@Test @Test
public void testAccept() { public void testAccept() {
BridgeObject bo = new BridgeObject(mock(AbstractBridge.class)); BridgeObject bo = new BridgeObject(mock(Bridge.class));
bo.addBoundarySurface(new BoundarySurface(null)); bo.addBoundarySurface(new BoundarySurface(null));
AtomicInteger boCounter = new AtomicInteger(0); AtomicInteger boCounter = new AtomicInteger(0);
AtomicInteger bsCounter = new AtomicInteger(0); AtomicInteger bsCounter = new AtomicInteger(0);
...@@ -83,7 +84,7 @@ public class BridgeObjectTest { ...@@ -83,7 +84,7 @@ public class BridgeObjectTest {
@Test @Test
public void testVisitorPropagation() { public void testVisitorPropagation() {
BridgeObject bo = new BridgeObject(mock(AbstractBridge.class)); BridgeObject bo = new BridgeObject(mock(Bridge.class));
BridgeObjectPart partMock = mock(BridgeObjectPart.class); BridgeObjectPart partMock = mock(BridgeObjectPart.class);
BridgeRoom mockRoom = mock(BridgeRoom.class); BridgeRoom mockRoom = mock(BridgeRoom.class);
...@@ -116,7 +117,7 @@ public class BridgeObjectTest { ...@@ -116,7 +117,7 @@ public class BridgeObjectTest {
@Test @Test
public void testPrepareForChecking() { 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 geom = new Geometry(GeometryType.MULTI_SURFACE, Lod.LOD2, Orientation.OUTWARD);
Geometry spyGeom = Mockito.spy(geom); Geometry spyGeom = Mockito.spy(geom);
...@@ -128,7 +129,7 @@ public class BridgeObjectTest { ...@@ -128,7 +129,7 @@ public class BridgeObjectTest {
@Test @Test
public void testContainsError() { 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_HOLE_OUTSIDE));
assertFalse(bo.containsError(CheckId.C_GE_P_NON_PLANAR)); assertFalse(bo.containsError(CheckId.C_GE_P_NON_PLANAR));
bo.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class))); bo.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class)));
...@@ -142,7 +143,7 @@ public class BridgeObjectTest { ...@@ -142,7 +143,7 @@ public class BridgeObjectTest {
@Test @Test
public void testClearAllContainedCheckResults() { 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)); bo.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.OK, null));
assertEquals(1, bo.getAllCheckResults().size()); assertEquals(1, bo.getAllCheckResults().size());
...@@ -152,7 +153,7 @@ public class BridgeObjectTest { ...@@ -152,7 +153,7 @@ public class BridgeObjectTest {
@Test @Test
public void testContainsAnyError() { public void testContainsAnyError() {
BridgeObject bo = new BridgeObject(mock(AbstractBridge.class)); BridgeObject bo = new BridgeObject(mock(Bridge.class));
assertFalse(bo.containsAnyError()); assertFalse(bo.containsAnyError());
bo.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.OK, null)); bo.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.OK, null));
assertFalse(bo.containsAnyError()); assertFalse(bo.containsAnyError());
...@@ -163,7 +164,7 @@ public class BridgeObjectTest { ...@@ -163,7 +164,7 @@ public class BridgeObjectTest {
@Test @Test
public void testCollectContainedErrors() { 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))); bo.addCheckResult(new CheckResult(CheckId.C_GE_P_HOLE_OUTSIDE, ResultStatus.ERROR, mock(CheckError.class)));
List<CheckError> errors = new ArrayList<>(); List<CheckError> errors = new ArrayList<>();
bo.collectContainedErrors(errors); bo.collectContainedErrors(errors);
...@@ -172,12 +173,7 @@ public class BridgeObjectTest { ...@@ -172,12 +173,7 @@ public class BridgeObjectTest {
@Test @Test
public void testReCreateGeometriesSolid() { public void testReCreateGeometriesSolid() {
org.citygml4j.core.model.bridge.AbstractBridge gmlBr = new AbstractBridge() { org.citygml4j.core.model.bridge.Bridge gmlBr = new Bridge() ;
@Override
public void accept(ObjectVisitor visitor) {
}
};
BridgeObject bo = new BridgeObject(gmlBr); BridgeObject bo = new BridgeObject(gmlBr);
bo.addGeometry(GeometryTestUtils.createDummyGeometry(GeometryType.SOLID, Lod.LOD1)); bo.addGeometry(GeometryTestUtils.createDummyGeometry(GeometryType.SOLID, Lod.LOD1));
bo.addGeometry(GeometryTestUtils.createDummyGeometry(GeometryType.SOLID, Lod.LOD2)); bo.addGeometry(GeometryTestUtils.createDummyGeometry(GeometryType.SOLID, Lod.LOD2));
...@@ -195,12 +191,7 @@ public class BridgeObjectTest { ...@@ -195,12 +191,7 @@ public class BridgeObjectTest {
@Test @Test
public void testReCreateGeometriesMultiSurface() { public void testReCreateGeometriesMultiSurface() {
org.citygml4j.core.model.bridge.AbstractBridge gmlBr = new AbstractBridge() { org.citygml4j.core.model.bridge.Bridge gmlBr = new Bridge() ;
@Override
public void accept(ObjectVisitor visitor) {
}
};
BridgeObject bo = new BridgeObject(gmlBr); BridgeObject bo = new BridgeObject(gmlBr);
bo.addGeometry(GeometryTestUtils.createDummyGeometry(GeometryType.MULTI_SURFACE, Lod.LOD0)); bo.addGeometry(GeometryTestUtils.createDummyGeometry(GeometryType.MULTI_SURFACE, Lod.LOD0));
bo.addGeometry(GeometryTestUtils.createDummyGeometry(GeometryType.MULTI_SURFACE, Lod.LOD1)); bo.addGeometry(GeometryTestUtils.createDummyGeometry(GeometryType.MULTI_SURFACE, Lod.LOD1));
...@@ -227,10 +218,10 @@ public class BridgeObjectTest { ...@@ -227,10 +218,10 @@ public class BridgeObjectTest {
@Test @Test
public void testUnsetGmlGeometries() { public void testUnsetGmlGeometries() {
AbstractBridge abMock = mock(AbstractBridge.class); Bridge bMock = mock(Bridge.class);
DeprecatedPropertiesOfAbstractBridge propsMock = mock(DeprecatedPropertiesOfAbstractBridge.class); DeprecatedPropertiesOfAbstractBridge propsMock = mock(DeprecatedPropertiesOfAbstractBridge.class);
when(abMock.getDeprecatedProperties()).thenReturn(propsMock); when(bMock.getDeprecatedProperties()).thenReturn(propsMock);
BridgeObject bo = new BridgeObject(abMock); BridgeObject bo = new BridgeObject(bMock);
BoundarySurface bsMock = mock(BoundarySurface.class); BoundarySurface bsMock = mock(BoundarySurface.class);
bo.addBoundarySurface(bsMock); bo.addBoundarySurface(bsMock);
doAnswer(invocation -> { doAnswer(invocation -> {
...@@ -242,27 +233,27 @@ public class BridgeObjectTest { ...@@ -242,27 +233,27 @@ public class BridgeObjectTest {
verify(bsMock).accept(any(UnsetGeometriesVisitor.class)); verify(bsMock).accept(any(UnsetGeometriesVisitor.class));
verify(bsMock).unsetGmlGeometries(); verify(bsMock).unsetGmlGeometries();
verify(propsMock).setLod1MultiSurface(null); verify(propsMock).setLod1MultiSurface(null);
verify(abMock).setLod2MultiSurface(null); verify(bMock).setLod2MultiSurface(null);
verify(abMock).setLod3MultiSurface(null); verify(bMock).setLod3MultiSurface(null);
verify(propsMock).setLod4MultiSurface(null); verify(propsMock).setLod4MultiSurface(null);
verify(abMock).setLod1Solid(null); verify(bMock).setLod1Solid(null);
verify(abMock).setLod2Solid(null); verify(bMock).setLod2Solid(null);
verify(abMock).setLod3Solid(null); verify(bMock).setLod3Solid(null);
verify(propsMock).setLod4Solid(null); verify(propsMock).setLod4Solid(null);
} }
@Test @Test
public void testGetFeatureType() { public void testGetFeatureType() {
AbstractBridge abMock = mock(AbstractBridge.class); Bridge bMock = mock(Bridge.class);
BridgeObject bo = new BridgeObject(abMock); BridgeObject bo = new BridgeObject(bMock);
assertEquals(FeatureType.BRIDGE, bo.getFeatureType()); assertEquals(FeatureType.BRIDGE, bo.getFeatureType());
} }
@Test @Test
public void testGetType() { public void testGetType() {
AbstractBridge abMock = mock(AbstractBridge.class); Bridge bMock = mock(Bridge.class);
BridgeObject bo = new BridgeObject( abMock); BridgeObject bo = new BridgeObject(bMock);
assertEquals(BridgeType.BRIDGE, bo.getType()); assertEquals(BridgeType.BRIDGE, bo.getType());
bo.setType(BridgeType.BRIDGE_PART); bo.setType(BridgeType.BRIDGE_PART);
assertEquals(BridgeType.BRIDGE_PART, bo.getType()); assertEquals(BridgeType.BRIDGE_PART, bo.getType());
...@@ -270,9 +261,9 @@ public class BridgeObjectTest { ...@@ -270,9 +261,9 @@ public class BridgeObjectTest {
@Test @Test
public void testGetGmlObject() { public void testGetGmlObject() {
AbstractBridge abMock = mock(AbstractBridge.class); Bridge bMock = mock(Bridge.class);
BridgeObject bo = new BridgeObject(abMock); BridgeObject bo = new BridgeObject(bMock);
assertEquals(abMock, bo.getGmlObject()); assertEquals(bMock, bo.getGmlObject());
AbstractBridge abMock2 = mock(AbstractBridge.class); AbstractBridge abMock2 = mock(AbstractBridge.class);
bo.setGmlObject(abMock2); bo.setGmlObject(abMock2);
assertEquals(abMock2, bo.getGmlObject()); assertEquals(abMock2, bo.getGmlObject());
......
CityDoctorParent/CityDoctorValidation/src/main/java/de/hft/stuttgart/citydoctor2/check/Checker.java
View file @ 7f0c003c
...@@ -605,7 +605,6 @@ public class Checker { ...@@ -605,7 +605,6 @@ public class Checker {
if(!exec.awaitTermination(1, TimeUnit.MINUTES)){ if(!exec.awaitTermination(1, TimeUnit.MINUTES)){
exec.shutdownNow(); exec.shutdownNow();
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();
logger.error(Localization.getText("Checker.shutdownInterrupted")); logger.error(Localization.getText("Checker.shutdownInterrupted"));
......
CityDoctorParent/Extensions/CityDoctorAutoPro/src/main/java/de/hft/stuttgart/citydoctor2/gui/AutoProWindow.java
View file @ 7f0c003c
...@@ -654,9 +654,9 @@ public class AutoProWindow extends JDialog implements ItemListener { ...@@ -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()) for(Geometry geometry : buildingInstallation.getGeometries())
{ {
......
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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal