summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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/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/RowHeaderColTest.java63
-rw-r--r--ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/view/RowHeaderTest.java35
-rw-r--r--ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java12
-rw-r--r--ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/MenuListControllerTest.java8
-rw-r--r--ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/model/ResultTest.java62
-rw-r--r--ecomp-sdk/epsdk-app-os/db-scripts/readme10
-rw-r--r--ecomp-sdk/epsdk-app-os/src/main/resources/music.properties14
-rw-r--r--ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties10
-rw-r--r--ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml26
-rw-r--r--ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java6
-rw-r--r--ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/onboarding/ueb/FunctionalMenuTest.java53
-rw-r--r--ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/onboarding/ueb/UebExceptionTest.java66
-rw-r--r--ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java4
-rw-r--r--ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/fw/test/DomainTest.java233
-rw-r--r--ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/fw/test/InMemoryRestServer.java49
-rw-r--r--ecomp-sdk/epsdk-music/src/test/java/org/onap/portalapp/music/conf/MusicHttpSessionConfigurationTest.java59
-rw-r--r--ecomp-sdk/epsdk-music/src/test/java/org/onap/portalapp/music/model/RestResponseTest.java32
-rw-r--r--ecomp-sdk/epsdk-workflow/src/test/java/org/onap/portalsdk/rnotebookintegration/exception/RNotebookIntegrationExceptionTest.java56
24 files changed, 685 insertions, 225 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/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/RowHeaderColTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/view/RowHeaderColTest.java
index 180abf02..932a4e75 100644
--- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/view/RowHeaderColTest.java
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/view/RowHeaderColTest.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");
@@ -35,6 +37,7 @@
*
*
*/
+
package org.onap.portalsdk.analytics.view;
import static org.junit.Assert.*;
@@ -43,33 +46,39 @@ import org.junit.Test;
public class RowHeaderColTest {
- @Test
- public void mockRowHeaderColTest() {
- RowHeaderCol rowHeaderCol = new RowHeaderCol();
- rowHeaderCol.setColumnTitle("columnTitle");
- rowHeaderCol.setColumnWidth("columnWidth");
- rowHeaderCol.setAlignment("alignment");
- rowHeaderCol.setColId("colId");
- rowHeaderCol.setDisplayHeaderAlignment(null);
- assertNull(rowHeaderCol.getDisplayHeaderAlignment());
- assertEquals(rowHeaderCol.getColId(), "colId");
- assertEquals(rowHeaderCol.getColumnTitle(), "columnTitle");
- assertEquals(rowHeaderCol.getColumnWidth(), "columnWidth");
- assertEquals(rowHeaderCol.getAlignment(), "alignment");
- assertEquals(rowHeaderCol.getColumnTitleHtml(), "columnTitle");
- assertEquals(rowHeaderCol.getColumnWidthHtml(), " width=columnWidth");
- assertEquals(rowHeaderCol.getAlignmentHtml(), " align=alignment");
- rowHeaderCol.resetNext();
- RowHeader rowHeader = new RowHeader();
- rowHeaderCol.addRowHeader(rowHeader);
- rowHeaderCol.addRowHeader(1, rowHeader);
- rowHeaderCol.setColumnTitle("");
- rowHeaderCol.setColumnWidth("");
- rowHeaderCol.setAlignment("");
- assertEquals(rowHeaderCol.getColumnTitleHtml(), "&nbsp;");
- assertEquals(rowHeaderCol.getColumnWidthHtml(), "");
- assertEquals(rowHeaderCol.getAlignmentHtml(), " align=center");
+ @Test
+ public void mockRowHeaderColTest() {
+ RowHeaderCol rowHeaderCol = new RowHeaderCol();
+ rowHeaderCol.setColumnTitle("columnTitle");
+ rowHeaderCol.setColumnWidth("columnWidth");
+ rowHeaderCol.setAlignment("alignment");
+ rowHeaderCol.setColId("colId");
+ rowHeaderCol.setDisplayHeaderAlignment(null);
+ rowHeaderCol.setNowrap("noWrap");
+ rowHeaderCol.setVisible(true);
+ assertEquals("noWrap", rowHeaderCol.getNowrap());
+ assertEquals(true, rowHeaderCol.isVisible());
+ assertNull(rowHeaderCol.getDisplayHeaderAlignment());
+ assertEquals(rowHeaderCol.getColId(), "colId");
+ assertEquals(rowHeaderCol.getColumnTitle(), "columnTitle");
+ assertEquals(rowHeaderCol.getColumnWidth(), "columnWidth");
+ assertEquals(rowHeaderCol.getAlignment(), "alignment");
+ assertEquals(rowHeaderCol.getColumnTitleHtml(), "columnTitle");
+ assertEquals(rowHeaderCol.getColumnWidthHtml(), " width=columnWidth");
+ assertEquals(rowHeaderCol.getAlignmentHtml(), " align=alignment");
+ rowHeaderCol.resetNext();
+ RowHeader rowHeader = new RowHeader();
+ rowHeaderCol.addRowHeader(rowHeader);
+ rowHeaderCol.addRowHeader(1, rowHeader);
+ rowHeaderCol.setColumnTitle("");
+ rowHeaderCol.setColumnWidth("");
+ rowHeaderCol.setAlignment("");
+ assertTrue(rowHeaderCol.hasNext());
+ assertNotNull(rowHeaderCol.getNext());
+ assertEquals(rowHeaderCol.getColumnTitleHtml(), "&nbsp;");
+ assertEquals(rowHeaderCol.getColumnWidthHtml(), "");
+ assertEquals(rowHeaderCol.getAlignmentHtml(), " align=center");
- }
+ }
}
diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/view/RowHeaderTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/view/RowHeaderTest.java
index 6578ad6a..61d8d6d6 100644
--- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/view/RowHeaderTest.java
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/view/RowHeaderTest.java
@@ -5,7 +5,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");
* you may not use this software except in compliance with the License.
@@ -43,18 +44,22 @@ import org.junit.Test;
public class RowHeaderTest {
- @Test
- public void mockRowHeaderTest() {
- RowHeader rowHeader = new RowHeader();
- rowHeader.setRowTitle("rowTitle");
- rowHeader.setRowHeight("rowHeight");
- rowHeader.setRowSpan(1);
- rowHeader.setColSpan(1);
- rowHeader.setBold(false);
- assertEquals(rowHeader.getRowTitle(), "rowTitle");
- assertEquals(rowHeader.getRowHeight(), "rowHeight");
- assertEquals(rowHeader.getRowSpan(), 1);
- assertEquals(rowHeader.getColSpan(), 1);
- assertFalse(rowHeader.isBold());
- }
+ @Test
+ public void mockRowHeaderTest() {
+ RowHeader rowHeader = new RowHeader();
+ rowHeader.setRowTitle("rowTitle");
+ rowHeader.setRowHeight("rowHeight");
+ rowHeader.setRowSpan(1);
+ rowHeader.setColSpan(1);
+ rowHeader.setBold(false);
+ assertEquals("rowTitle", rowHeader.getRowTitleHtml());
+ assertEquals(" height=rowHeight", rowHeader.getRowHeightHtml());
+ assertEquals("", rowHeader.getRowSpanHtml());
+ assertEquals("", rowHeader.getColSpanHtml());
+ assertEquals(rowHeader.getRowTitle(), "rowTitle");
+ assertEquals(rowHeader.getRowHeight(), "rowHeight");
+ assertEquals(rowHeader.getRowSpan(), 1);
+ assertEquals(rowHeader.getColSpan(), 1);
+ assertFalse(rowHeader.isBold());
+ }
}
diff --git a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java
index a6ffb038..8883cfa8 100644
--- a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java
+++ b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java
@@ -2,7 +2,7 @@
* ============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
@@ -108,7 +108,7 @@ public class LogoutControllerTest {
ServletRequestAttributes ServletRequestAttributes = new ServletRequestAttributes(mockedRequest);
Mockito.when(RequestContextHolder.currentRequestAttributes()).thenReturn(ServletRequestAttributes);
Mockito.when(PortalApiProperties
- .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp");
+ .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");
logoutController.globalLogout(mockedRequest);
}
@@ -117,20 +117,20 @@ public class LogoutControllerTest {
PowerMockito.mockStatic(PortalApiProperties.class);
PowerMockito.mockStatic(PortalApiConstants.class);
Mockito.when(PortalApiProperties
- .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp");
+ .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");
assertNull(logoutController.globalLogout(mockedRequest));
}
@Test
public void appLogoutTest(){
- ModelAndView actualModelView = new ModelAndView("redirect:https://portal.openecomp.org/ecompportal/process_csp");
+ ModelAndView actualModelView = new ModelAndView("redirect:http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");
PowerMockito.mockStatic(PortalApiProperties.class);
PowerMockito.mockStatic(PortalApiConstants.class);
PowerMockito.mockStatic(RequestContextHolder.class);
ServletRequestAttributes ServletRequestAttributes = new ServletRequestAttributes(mockedRequest);
Mockito.when(RequestContextHolder.currentRequestAttributes()).thenReturn(ServletRequestAttributes);
Mockito.when(PortalApiProperties
- .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp");
+ .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");
ModelAndView expectedModelView = logoutController.appLogout(mockedRequest);
assertEquals(actualModelView.getViewName(), expectedModelView.getViewName());
}
@@ -140,7 +140,7 @@ public class LogoutControllerTest {
PowerMockito.mockStatic(PortalApiProperties.class);
PowerMockito.mockStatic(PortalApiConstants.class);
Mockito.when(PortalApiProperties
- .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp");
+ .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");
assertNull(logoutController.appLogout(mockedRequest));
}
diff --git a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/MenuListControllerTest.java b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/MenuListControllerTest.java
index 2d6c0cd1..cc935b38 100644
--- a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/MenuListControllerTest.java
+++ b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/MenuListControllerTest.java
@@ -193,7 +193,7 @@ public class MenuListControllerTest {
Mockito.when(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME)).thenReturn("user");
Mockito.when(session.getAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME))).thenReturn(user);
Mockito.when(PortalApiProperties
- .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp");
+ .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");
StringWriter sw = new StringWriter();
PrintWriter writer = new PrintWriter(sw);
Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
@@ -206,7 +206,7 @@ public class MenuListControllerTest {
PowerMockito.mockStatic(PortalApiConstants.class);
Mockito.when(mockedRequest.getParameter("page")).thenReturn("contact");
Mockito.when(PortalApiProperties
- .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp");
+ .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");
StringWriter sw = new StringWriter();
PrintWriter writer = new PrintWriter(sw);
Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
@@ -219,7 +219,7 @@ public class MenuListControllerTest {
PowerMockito.mockStatic(PortalApiConstants.class);
Mockito.when(mockedRequest.getParameter("page")).thenReturn("access");
Mockito.when(PortalApiProperties
- .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp");
+ .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");
StringWriter sw = new StringWriter();
PrintWriter writer = new PrintWriter(sw);
Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
@@ -231,7 +231,7 @@ public class MenuListControllerTest {
PowerMockito.mockStatic(PortalApiProperties.class);
PowerMockito.mockStatic(PortalApiConstants.class);
Mockito.when(PortalApiProperties
- .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("https://portal.openecomp.org/ecompportal/process_csp");
+ .getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");
StringWriter sw = new StringWriter();
PrintWriter writer = new PrintWriter(sw);
Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
diff --git a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/model/ResultTest.java b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/model/ResultTest.java
new file mode 100644
index 00000000..e1e298a8
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/model/ResultTest.java
@@ -0,0 +1,62 @@
+/*
+ * ============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.portalapp.model;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.junit.Before;
+
+public class ResultTest {
+
+ private Result result;
+
+ @Before
+ public void setUp()
+ {
+ result = new Result("Success");
+ }
+
+ @Test
+ public void testGetSetResult()
+ {
+ result.setResult("failure");
+ assertEquals("failure", result.getResult());
+ }
+}
diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/readme b/ecomp-sdk/epsdk-app-os/db-scripts/readme
index 0330789d..81944bb7 100644
--- a/ecomp-sdk/epsdk-app-os/db-scripts/readme
+++ b/ecomp-sdk/epsdk-app-os/db-scripts/readme
@@ -9,22 +9,22 @@ Directions:
DDL
For ONAP Amsterdam instance run EcompSdkDDLMySql_1710_Common.sql add script EcompSdkDDLMySql_1710_OS.sql.
-EcompSdkDDLMySql_1710_Common.sql - this is the DDL entries that both Opensource and AT&T have in common
+EcompSdkDDLMySql_1710_Common.sql - this is a common DDL file
EcompSdkDDLMySql_1710_OS.sql - this is the specific DDL entries that only OS needs, empty placeholder
For ONAP Beijing instance run EcompSdkDDLMySql_2_1_Common.sql add script EcompSdkDDLMySql_2_1_OS.sql.
-EcompSdkDDLMySql_2_1_Common.sql - this is the DDL entries that both Opensource and AT&T have in common
+EcompSdkDDLMySql_2_1_Common.sql - this is a common DDL file
EcompSdkDDLMySql_2_1_OS.sql - this is the specific DDL entries that only OS needs, empty placeholder
For ONAP Beijing instance run EcompSdkDDLMySql_2_2_common.sql and script EcompSdkDDLMySql_2_2_OS.sql.
-EcompSdkDDLMySql_2_2_Common.sql - this is the DDL entries that both Opensource and AT&T have in common
+EcompSdkDDLMySql_2_2_Common.sql - this is a common DDL file
EcompSdkDDLMySql_2_2_OS.sql - this is the specific DDL entries that only OS needs, empty placeholder
For ONAP Casablanca instance run EcompSdkDDLMySql_2_4_common.sql and script EcompSdkDDLMySql_2_4_OS.sql.
-EcompSdkDDLMySql_2_4_Common.sql - this is the DDL entries that both Opensource and AT&T have in common
+EcompSdkDDLMySql_2_4_Common.sql - this is a common DDL file
EcompSdkDDLMySql_2_4_OS.sql - this is the specific DDL entries that only OS needs, empty placeholder
DML
@@ -63,4 +63,4 @@ EcompSdkMySql_Rollback_2_1_to_1710_Common.sql
Our Existing Partner Apps can call the following scripts to upgrade from 2_1 to 2_2 version
EcompSdkMySql_Upgrade_2_1_to_2_2_Common.sql
-EcompSdkMySql_Rollback_2_2_to_2_1_Common.sql \ No newline at end of file
+EcompSdkMySql_Rollback_2_2_to_2_1_Common.sql
diff --git a/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties b/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties
index d7951560..93e82e19 100644
--- a/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties
+++ b/ecomp-sdk/epsdk-app-os/src/main/resources/music.properties
@@ -13,19 +13,19 @@ music.cleanup.frequency = 6
#how old of session need to be cleaned up (hour)
music.cleanup.threshold = 10
music.enable = false
-cassandra.host=135.197.226.103
-zookeeper.host=135.197.226.103, 135.197.226.108, 135.197.226.119
+cassandra.host=localhost
+zookeeper.host=localhost1,localhost2,localhost3
cassandra.user=cassandra
cassandra.password=cassandra
#Music API
-#music.endpoint = http://vm-ep-dev4.research.att.com/MUSIC/rest/
+#music.endpoint = http://localhost/MUSIC/rest/
#music.version = v2
#music.keyspace = keyspaces
#music.x.minor.version = 3
#music.x.patch.version = 0
-#music.ns = com.att.ecomp.portal.demeter
-#music.user.id = m00468@portal.ecomp.att.com
-#music.password = friedG33nS-
+#music.ns = org.onap.portal
+#music.user.id = xxxxxx@org.onap.portal
+#music.password =
#music.consistency.info = type
-#music.consistency.info.value = eventual \ No newline at end of file
+#music.consistency.info.value = eventual
diff --git a/ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties b/ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties
index 05fd65c2..80a6b2b1 100644
--- a/ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties
+++ b/ecomp-sdk/epsdk-app-os/src/main/resources/portal.properties
@@ -2,7 +2,7 @@
# ============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
@@ -35,7 +35,7 @@
#
#
###
-# Properties read by ECOMP Framework library, ecompFW.jar
+# Properties read by ONAP Portal Framework library, ecompFW.jar
##########################################################################
# The following properties should NOT be changed by partner applications.
@@ -56,10 +56,10 @@ use_rest_for_functional_menu=true
portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl
# URL of the Portal where this app is onboarded
-ecomp_redirect_url = https://portal.onap.org/ecompportal/process_csp
+ecomp_redirect_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm
-# URL of the ECOMP Portal REST API
-ecomp_rest_url = http://portal.onap.org:50580/ecompportal/auxapi
+# URL of the ONAP Portal REST API
+ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi
# Applications do not need to run a UEB listener after 1607.
ueb_listeners_enable = false
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml
index 8392e8d4..a87e478d 100644
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml
+++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!---
+ ===============LICENSE_START=======================================================
+ ONAP Portal SDK
+ ===================================================================================
+ Copyright (C) 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");
+ 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
+
+ This file 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=========================================================
+
+-->
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee" xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee">
- <display-name>ecomp-sdk-app-os</display-name>
+ <display-name>ONAPPORTALSDK</display-name>
<!-- The app can function on a HA cluster -->
<distributable />
@@ -35,4 +57,4 @@
<location>/WEB-INF/jsp/error.jsp</location>
</error-page>
-</web-app> \ No newline at end of file
+</web-app>
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java
index d60fe567..d250591e 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java
@@ -2,7 +2,7 @@
* ============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
@@ -60,11 +60,11 @@ public class EELFLoggerAdvice {
@Autowired
private AppService appService;
- // DateTime Format according to the ECOMP Application Logging Guidelines.
+ // DateTime Format according to the ONAP Application Logging Guidelines.
private static final SimpleDateFormat ecompLogDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
/**
- * Gets the current date and time in expected ECOMP log format.
+ * Gets the current date and time in expected ONAP log format.
*
* @return Current date and time
*/
diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/onboarding/ueb/FunctionalMenuTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/onboarding/ueb/FunctionalMenuTest.java
new file mode 100644
index 00000000..6db82369
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/onboarding/ueb/FunctionalMenuTest.java
@@ -0,0 +1,53 @@
+/*
+ * ============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.core.onboarding.ueb;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class FunctionalMenuTest {
+
+ String userId="USERID";
+ @Test(expected=UebException.class)
+ public void testGet() throws Exception{
+ assertNotNull(FunctionalMenu.get(userId));
+ }
+
+}
diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/onboarding/ueb/UebExceptionTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/onboarding/ueb/UebExceptionTest.java
new file mode 100644
index 00000000..fa2ab40a
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/onboarding/ueb/UebExceptionTest.java
@@ -0,0 +1,66 @@
+/*
+ * ============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.core.onboarding.ueb;
+
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class UebExceptionTest {
+
+ UebException uebException;
+ private String ERRORMSG="Test Error";
+ private String TOPICNAME="Test Topic";
+ private String MSGID="Test Message ID";
+ private String MSG="Test Message";
+
+ @Before
+ public void init(){
+ uebException= new UebException(ERRORMSG,TOPICNAME,MSGID,MSG);
+ }
+
+ @Test
+ public void testUebException() {
+ assertNotNull(uebException);
+ assertEquals(MSG, uebException.getUebMsg());
+ assertEquals(TOPICNAME, uebException.getTopicName());
+ assertEquals(MSGID, uebException.getMsgId());
+ }
+}
diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java
index c92efb79..90addfe5 100644
--- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java
+++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java
@@ -2,7 +2,7 @@
* ============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
@@ -208,7 +208,7 @@ public class CipherUtil {
* Decrypts the text using the secret key in key.properties file.
*
* @param message
- * The encrypted string that must be decrypted using the ecomp
+ * The encrypted string that must be decrypted using the ONAP Portal
* Encryption Key
* @return The String decrypted
* @throws CipherUtilException
diff --git a/ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/fw/test/DomainTest.java b/ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/fw/test/DomainTest.java
index 45145e43..a212e4fa 100644
--- a/ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/fw/test/DomainTest.java
+++ b/ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/fw/test/DomainTest.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,6 +41,7 @@
package org.onap.portalsdk.fw.test;
import java.util.HashSet;
+import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -52,118 +55,132 @@ import org.onap.portalsdk.core.restful.domain.SharedContext;
public class DomainTest extends AbstractModelTest {
- private final Log logger = LogFactory.getLog(DomainTest.class);
+ private final Log logger = LogFactory.getLog(DomainTest.class);
- @Test
- public void testPortalAPIResponse() {
- PortalAPIResponse m = new PortalAPIResponse(true, s1);
- Assert.assertEquals("ok", m.getStatus());
- Assert.assertEquals(s1, m.getMessage());
- logger.info(m.toString());
- }
+ @Test
+ public void testPortalAPIResponse() {
+ PortalAPIResponse m = new PortalAPIResponse(true, s1);
+ Assert.assertEquals("ok", m.getStatus());
+ Assert.assertEquals(s1, m.getMessage());
+ logger.info(m.toString());
+ }
- @Test
- public void testEcompRole() {
- EcompRole m = new EcompRole();
- m.setId(l1);
- m.setName(s1);
- Assert.assertEquals(l1, m.getId());
- Assert.assertEquals(s1, m.getName());
- Assert.assertTrue(m.equals(m));
- Assert.assertFalse(m.equals(new EcompRole()));
- Assert.assertNotNull(m.hashCode());
- logger.info(m.toString());
- }
+ @Test
+ public void testEcompRole() {
+ EcompRole m = new EcompRole();
+ EcompRole m1 = new EcompRole();
+ m1.setId(l1);
+ m.setId(l1);
+ m.setName(s1);
+ Set roleFunctions = new HashSet();
+ m.setRoleFunctions(roleFunctions);
+ Assert.assertEquals(roleFunctions, m.getRoleFunctions());
+ Assert.assertEquals(l1, m.getId());
+ Assert.assertEquals(s1, m.getName());
+ Assert.assertTrue(m.equals(m));
+ Assert.assertFalse(m.equals(new EcompRole()));
+ Assert.assertNotNull(m.hashCode());
+ Assert.assertEquals(0, m.compareTo(m1));
+ logger.info(m.toString());
+ }
- @Test
- public void testEcompUser() {
- EcompUser m = new EcompUser();
- m.setActive(false);
- m.setEmail(s1);
- m.setFirstName(s2);
- m.setHrid(s3);
- m.setJobTitle(s4);
- m.setLastName(s5);
- m.setLoginId(s6);
- m.setManagerId(s7);
- m.setMiddleInitial(s8);
- m.setOrgCode(s9);
- m.setOrgId(l1);
- m.setOrgManagerUserId(s10);
- // Start over at 1, but double
- m.setOrgUserId(s1 + s1);
- m.setPhone(s2 + s2);
- EcompRole r = new EcompRole();
- HashSet<EcompRole> roles = new HashSet<>();
- roles.add(r);
- m.setRoles(roles);
- Assert.assertEquals(false, m.isActive());
- Assert.assertEquals(s1, m.getEmail());
- Assert.assertEquals(s2, m.getFirstName());
- Assert.assertEquals(s3, m.getHrid());
- Assert.assertEquals(s4, m.getJobTitle());
- Assert.assertEquals(s5, m.getLastName());
- Assert.assertEquals(s6, m.getLoginId());
- Assert.assertEquals(s7, m.getManagerId());
- Assert.assertEquals(s8, m.getMiddleInitial());
- Assert.assertEquals(s9, m.getOrgCode());
- Assert.assertEquals(l1, m.getOrgId());
- Assert.assertEquals(s10, m.getOrgManagerUserId());
- Assert.assertEquals(s1 + s1, m.getOrgUserId());
- Assert.assertEquals(s2 + s2, m.getPhone());
- // this is weak
- Assert.assertEquals(roles, m.getRoles());
- Assert.assertTrue(m.equals(m));
- Assert.assertFalse(m.equals(null));
- Assert.assertFalse(m.equals(new EcompUser()));
- Assert.assertNotNull(m.hashCode());
- logger.info(m.toString());
- }
+ @Test
+ public void testEcompUser() {
+ EcompUser m = new EcompUser();
+ EcompUser m1 = new EcompUser();
+ m1.setLoginId(s6);
+ m.setActive(false);
+ m.setEmail(s1);
+ m.setFirstName(s2);
+ m.setHrid(s3);
+ m.setJobTitle(s4);
+ m.setLastName(s5);
+ m.setLoginId(s6);
+ m.setManagerId(s7);
+ m.setMiddleInitial(s8);
+ m.setOrgCode(s9);
+ m.setOrgId(l1);
+ m.setOrgManagerUserId(s10);
+ // Start over at 1, but double
+ m.setOrgUserId(s1 + s1);
+ m.setPhone(s2 + s2);
+ EcompRole r = new EcompRole();
+ HashSet<EcompRole> roles = new HashSet<>();
+ roles.add(r);
+ m.setRoles(roles);
+ Assert.assertEquals(false, m.isActive());
+ Assert.assertEquals(s1, m.getEmail());
+ Assert.assertEquals(s2, m.getFirstName());
+ Assert.assertEquals(s3, m.getHrid());
+ Assert.assertEquals(s4, m.getJobTitle());
+ Assert.assertEquals(s5, m.getLastName());
+ Assert.assertEquals(s6, m.getLoginId());
+ Assert.assertEquals(s7, m.getManagerId());
+ Assert.assertEquals(s8, m.getMiddleInitial());
+ Assert.assertEquals(s9, m.getOrgCode());
+ Assert.assertEquals(l1, m.getOrgId());
+ Assert.assertEquals(s10, m.getOrgManagerUserId());
+ Assert.assertEquals(s1 + s1, m.getOrgUserId());
+ Assert.assertEquals(s2 + s2, m.getPhone());
+ // this is weak
+ Assert.assertEquals(roles, m.getRoles());
+ Assert.assertTrue(m.equals(m));
+ Assert.assertFalse(m.equals(null));
+ Assert.assertFalse(m.equals(new EcompUser()));
+ Assert.assertNotNull(m.hashCode());
+ Assert.assertEquals(0, m.compareTo(m1));
+ logger.info(m.toString());
+ }
- @Test
- public void testPortalTimeoutVO() {
- PortalTimeoutVO m = new PortalTimeoutVO();
- m.setjSessionId(s1);
- m.setSessionTimOutMilliSec(l1);
- Assert.assertEquals(s1, m.getjSessionId());
- Assert.assertEquals(l1, m.getSessionTimOutMilliSec());
- Assert.assertTrue(m.equals(m));
- Assert.assertFalse(m.equals(null));
- Assert.assertFalse(m.equals(new PortalTimeoutVO()));
- }
+ @Test
+ public void testPortalTimeoutVO() {
+ PortalTimeoutVO m = new PortalTimeoutVO();
+ PortalTimeoutVO m1 = new PortalTimeoutVO();
+ m1.setSessionTimOutMilliSec(l1);
+ m.setjSessionId(s1);
+ m.setSessionTimOutMilliSec(l1);
+ Assert.assertEquals(s1, m.getjSessionId());
+ Assert.assertEquals(l1, m.getSessionTimOutMilliSec());
+ Assert.assertTrue(m.equals(m));
+ Assert.assertFalse(m.equals(null));
+ Assert.assertFalse(m.equals(new PortalTimeoutVO()));
+ Assert.assertEquals(0, m.compareTo(m1));
+ }
- @Test
- public void testSharedContext() {
- SharedContext m = new SharedContext();
- m.setAuditTrail(s1);
- m.setAuditUserId(s2);
- m.setCkey(s3);
- m.setContext_id(s4);
- m.setCreate_time(l1);
- m.setCreated(s5);
- m.setCreatedId(s6);
- m.setCvalue(s7);
- m.setId(l2);
- m.setModified(s8);
- m.setModifiedId(s9);
- m.setResponse(s10);
- m.setRowNum(s1 + s1);
- Assert.assertEquals(s1, m.getAuditTrail());
- Assert.assertEquals(s2, m.getAuditUserId());
- Assert.assertEquals(s3, m.getCkey());
- Assert.assertEquals(s4, m.getContext_id());
- Assert.assertEquals(l1, m.getCreate_time());
- Assert.assertEquals(s5, m.getCreated());
- Assert.assertEquals(s6, m.getCreatedId());
- Assert.assertEquals(s7, m.getCvalue());
- Assert.assertEquals(l2, m.getId());
- Assert.assertEquals(s8, m.getModified());
- Assert.assertEquals(s9, m.getModifiedId());
- Assert.assertEquals(s10, m.getResponse());
- Assert.assertEquals(s1 + s1, m.getRowNum());
- Assert.assertTrue(m.equals(m));
- Assert.assertFalse(m.equals(null));
- Assert.assertFalse(m.equals(new SharedContext()));
- }
+ @Test
+ public void testSharedContext() {
+ SharedContext m = new SharedContext();
+ m.setAuditTrail(s1);
+ m.setAuditUserId(s2);
+ m.setCkey(s3);
+ m.setContext_id(s4);
+ m.setCreate_time(l1);
+ m.setCreated(s5);
+ m.setCreatedId(s6);
+ m.setCvalue(s7);
+ m.setId(l2);
+ m.setModified(s8);
+ m.setModifiedId(s9);
+ m.setResponse(s10);
+ m.setRowNum(s1 + s1);
+ Assert.assertEquals(s1, m.getAuditTrail());
+ Assert.assertEquals(s2, m.getAuditUserId());
+ Assert.assertEquals(s3, m.getCkey());
+ Assert.assertEquals(s4, m.getContext_id());
+ Assert.assertEquals(l1, m.getCreate_time());
+ Assert.assertEquals(s5, m.getCreated());
+ Assert.assertEquals(s6, m.getCreatedId());
+ Assert.assertEquals(s7, m.getCvalue());
+ Assert.assertEquals(l2, m.getId());
+ Assert.assertEquals(s8, m.getModified());
+ Assert.assertEquals(s9, m.getModifiedId());
+ Assert.assertEquals(s10, m.getResponse());
+ Assert.assertEquals(s1 + s1, m.getRowNum());
+ Assert.assertTrue(m.equals(m));
+ Assert.assertFalse(m.equals(null));
+ Assert.assertFalse(m.equals(new SharedContext()));
+ Assert.assertTrue(m.toString() instanceof String);
+ Assert.assertTrue((Integer) m.hashCode() instanceof Integer);
+ }
}
diff --git a/ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/fw/test/InMemoryRestServer.java b/ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/fw/test/InMemoryRestServer.java
index 2c37e214..3877ae20 100644
--- a/ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/fw/test/InMemoryRestServer.java
+++ b/ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/fw/test/InMemoryRestServer.java
@@ -1,20 +1,39 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+/*
+ * ============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
- *
- * https://github.com/mp911de/rest-api-test
- *
- * Embedded InMemory REST server for RESTEasy. Usage:
- * <ul>
- * <li>InMemoryRestServer srv = InMemoryRestServer.create(...) passing your resources and provider classes</li>
- * <li>srv.baseUri() for BaseUrl</li>
- * <li>srv.newRequest("/relative/resource/path") to issue requests</li>
- * <li>srv.close() to stop</li>
- * </ul>
*
+ * 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.fw.test;
diff --git a/ecomp-sdk/epsdk-music/src/test/java/org/onap/portalapp/music/conf/MusicHttpSessionConfigurationTest.java b/ecomp-sdk/epsdk-music/src/test/java/org/onap/portalapp/music/conf/MusicHttpSessionConfigurationTest.java
new file mode 100644
index 00000000..783808b5
--- /dev/null
+++ b/ecomp-sdk/epsdk-music/src/test/java/org/onap/portalapp/music/conf/MusicHttpSessionConfigurationTest.java
@@ -0,0 +1,59 @@
+/*
+ * ============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.portalapp.music.conf;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class MusicHttpSessionConfigurationTest {
+
+ private MusicHttpSessionConfiguration config;
+
+ @Before
+ public void setUp() {
+ config = new MusicHttpSessionConfiguration();
+ }
+
+ @Test
+ public void testSessionRepository() {
+ assertTrue(config.sessionRepository() instanceof MusicSessionRepository);
+ }
+}
diff --git a/ecomp-sdk/epsdk-music/src/test/java/org/onap/portalapp/music/model/RestResponseTest.java b/ecomp-sdk/epsdk-music/src/test/java/org/onap/portalapp/music/model/RestResponseTest.java
index 2f2dfaaa..3fd87138 100644
--- a/ecomp-sdk/epsdk-music/src/test/java/org/onap/portalapp/music/model/RestResponseTest.java
+++ b/ecomp-sdk/epsdk-music/src/test/java/org/onap/portalapp/music/model/RestResponseTest.java
@@ -4,7 +4,8 @@
* ===================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ===================================================================
- *
+ * Modifications Copyright (C) 2018 IBM.
+ * ===================================================================
* 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.
@@ -43,16 +44,21 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
public class RestResponseTest {
-
- @Test
- public void restResponseTest() {
- RestResponse<String> expected = new RestResponse<>();
- expected.setMessage("testMessage");
- expected.setResponse("testResponse");
- expected.setStatus(RestStatusEnum.ERROR);
- RestResponse<String> actual = new RestResponse<String>(RestStatusEnum.ERROR, "testMessage", "testResponse");
- assertEquals(expected, actual);
- assertEquals(expected.hashCode(), actual.hashCode());
- assertTrue(actual.equals(expected));
- }
+
+ @Test
+ public void restResponseTest() {
+ RestResponse<String> expected = new RestResponse<>();
+ expected.setMessage("testMessage");
+ expected.setResponse("testResponse");
+ expected.setStatus(RestStatusEnum.ERROR);
+ RestResponse<String> actual = new RestResponse<String>(RestStatusEnum.ERROR, "testMessage", "testResponse");
+ assertEquals(expected, actual);
+ assertEquals(expected.hashCode(), actual.hashCode());
+ assertTrue(actual.equals(expected));
+ assertEquals(RestStatusEnum.ERROR, expected.getStatus());
+ assertEquals("testMessage", expected.getMessage());
+ assertEquals("testResponse", expected.getResponse());
+ String expectedtoStringOutput="RestResponse [status=error, message=testMessage, response=testResponse]";
+ assertEquals(expectedtoStringOutput,expected.toString());
+ }
}
diff --git a/ecomp-sdk/epsdk-workflow/src/test/java/org/onap/portalsdk/rnotebookintegration/exception/RNotebookIntegrationExceptionTest.java b/ecomp-sdk/epsdk-workflow/src/test/java/org/onap/portalsdk/rnotebookintegration/exception/RNotebookIntegrationExceptionTest.java
new file mode 100644
index 00000000..da14f31e
--- /dev/null
+++ b/ecomp-sdk/epsdk-workflow/src/test/java/org/onap/portalsdk/rnotebookintegration/exception/RNotebookIntegrationExceptionTest.java
@@ -0,0 +1,56 @@
+/*
+ * ============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.rnotebookintegration.exception;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(MockitoJUnitRunner.class)
+public class RNotebookIntegrationExceptionTest {
+
+ @Test
+ public void getErrorCodeTest(){
+ RNotebookIntegrationException rNoteObj = new RNotebookIntegrationException(new Exception());
+ RNotebookIntegrationException rNoteObjErrorCode = new RNotebookIntegrationException("1");
+ assertEquals("1",rNoteObjErrorCode.getErrorCode());
+ }
+}