summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-analytics
diff options
context:
space:
mode:
Diffstat (limited to 'ecomp-sdk/epsdk-analytics')
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java12
-rw-r--r--ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java12
-rw-r--r--ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/line/LineInfoTest.java8
-rw-r--r--ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/ColorPropertiesTest.java6
-rw-r--r--ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/search/SearchResultColumnTest.java68
-rw-r--r--ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/search/SearchResultTest.java79
-rw-r--r--ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/FusionAdapterTest.java10
-rw-r--r--ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/util/ExcelColorDefTest.java64
-rw-r--r--ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/view/DataValueTest.java122
9 files changed, 325 insertions, 56 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java
index 60c45b4f..4839f115 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ChartD3Helper.java
@@ -1,9 +1,9 @@
/*
- * ============LICENSE_START==========================================
+ * ================LICENSE_START==========================================
* ONAP Portal SDK
- * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
+ * =======================================================================
+ * Copyright © 2017-2018 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");
@@ -31,7 +31,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- * ============LICENSE_END============================================
+ * ================LICENSE_END============================================
*
*
*/
@@ -3083,7 +3083,7 @@ public class ChartD3Helper {
StringBuffer groupBuffer = new StringBuffer("");
StringBuffer s = new StringBuffer("");
dataStr.append("{");
- dataStr.append(" \"ss4262\":{\n");
+ dataStr.append(" \"xxxxxx\":{\n");
String mid = "";
String mid_old = "";
String level = "-1";
diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java
index 52e0b1a1..7cfacadd 100644
--- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/controller/WizardProcessorTest.java
@@ -1,9 +1,9 @@
/*
- * ============LICENSE_START==========================================
+ * ============LICENSE_START==============================================
* ONAP Portal SDK
- * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
+ * =======================================================================
+ * Copyright © 2017-2018 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");
@@ -31,7 +31,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- * ============LICENSE_END============================================
+ * ============LICENSE_END================================================
*
*
*/
@@ -412,7 +412,7 @@ public class WizardProcessorTest {
mockHttpAttribute("hideExcelIcons","N");
mockHttpAttribute("hidePDFIcons","N");
- mockHttpAttribute("dataSource","org.att.onap.DataSource");
+ mockHttpAttribute("dataSource","org.onap.DataSource");
mockHttpAttribute("numFormCols","10");
mockHttpAttribute("reportTitle","ONAP Portal User Report");
diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/line/LineInfoTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/line/LineInfoTest.java
index 5ff6e78b..f9a5ee2d 100644
--- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/line/LineInfoTest.java
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/line/LineInfoTest.java
@@ -114,4 +114,12 @@ public class LineInfoTest {
assertEquals("length", list.get(0));
}
+ @Test
+ public void getAttributeKeysTest() throws Exception {
+ Map<String, String> lineAttributes1 = new HashMap<>();
+ lineAttributes1.put("length", "200cm");
+ lineInfo.initializeAttributes(lineAttributes1);
+ List<String> list = lineInfo.getAttributeKeys();
+ assertEquals("length", list.get(0));
+ }
}
diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/ColorPropertiesTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/ColorPropertiesTest.java
index 07d9a926..b6dc00e4 100644
--- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/ColorPropertiesTest.java
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/ColorPropertiesTest.java
@@ -61,6 +61,7 @@ public class ColorPropertiesTest {
colorProperties.setColor(TYPE, COLOR);
colorProperties.setShape(TYPE, SHAPE);
colorProperties.setSize(TYPE, SIZE);
+ colorProperties.setSize(TYPE, NUMBER, SIZE);
colorProperties.setShape(TYPE, NUMBER, SHAPE);
}
@@ -90,4 +91,9 @@ public class ColorPropertiesTest {
public void testGetSize() {
assertEquals(100, colorProperties.getSize(TYPE));
}
+
+ @Test
+ public void testGetSizeWithNumber() {
+ assertEquals(100, colorProperties.getSize(TYPE, NUMBER));
+ }
}
diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/search/SearchResultColumnTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/search/SearchResultColumnTest.java
new file mode 100644
index 00000000..07b259a7
--- /dev/null
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/search/SearchResultColumnTest.java
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright © 2018 IBM.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file 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.
+ *****************************************************************************
+ *
+ *
+ */
+
+package org.onap.portalsdk.analytics.model.search;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SearchResultColumnTest {
+ private SearchResultColumn searchResultColumn;
+
+ @Before
+ public void setUp() {
+ searchResultColumn = new SearchResultColumn( "columnId",
+ "columnTitle",
+ "columnWidth",
+ "alignment",
+ "linkURL",
+ "linkTitle",
+ "linkForm",
+ "linkConfirmMsg",
+ "linkImg",
+ "linkImgWidth",
+ "linkImgHeight",
+ true,
+ false,
+ false,
+ true);
+ }
+
+ @Test
+ public void testAllValues() {
+ Assert.assertEquals("columnTitle", searchResultColumn.getColumnTitle());
+ Assert.assertEquals("columnWidth", searchResultColumn.getColumnWidth());
+ Assert.assertEquals("alignment", searchResultColumn.getAlignment());
+ Assert.assertEquals("linkURL", searchResultColumn.getLinkURL());
+ Assert.assertEquals("linkTitle", searchResultColumn.getLinkTitle());
+ Assert.assertEquals("linkForm", searchResultColumn.getLinkForm());
+ Assert.assertEquals("linkConfirmMsg", searchResultColumn.getLinkConfirmMsg());
+ Assert.assertEquals("linkImg", searchResultColumn.getLinkImg());
+ Assert.assertEquals("linkImgWidth", searchResultColumn.getLinkImgWidth());
+ Assert.assertEquals("linkImgHeight", searchResultColumn.getLinkImgHeight());
+ Assert.assertEquals(true, searchResultColumn.isCopyLink());
+ Assert.assertEquals(false, searchResultColumn.isEditLink());
+ Assert.assertEquals(false, searchResultColumn.isDeleteLink());
+ Assert.assertEquals(true, searchResultColumn.isScheduleLink());
+ }
+}
diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/search/SearchResultTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/search/SearchResultTest.java
new file mode 100644
index 00000000..7d2fca1e
--- /dev/null
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/search/SearchResultTest.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright © 2018 IBM.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file 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.
+ *****************************************************************************
+ *
+ *
+ */
+
+package org.onap.portalsdk.analytics.model.search;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SearchResultTest {
+ private SearchResult searchResult;
+
+ @Before
+ public void setUp() {
+ searchResult = new SearchResult(1, 10, 1,2);
+ }
+
+ @Test
+ public void testGetPageNo() {
+ Assert.assertEquals(1, searchResult.getPageNo());
+ }
+
+ @Test
+ public void testGetPageSize() {
+ Assert.assertEquals(10, searchResult.getPageSize());
+ }
+
+ @Test
+ public void testGetSetDataSize() {
+ Assert.assertEquals(-1, searchResult.getDataSize());
+ }
+
+ @Test
+ public void testGetSetCsvPageFileName() {
+ searchResult.setCsvPageFileName("CSvFile");
+ Assert.assertEquals("CSvFile", searchResult.getCsvPageFileName());
+ }
+
+ @Test
+ public void testGetSetCsvAllRowsFileName() {
+ searchResult.setCsvAllRowsFileName("CSvAlRowsFile");
+ Assert.assertEquals("CSvAlRowsFile", searchResult.getCsvAllRowsFileName());
+ }
+
+ @Test
+ public void TestGetExcelAllRowsFileName() {
+ Assert.assertEquals(null, searchResult.getExcelAllRowsFileName());
+ }
+
+ @Test
+ public void TestAddColumn() {
+ SearchResultColumn col = new SearchResultColumn("1", "Column1", "10", "left",
+ "url", "column1", "linkForm", "linkConfirmMsg",
+ "linkImg", "10", "10", true,
+ true, false, true);
+ searchResult.addColumn(col);
+ Assert.assertEquals(col, searchResult.getColumn(0));
+ Assert.assertEquals(1, searchResult.getNumColumns());
+ }
+}
diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/FusionAdapterTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/FusionAdapterTest.java
index 27bd839b..4600ac89 100644
--- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/FusionAdapterTest.java
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/system/fusion/adapter/FusionAdapterTest.java
@@ -45,8 +45,10 @@ public class FusionAdapterTest {
FusionAdapter fa=new FusionAdapter();
ComboPooledDataSource dataSource;
- Map<String,ComboPooledDataSource> dataSourceMap;
+ Map<String,ComboPooledDataSource> dataSourceMap;
ServletContext servletContext;
+
+
@Test
public void test() {
fa.setDataSource(dataSource);
@@ -55,4 +57,10 @@ public class FusionAdapterTest {
assertEquals(fa.getDataSource(), dataSource);
assertEquals(fa.getServletContext(), servletContext);
}
+
+ @Test
+ public void releaseConnectionTest() throws Exception{
+ fa.releaseConnection(null);
+ }
+
}
diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/util/ExcelColorDefTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/util/ExcelColorDefTest.java
new file mode 100644
index 00000000..dcc05976
--- /dev/null
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/util/ExcelColorDefTest.java
@@ -0,0 +1,64 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 2018 IBM 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.analytics.util;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({ExcelColorDef.class})
+public class ExcelColorDefTest{
+
+ @Before
+ public void setUp(){
+ ExcelColorDef.initializeExcelColorDef();
+ }
+
+ @Test
+ public void getExcelColorTest(){
+ assertNotNull(ExcelColorDef.getExcelColor("#FFFF00"));
+ assertNotNull(ExcelColorDef.getExcelColor(Mockito.anyString()));
+ }
+}
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("&nbsp;", 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());
+ }
}