1 files changed, 79 insertions, 43 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/view/DataValueTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/view/DataValueTest.java
index 020eed27..12ad386a 100644
--- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/view/DataValueTest.java
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/view/DataValueTest.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,52 +41,86 @@ package org.onap.portalsdk.analytics.view;
 
 import static org.junit.Assert.*;
 
+import org.junit.Before;
 import org.junit.Test;
 
 public class DataValueTest {
+    private DataValue dataValue;
+    private HtmlFormatter formatter;
+    
+    @Before
+    public void setUp()
+    {
+        dataValue = new DataValue();
+        dataValue.setDisplayName("displayName");
+        dataValue.setDisplayCalculatedValue("displayCalculatedValue");
+        dataValue.setDrillDownURL("drillDownURL");
+        dataValue.setDrillDowninPoPUp(false);
+        dataValue.setIndentation("indentation");
+        dataValue.setAlignment("alignment");
+        dataValue.setVisible(false);
+        dataValue.setHidden(false);
+        formatter = new HtmlFormatter();
+        dataValue.setCellFormatter(formatter);
+        dataValue.setBold(false);
+        dataValue.setRowFormatter(formatter);
+        dataValue.setFormatId("formatId");
+        dataValue.setCellFormat(false);
+        dataValue.setColId("colId");
+        dataValue.setDisplayName("displayName");
+        dataValue.setNowrap("nowrap");
+        dataValue.setHyperlinkURL("hyperlinkURL");
+        dataValue.setDisplayType("displayType");
+        dataValue.setActionImg("actionImg");
 
-	@Test
-	public void mockDataValueTest() {
-		DataValue dataValue = new DataValue();
-		dataValue.setDisplayName("displayName");
-		dataValue.setDisplayCalculatedValue("displayCalculatedValue");
-		dataValue.setDrillDownURL("drillDownURL");
-		dataValue.setDrillDowninPoPUp(false);
-		dataValue.setIndentation("indentation");
-		dataValue.setAlignment("alignment");
-		dataValue.setVisible(false);
-		dataValue.setHidden(false);
-		HtmlFormatter formatter = new HtmlFormatter();
-		dataValue.setCellFormatter(formatter);
-		dataValue.setBold(false);
-		dataValue.setRowFormatter(formatter);
-		dataValue.setFormatId("formatId");
-		dataValue.setCellFormat(false);
-		dataValue.setColId("colId");
-		dataValue.setDisplayName("displayName");
-		dataValue.setNowrap("nowrap");
-		dataValue.setHyperlinkURL("hyperlinkURL");
-		dataValue.setDisplayType("displayType");
-		dataValue.setActionImg("actionImg");
-
-		assertEquals(dataValue.getDisplayName(), "displayName");
-		assertEquals(dataValue.getDisplayCalculatedValue(), "displayCalculatedValue");
-		assertEquals(dataValue.getDrillDownURL(), "drillDownURL");
-		assertFalse(dataValue.isDrillDowninPoPUp());
-		assertEquals(dataValue.getIndentation(), "indentation");
-		assertEquals(dataValue.getAlignment(), "alignment");
-		assertFalse(dataValue.isVisible());
-		assertFalse(dataValue.isHidden());
-		assertEquals(dataValue.getCellFormatter(), formatter);
-		assertEquals(dataValue.getRowFormatter(), formatter);
-		assertEquals(dataValue.getFormatId(), "formatId");
-		assertFalse(dataValue.isBold());
-		assertEquals(dataValue.getColId(), "colId");
-		assertEquals(dataValue.getDisplayName(), "displayName");
-		assertEquals(dataValue.getNowrap(), "nowrap");
-		assertEquals(dataValue.getHyperlinkURL(), "hyperlinkURL");
-		assertEquals(dataValue.getDisplayType(), "displayType");
-		assertEquals(dataValue.getActionImg(), "actionImg");
-	}
+    }
+    
+    @Test
+    public void mockDataValueTest() {
+        
+        assertEquals(dataValue.getDisplayName(), "displayName");
+        assertEquals(dataValue.getDisplayCalculatedValue(), "displayCalculatedValue");
+        assertEquals(dataValue.getDrillDownURL(), "drillDownURL");
+        assertFalse(dataValue.isDrillDowninPoPUp());
+        assertEquals(dataValue.getIndentation(), "indentation");
+        assertEquals(dataValue.getAlignment(), "alignment");
+        assertFalse(dataValue.isVisible());
+        assertFalse(dataValue.isHidden());
+        assertEquals(dataValue.getCellFormatter(), formatter);
+        assertEquals(dataValue.getRowFormatter(), formatter);
+        assertEquals(dataValue.getFormatId(), "formatId");
+        assertFalse(dataValue.isBold());
+        assertEquals(dataValue.getColId(), "colId");
+        assertEquals(dataValue.getDisplayName(), "displayName");
+        assertEquals(dataValue.getNowrap(), "nowrap");
+        assertEquals(dataValue.getHyperlinkURL(), "hyperlinkURL");
+        assertEquals(dataValue.getDisplayType(), "displayType");
+        assertEquals(dataValue.getActionImg(), "actionImg");
+    }
 
+    @Test
+    public void testGetDisplayValueHtml()
+    {
+        assertEquals(" ", dataValue.getDisplayValueHtml());
+    }
+    
+    @Test
+    public void testGetDisplayValueLinkHtml()
+    {
+        String drillDown="\"drillDownURL\"";
+        String s="<a href="+drillDown+">&nbsp;</a>";
+        assertEquals(s, dataValue.getDisplayValueLinkHtml());
+    }
+    
+    @Test
+    public void testGetAlignmentHtml()
+    {
+        assertEquals(" align=alignment", dataValue.getAlignmentHtml());
+    }
+    
+    @Test
+    public void testBgColorHtml()
+    {
+        assertEquals("", dataValue.getBgColorHtml());
+    }
 }