Merge "added test cases to ElementTest"

1 files changed, 42 insertions, 30 deletions

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());    
+    }
 
 }