diff options
Diffstat (limited to 'ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/ContainerTest.java')
-rw-r--r-- | ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/ContainerTest.java | 57 |
1 files changed, 40 insertions, 17 deletions
diff --git a/ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/ContainerTest.java b/ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/ContainerTest.java index c468bec6..6f5b4777 100644 --- a/ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/ContainerTest.java +++ b/ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/ContainerTest.java @@ -49,15 +49,11 @@ import org.junit.Test; import org.mockito.InjectMocks; import org.mockito.MockitoAnnotations; import org.onap.portalsdk.core.domain.User; -import org.onap.portalsdk.core.domain.support.Container; -import org.onap.portalsdk.core.domain.support.Element; -import org.onap.portalsdk.core.domain.support.Position; -import org.onap.portalsdk.core.domain.support.Size; public class ContainerTest { @InjectMocks - Container container = new Container(); + Container container = new Container.ContainerBuilder().createContainer(); @Before @@ -74,8 +70,12 @@ public class ContainerTest { private static final double DELTA = 1e-15; public Container mockContainer(){ - Container container = new Container("test","test",1,1,10,10,10,10,10,10); - + Container container = new Container.ContainerBuilder().setId("test").setName("test") + .setNumOfRows(1).setNumOfCols(1).setInterEleWd(10).setInterEleH(10) + .setInterEleToContainerWd(10).setInterEleToContainerH(10) + .setInterEleToInnerContainerWd(10).setInterEleToInnerContainerH(10) + .createContainer(); + Size size = new Size(); size.setHeight(10); size.setWidth(10); @@ -107,8 +107,12 @@ public class ContainerTest { public void containerTest(){ Container container = mockContainer(); - Container container1 = new Container("test","test",1,1,10,10,10,10,10,10); - + Container container1 = new Container.ContainerBuilder().setId("test").setName("test") + .setNumOfRows(1).setNumOfCols(1).setInterEleWd(10).setInterEleH(10) + .setInterEleToContainerWd(10).setInterEleToContainerH(10) + .setInterEleToInnerContainerWd(10).setInterEleToInnerContainerH(10) + .createContainer(); + Size size1 = new Size(); size1.setHeight(10); size1.setWidth(10); @@ -139,14 +143,21 @@ public class ContainerTest { public void computeSizeTest(){ Map<String, Container> containerRowCol = new HashMap<>(); - Container container = new Container("test","test",1,1,10,10,10,10,10,10); + Container container = new Container.ContainerBuilder().setId("test").setName("test").setNumOfRows(1) + .setNumOfCols(1).setInterEleWd(10).setInterEleH(10).setInterEleToContainerWd(10) + .setInterEleToContainerH(10).setInterEleToInnerContainerWd(10) + .setInterEleToInnerContainerH(10).createContainer(); containerRowCol.put("00", container); Map<String, Element> elementRowCol = new HashMap<>(); Element element = new Element("1", "test"); elementRowCol.put("00", element); - - Container containerTest = new Container("test","Broadworks complex",1,1,10,10,10,10,10,10); + + Container containerTest = new Container.ContainerBuilder().setId("test").setName("Broadworks complex") + .setNumOfRows(1).setNumOfCols(1).setInterEleWd(10).setInterEleH(10) + .setInterEleToContainerWd(10).setInterEleToContainerH(10) + .setInterEleToInnerContainerWd(10).setInterEleToInnerContainerH(10) + .createContainer(); containerTest.setElements(elementRowCol); containerTest.setInnerContainer(containerRowCol); Size size = containerTest.computeSize(); @@ -158,18 +169,30 @@ public class ContainerTest { public void computeElementPositionsTest(){ Map<String, Container> containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - Container container01 = new Container("test","test",1,1,10,10,10,10,10,10); + Container container00 = new Container.ContainerBuilder().setId("test").setName("test") + .setNumOfRows(1).setNumOfCols(1).setInterEleWd(10).setInterEleH(10) + .setInterEleToContainerWd(10).setInterEleToContainerH(10) + .setInterEleToInnerContainerWd(10).setInterEleToInnerContainerH(10) + .createContainer(); + Container container01 = new Container.ContainerBuilder().setId("test").setName("test") + .setNumOfRows(1).setNumOfCols(1).setInterEleWd(10).setInterEleH(10) + .setInterEleToContainerWd(10).setInterEleToContainerH(10) + .setInterEleToInnerContainerWd(10).setInterEleToInnerContainerH(10) + .createContainer(); containerRowCol.put("00", container00); containerRowCol.put("10", container01); containerRowCol.put("11", container01); - + Map<String, Element> elementRowCol = new HashMap<>(); Element element = new Element("1", "test"); elementRowCol.put("01", element); elementRowCol.put("02", element); - - Container containerTest = new Container("test","Broadworks complex",2,3,10,10,10,10,10,10); + + Container containerTest = new Container.ContainerBuilder().setId("test") + .setName("Broadworks complex").setNumOfRows(2).setNumOfCols(3).setInterEleWd(10) + .setInterEleH(10).setInterEleToContainerWd(10).setInterEleToContainerH(10) + .setInterEleToInnerContainerWd(10).setInterEleToInnerContainerH(10) + .createContainer(); Position position = new Position(); position.setX(10); position.setY(10); |