diff options
Diffstat (limited to 'ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain')
2 files changed, 113 insertions, 89 deletions
diff --git a/ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/DomainVOTest.java b/ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/DomainVOTest.java index 93678128..9bac4db5 100644 --- a/ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/DomainVOTest.java +++ b/ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/DomainVOTest.java @@ -4,6 +4,8 @@ * =================================================================== * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * =================================================================== + * Modifications Copyright © 2018 IBM. + * =================================================================== * * Unless otherwise specified, all software contained herein is licensed * under the Apache License, Version 2.0 (the "License"); @@ -41,67 +43,77 @@ import static org.junit.Assert.assertEquals; import java.util.Date; +import org.junit.Before; import org.junit.Test; import org.onap.portalsdk.core.domain.support.DomainVo; public class DomainVOTest { - - public DomainVo mockDomainVO(){ - DomainVo domainVo = new DomainVo(); - - domainVo.setId((long) 1); - domainVo.setCreated(new Date()); - domainVo.setModified(new Date()); - domainVo.setCreatedId((long) 1); - domainVo.setModifiedId((long) 1); - domainVo.setRowNum((long) 1); - domainVo.setAuditUserId(null); - domainVo.setAuditTrail(null); - - return domainVo; - } - - @Test - public void domainVoTest(){ - DomainVo domainVo = mockDomainVO(); - - DomainVo domainVo1 = new DomainVo(); - domainVo1.setId((long) 1); - domainVo1.setCreated(new Date()); - domainVo1.setModified(new Date()); - domainVo1.setCreatedId((long) 1); - domainVo1.setModifiedId((long) 1); - domainVo1.setRowNum((long) 1); - domainVo1.setAuditUserId(null); - domainVo1.setAuditTrail(null); - - assertEquals(domainVo.getId(), domainVo1.getId()); -// assertEquals(domainVo.getCreated(), domainVo1.getCreated()); -// assertEquals(domainVo.getModified(), domainVo1.getModified()); - assertEquals(domainVo.getCreatedId(), domainVo1.getCreatedId()); - assertEquals(domainVo.getModifiedId(), domainVo1.getModifiedId()); - assertEquals(domainVo.getRowNum(), domainVo1.getRowNum()); - assertEquals(domainVo.getAuditUserId(), domainVo1.getAuditUserId()); - assertEquals(domainVo.getAuditTrail(), domainVo1.getAuditTrail()); - } - - @Test - public void copyTest(){ - DomainVo domainVo = mockDomainVO(); - domainVo.copy(true); - } - - @Test - public void equalTest(){ - DomainVo domainVo1 = mockDomainVO(); - DomainVo domainVo2 = mockDomainVO(); -// assertEquals(true, domainVo1.equals(domainVo2)); - } - - @Test - public void compareTest(){ - DomainVo domainVo1 = mockDomainVO(); - DomainVo domainVo2 = mockDomainVO(); - assertEquals(0, domainVo1.compareTo(domainVo2)); - } + + public Date date; + + @Before + public void setUp() + { + date= new Date("23/09/2018"); + } + + public DomainVo mockDomainVO(){ + DomainVo domainVo = new DomainVo(); + + domainVo.setId((long) 1); + domainVo.setCreated(new Date()); + domainVo.setModified(new Date()); + domainVo.setCreatedId((long) 1); + domainVo.setModifiedId((long) 1); + domainVo.setRowNum((long) 1); + domainVo.setAuditUserId(null); + domainVo.setAuditTrail(null); + domainVo.setCreated(date); + domainVo.setModified(date); + return domainVo; + } + + @Test + public void domainVoTest(){ + DomainVo domainVo = mockDomainVO(); + + DomainVo domainVo1 = new DomainVo(); + domainVo1.setId((long) 1); + domainVo1.setCreated(date); + domainVo1.setModified(date); + domainVo1.setCreatedId((long) 1); + domainVo1.setModifiedId((long) 1); + domainVo1.setRowNum((long) 1); + domainVo1.setAuditUserId(null); + domainVo1.setAuditTrail(null); + + assertEquals(domainVo.getId(), domainVo1.getId()); + assertEquals(domainVo.getCreated(), domainVo1.getCreated()); + assertEquals(domainVo.getModified(), domainVo1.getModified()); + assertEquals(domainVo.getCreatedId(), domainVo1.getCreatedId()); + assertEquals(domainVo.getModifiedId(), domainVo1.getModifiedId()); + assertEquals(domainVo.getRowNum(), domainVo1.getRowNum()); + assertEquals(domainVo.getAuditUserId(), domainVo1.getAuditUserId()); + assertEquals(domainVo.getAuditTrail(), domainVo1.getAuditTrail()); + } + + @Test + public void copyTest(){ + DomainVo domainVo = mockDomainVO(); + domainVo.copy(true); + } + + @Test + public void equalTest(){ + DomainVo domainVo1 = mockDomainVO(); + DomainVo domainVo2 = mockDomainVO(); + assertEquals(true, domainVo1.equals(domainVo2)); + } + + @Test + public void compareTest(){ + DomainVo domainVo1 = mockDomainVO(); + DomainVo domainVo2 = mockDomainVO(); + assertEquals(0, domainVo1.compareTo(domainVo2)); + } } diff --git a/ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/ElementTest.java b/ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/ElementTest.java index 6eec6f00..bf58de1a 100644 --- a/ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/ElementTest.java +++ b/ecomp-sdk/epsdk-domain/src/test/java/org/onap/portalsdk/core/domain/support/ElementTest.java @@ -4,6 +4,8 @@ * =================================================================== * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * =================================================================== + * Modifications Copyright © 2018 IBM. + * =================================================================== * * Unless otherwise specified, all software contained herein is licensed * under the Apache License, Version 2.0 (the "License"); @@ -39,39 +41,49 @@ package org.onap.portalsdk.core.domain.support; import static org.junit.Assert.assertEquals; +import org.junit.Before; import org.junit.Test; import org.onap.portalsdk.core.domain.support.Element; public class ElementTest { - - public Element mockElement(){ - Element element = new Element("test","test","test","test","test",null); - - element.setId("test"); - element.setName("test"); - element.setTop(10); - element.setLeft(10); - element.setHeight(10); - element.setWidth(10); - element.setImgFileName("test"); - element.setBorderType("test"); - element.setBgColor("test"); - element.setP(null); - - return element; - } - - @Test - public void elementTest(){ - Element element = mockElement(); - - Element element1 = new Element("test","test","test","test","test",null); - - assertEquals(element.getId(), element1.getId()); - assertEquals(element.getName(), element1.getName()); - assertEquals(element.getImgFileName(), element1.getImgFileName()); - assertEquals(element.getBorderType(), element1.getBorderType()); - assertEquals(element.getP(), element1.getP()); - } + + private ElementDetails details; + @Before + public void setUp() + { + details= new ElementDetails("logical_group", "display_longname", "description", "primary_function", "network_function", "key_interfaces", "location", "vendor", "vendor_shortname", "enclosingContainer"); + } + + public Element mockElement(){ + Element element = new Element("test","test","test","test","test",null); + + element.setId("test"); + element.setName("test"); + element.setTop(10); + element.setLeft(10); + element.setHeight(10); + element.setWidth(10); + element.setImgFileName("test"); + element.setBorderType("test"); + element.setBgColor("test"); + element.setP(null); + + element.setDetails(details); + + return element; + } + + @Test + public void elementTest(){ + Element element = mockElement(); + + Element element1 = new Element("test","test","test","test","test",details); + assertEquals(element.getId(), element1.getId()); + assertEquals(element.getName(), element1.getName()); + assertEquals(element.getImgFileName(), element1.getImgFileName()); + assertEquals(element.getBorderType(), element1.getBorderType()); + assertEquals(element.getP(), element1.getP()); + assertEquals(element.getDetails(), element1.getDetails()); + } } |