From c607da68bfb7f7440d5be7f0396609dc01eb0e90 Mon Sep 17 00:00:00 2001 From: sa282w Date: Tue, 1 May 2018 16:45:26 -0400 Subject: Changes for 2.4.0-SNAPSHOT Issue-ID: PORTAL-210 Included the pom changes for 2.4.0-SNAPSHOT, music and AAF changes. Change-Id: Ib1e1c2679271aa40eb3b50397724e8cdc5ffe01c Signed-off-by: sa282w --- .../onap/portalsdk/domain/support/LayoutTest.java | 336 --------------------- 1 file changed, 336 deletions(-) delete mode 100644 ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/LayoutTest.java (limited to 'ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/LayoutTest.java') diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/LayoutTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/LayoutTest.java deleted file mode 100644 index a738440b..00000000 --- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/domain/support/LayoutTest.java +++ /dev/null @@ -1,336 +0,0 @@ -/* - * ============LICENSE_START========================================== - * ONAP Portal SDK - * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * - * Unless otherwise specified, all software contained herein is licensed - * under the Apache License, Version 2.0 (the "License"); - * you may not use this software except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ============LICENSE_END============================================ - * - * - */ -package org.onap.portalsdk.domain.support; - -import static org.junit.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.Test; -import org.onap.portalsdk.core.domain.support.Container; -import org.onap.portalsdk.core.domain.support.Domain; -import org.onap.portalsdk.core.domain.support.Layout; -import org.onap.portalsdk.core.domain.support.Position; - -public class LayoutTest { - - private static final double DELTA = 1e-15; - - public Layout mockLayout(){ - Layout layout = new Layout(null, 0, 0, 0, 0); - - layout.setCollapsedDomainsNewList(null); - layout.setCollapsedDomains(null); - layout.setNumberofColsofDomains(0); - layout.setDomainRowCol(null); - - return layout; - } - - @Test - public void layoutTest(){ - Layout layout = mockLayout(); - - Layout layout1 = new Layout(null, 0, 0, 0, 0); - layout1.setCollapsedDomainsNewList(null); - layout1.setCollapsedDomains(null); - layout1.setNumberofColsofDomains(0); - layout1.setDomainRowCol(null); - - assertEquals(layout.getCollapsedDomains(), layout1.getCollapsedDomains()); - assertEquals(layout.getCollapsedDomainsNewList(), layout1.getCollapsedDomainsNewList()); - assertEquals(layout.getNumberofColsofDomains(), layout1.getNumberofColsofDomains()); - assertEquals(layout.getDomainRowCol(), layout1.getDomainRowCol()); - } - - @Test - public void computeDomainPositionsTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - Domain domain = new Domain("test", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Map domainRowCol = new HashMap<>(); - List domainList = new ArrayList<>(); - domainList.add(domain); - domainRowCol.put("00", domain); - domainRowCol.put("01", domain); - domainRowCol.put("10", domain); - layout.setDomainRowCol(domainRowCol); - layout.setCollapsedDomainsNewList(domainList); - layout.computeDomainPositions(); - assertEquals(5.0, layout.getDomainRowCol().get("00").getP().getY(), DELTA); - } - - @Test - public void computeDomainPositionsModifiedTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - Domain domain = new Domain("test", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Map containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - Position position = new Position(); - position.setX(10); - position.setY(10); - container00.setP(position); - containerRowCol.put("00", container00); - domain.setContainers(containerRowCol); - Map domainRowCol = new HashMap<>(); - List domainList = new ArrayList<>(); - domainList.add(domain); - domainRowCol.put("00", domain); - domainRowCol.put("01", domain); - domainRowCol.put("10", domain); - layout.setDomainRowCol(domainRowCol); - layout.setCollapsedDomainsNewList(domainList); - layout.computeDomainPositionsModified(); - assertEquals(5.0, layout.getDomainRowCol().get("00").getP().getY(), DELTA); - } - - @Test - public void collapseDomainModifiedTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Domain domain2 = new Domain("test", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Map containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - Position position = new Position(); - position.setX(10); - position.setY(10); - container00.setP(position); - containerRowCol.put("00", container00); - containerRowCol.put("01", container00); - domain.setContainers(containerRowCol); - domain2.setContainers(containerRowCol); - domain.setIndexChanged(true); - Map domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - domainRowCol.put("01", domain2); - domainRowCol.put("10", domain); - layout.setDomainRowCol(domainRowCol); - layout.collapseDomainModified("XYZ"); - assertEquals(5.0, layout.getDomainRowCol().get("10").getP().getY(), DELTA); - } - - @Test - public void collapseDomainNewTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Domain domain2 = new Domain("test", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Map containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - Position position = new Position(); - position.setX(10); - position.setY(10); - container00.setP(position); - containerRowCol.put("00", container00); - containerRowCol.put("01", container00); - domain.setContainers(containerRowCol); - domain2.setContainers(containerRowCol); - domain.setIndexChanged(true); - Map domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - domainRowCol.put("01", domain2); - domainRowCol.put("10", domain); - layout.setDomainRowCol(domainRowCol); - layout.collapseDomainNew("XYZ"); - assertEquals(5.0, layout.getDomainRowCol().get("10").getP().getY(), DELTA); - } - - @Test - public void collapseDomainTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Domain domain2 = new Domain("test", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Map containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - Position position = new Position(); - position.setX(10); - position.setY(10); - container00.setP(position); - containerRowCol.put("00", container00); - containerRowCol.put("01", container00); - domain.setContainers(containerRowCol); - domain.setP(position); - domain2.setP(position); - domain2.setContainers(containerRowCol); - domain.setIndexChanged(true); - Map domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - domainRowCol.put("01", domain2); - domainRowCol.put("10", domain); - layout.setDomainRowCol(domainRowCol); - layout.collapseDomain("XYZ"); - assertEquals(5.0, layout.getDomainRowCol().get("10").getP().getY(), DELTA); - } - - - @Test - public void uncollapseDomainModifiedTest(){ - - Layout layout = new Layout(null, 0, 0, 2, 2); - - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Position position = new Position(); - position.setX(10); - position.setY(10); - domain.setP(position); - Map domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - - Map innerContainerRowCol = new HashMap<>(); - Container innerContainer = new Container("test","test",1,1,10,10,10,10,10,10); - innerContainerRowCol.put("00", innerContainer); - - Map containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - container00.setInnerContainer(innerContainerRowCol); - containerRowCol.put("00", container00); - - domain.setContainers(containerRowCol); - - Map originalDomainRowCol = new HashMap<>(); - originalDomainRowCol.put("00", domain); - - layout.setDomainRowCol(domainRowCol); - layout.setCollapsedDomains(originalDomainRowCol); - - layout.uncollapseDomainModified("XYZ"); - assertEquals(3, layout.getNumberofColsofDomains(), DELTA); - - } - - - @Test - public void uncollapseDomainTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Position position = new Position(); - position.setX(10); - position.setY(10); - domain.setP(position); - Map domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - - Map innerContainerRowCol = new HashMap<>(); - Container innerContainer = new Container("test","test",1,1,10,10,10,10,10,10); - innerContainerRowCol.put("00", innerContainer); - - Map containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - container00.setInnerContainer(innerContainerRowCol); - containerRowCol.put("00", container00); - - domain.setContainers(containerRowCol); - - Map originalDomainRowCol = new HashMap<>(); - originalDomainRowCol.put("00", domain); - - layout.setDomainRowCol(domainRowCol); - layout.setCollapsedDomains(originalDomainRowCol); - - layout.uncollapseDomain("XYZ"); - assertEquals(10.6, layout.getDomainRowCol().get("00").getP().getX(), DELTA); - } - - @Test - public void uncollapseDomainNewTest(){ - Layout layout = new Layout(null, 0, 0, 2, 2); - - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Position position = new Position(); - position.setX(10); - position.setY(10); - domain.setP(position); - Map domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - - Map innerContainerRowCol = new HashMap<>(); - Container innerContainer = new Container("test","test",1,1,10,10,10,10,10,10); - innerContainerRowCol.put("00", innerContainer); - - Map containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - container00.setInnerContainer(innerContainerRowCol); - containerRowCol.put("00", container00); - - domain.setContainers(containerRowCol); - - Map originalDomainRowCol = new HashMap<>(); - originalDomainRowCol.put("00", domain); - layout.setDomainRowCol(domainRowCol); - layout.collapseDomain("XYZ"); - layout.uncollapseDomainNew("XYZ"); - assertEquals(11.0, layout.getDomainRowCol().get("00").getP().getX(), DELTA); - } - - @Test - public void uncollapseDomainNew1Test(){ - - Layout layout = new Layout(null, 0, 0, 2, 2); - - Domain domain = new Domain("test1", "XYZ", 0, 0, 0, 0, 0, 2, 2); - Position position = new Position(); - position.setX(10); - position.setY(10); - domain.setP(position); - Map domainRowCol = new HashMap<>(); - domainRowCol.put("00", domain); - - Map innerContainerRowCol = new HashMap<>(); - Container innerContainer = new Container("test","test",1,1,10,10,10,10,10,10); - innerContainerRowCol.put("00", innerContainer); - - Map containerRowCol = new HashMap<>(); - Container container00 = new Container("test","test",1,1,10,10,10,10,10,10); - container00.setInnerContainer(innerContainerRowCol); - containerRowCol.put("00", container00); - - domain.setContainers(containerRowCol); - - Map originalDomainRowCol = new HashMap<>(); - originalDomainRowCol.put("00", domain); - layout.setDomainRowCol(domainRowCol); - layout.collapseDomain("XYZ"); - layout.uncollapseDomainNew1("XYZ"); - assertEquals(11.0, layout.getDomainRowCol().get("00").getP().getX(), DELTA); - - } - -} - -- cgit 1.2.3-korg