summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-core
diff options
context:
space:
mode:
Diffstat (limited to 'ecomp-sdk/epsdk-core')
-rw-r--r--ecomp-sdk/epsdk-core/pom.xml8
-rw-r--r--ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/JsonMessageTest.java16
-rw-r--r--ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/MessagesListTest.java9
-rw-r--r--ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/UserUtilsTest.java164
4 files changed, 191 insertions, 6 deletions
diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml
index d15b18ff..0e78c057 100644
--- a/ecomp-sdk/epsdk-core/pom.xml
+++ b/ecomp-sdk/epsdk-core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-project</artifactId>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
</parent>
<!-- GroupId is inherited from parent -->
@@ -451,7 +451,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>3.17</version>
+ <version>3.5-FINAL</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
- <version>3.17</version>
+ <version>3.5-FINAL</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -481,7 +481,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
- <version>3.17</version>
+ <version>3.5-FINAL</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/JsonMessageTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/JsonMessageTest.java
index 0e732a91..fbc95cd5 100644
--- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/JsonMessageTest.java
+++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/JsonMessageTest.java
@@ -38,6 +38,7 @@
package org.onap.portalsdk.core.web.support;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import org.junit.Test;
@@ -66,4 +67,19 @@ public class JsonMessageTest {
assertEquals(jsonMessage.getData2(), jsonMessage1.getData2());
assertEquals(jsonMessage.getData3(), jsonMessage1.getData3());
}
+
+ @SuppressWarnings("static-access")
+ @Test
+ public void buildJsonResponseTest(){
+ JsonMessage jsonMsg = mockJsonMessage();
+ assertNotNull(jsonMsg.buildJsonResponse(true, "test"));
+ }
+
+ @SuppressWarnings("static-access")
+ @Test
+ public void buildJsonResponseExceptionTest(){
+ JsonMessage jsonMsg = mockJsonMessage();
+ assertNotNull(jsonMsg.buildJsonResponse(new Exception("test exception")));
+ }
+
}
diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/MessagesListTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/MessagesListTest.java
index 4d13eda1..a7951210 100644
--- a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/MessagesListTest.java
+++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/MessagesListTest.java
@@ -39,6 +39,8 @@ package org.onap.portalsdk.core.web.support;
import static org.junit.Assert.*;
+import java.util.ArrayList;
+
import org.junit.Test;
public class MessagesListTest {
@@ -63,11 +65,14 @@ public class MessagesListTest {
messagesList.setIncludeCauseInCustomExceptions(false);
messagesList.setSuccessMessageDisplayed(false);
messagesList.setSuccessMessages(null);
-
assertEquals(messagesList.getExceptionMessages(), messagesList1.getExceptionMessages());
assertEquals(messagesList.getSuccessMessages(), messagesList1.getSuccessMessages());
assertEquals(messagesList.isIncludeCauseInCustomExceptions(), messagesList1.isIncludeCauseInCustomExceptions());
assertEquals(messagesList.isSuccessMessageDisplayed(), messagesList1.isSuccessMessageDisplayed());
-
+ messagesList = new MessagesList();
+ messagesList.addSuccessMessage(new FeedbackMessage());
+ messagesList.addExceptionMessage(new FeedbackMessage());
+ assertTrue(messagesList.hasExceptionMessages());
+ assertTrue(messagesList.hasSuccessMessages());
}
}
diff --git a/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/UserUtilsTest.java b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/UserUtilsTest.java
new file mode 100644
index 00000000..fe63b70a
--- /dev/null
+++ b/ecomp-sdk/epsdk-core/src/test/java/org/onap/portalsdk/core/web/support/UserUtilsTest.java
@@ -0,0 +1,164 @@
+/*
+ * ============LICENSE_START==========================================
+ * ONAP Portal SDK
+ * ===================================================================
+ * Copyright © 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 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.web.support;
+
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.onap.portalsdk.core.domain.MenuData;
+import org.onap.portalsdk.core.domain.Role;
+import org.onap.portalsdk.core.domain.RoleFunction;
+import org.onap.portalsdk.core.domain.User;
+import org.onap.portalsdk.core.util.SystemProperties;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({AppUtils.class, SystemProperties.class})
+public class UserUtilsTest {
+ @Mock
+ HttpServletRequest request;
+ @Mock
+ HttpSession session;
+ @Mock
+ User user;
+ @Mock
+ ServletContext servletContext;
+
+ SortedSet<Role> roles;
+
+ @Before
+ public void setUp() {
+ PowerMockito.mockStatic(AppUtils.class);
+ PowerMockito.mockStatic(SystemProperties.class);
+ Mockito.when(AppUtils.getSession(request)).thenReturn(session);
+ Mockito.when(request.getSession(true)).thenReturn(session);
+ Mockito.when(request.getSession()).thenReturn(session);
+ Mockito.when(session.getServletContext()).thenReturn(servletContext);
+ Mockito.when(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME)).thenReturn("user");
+ Mockito.when(SystemProperties.getProperty(SystemProperties.APPLICATION_USER_ID)).thenReturn("1");
+ Mockito.when(session.getAttribute("user")).thenReturn(user);
+ SortedSet<Role> roles = new TreeSet<>();
+ Role role = new Role();
+ role.setActive(true);
+ role.setId(1L);
+ Set<RoleFunction> roleFunctionSet = new HashSet<>();
+ RoleFunction rf = new RoleFunction();
+ rf.setName("test");
+ rf.setCode("test");
+ rf.setType("test");
+ rf.setAction("test");
+ roleFunctionSet.add(rf);
+ role.setRoleFunctions(roleFunctionSet);
+ Role childRole = new Role();
+ childRole.setActive(true);
+ childRole.setId(1L);
+ HashSet childRoles = new HashSet<>();
+ childRoles.add(childRole);
+ role.setChildRoles(childRoles);
+ roles.add(role);
+ Mockito.when(user.getRoles()).thenReturn(roles);
+ }
+
+ @Test
+ public void testSetUserSession() {
+ Set set = new HashSet<>();
+ MenuData menuData = new MenuData();
+ menuData.setFunctionCd("test");
+ set.add(menuData);
+ List<RoleFunction> roleFunctionList = new ArrayList<>();
+ roleFunctionList.add(new RoleFunction());
+ UserUtils.setUserSession(request, user, set, set, "test", roleFunctionList);
+ }
+
+ @Test
+ public void testHasRole() {
+ UserUtils.hasRole(request, "1");
+ }
+
+ @Test
+ public void testHasRoleByUser() {
+ UserUtils.hasRole(user, "1");
+ }
+
+ @Test
+ public void testGetLoginMethod() {
+ UserUtils.getLoginMethod(request);
+ }
+
+ @Test
+ public void testGetUserId() {
+ UserUtils.getUserId(request);
+ }
+
+ @Test
+ public void testGetStackTrace() {
+ UserUtils.getStackTrace(new Exception("test exception"));
+ }
+
+ @Test
+ public void testConvertToEcompUser() {
+ UserUtils.convertToEcompUser(user);
+ }
+
+ @Test
+ public void testGetRequestId() {
+ Enumeration<String> headerNames = Mockito.mock(Enumeration.class);
+ Mockito.when(headerNames.hasMoreElements()).thenReturn(true);
+ Mockito.when(headerNames.nextElement()).thenReturn("X-ECOMP-RequestID");
+ Mockito.when(request.getHeader("X-ECOMP-RequestID")).thenReturn("test");
+ Mockito.when(request.getHeaderNames()).thenReturn(headerNames);
+ UserUtils.getRequestId(request);
+ }
+}