From 6beb446925c967aca92f5513adf36c5db77c00d6 Mon Sep 17 00:00:00 2001 From: TATTAVARADA Date: Thu, 27 Apr 2017 07:53:18 -0400 Subject: [PORTAL-7] Rebase This rebasing includes common libraries and common overlays projects abstraction of components Change-Id: Ia1efa4deacdc5701e6205104ac021a6c80ed60ba Signed-off-by: st782s --- .../java/org/openecomp/portalapp/SanityTest.java | 20 ------------ .../controller/CollaborationControllerTest.java | 27 ---------------- .../openecomp/portalapp/controller/NetMapTest.java | 19 ----------- .../portalapp/service/ProfileServiceTest.java | 37 ---------------------- 4 files changed, 103 deletions(-) delete mode 100644 ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/SanityTest.java delete mode 100644 ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/controller/CollaborationControllerTest.java delete mode 100644 ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/controller/NetMapTest.java delete mode 100644 ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/service/ProfileServiceTest.java (limited to 'ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp') diff --git a/ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/SanityTest.java b/ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/SanityTest.java deleted file mode 100644 index d455b843..00000000 --- a/ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/SanityTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.openecomp.portalapp; - -import org.junit.Assert; -import org.junit.Test; -import org.openecomp.portalsdk.core.MockApplicationContextTestSuite; -import org.springframework.test.web.servlet.ResultActions; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; - -public class SanityTest extends MockApplicationContextTestSuite { - - @Test - public void testGetAvailableRoles() throws Exception { - - ResultActions ra =getMockMvc().perform(MockMvcRequestBuilders.get("/api/roles")); - //Assert.assertEquals(UrlAccessRestrictedException.class,ra.andReturn().getResolvedException().getClass()); - Assert.assertEquals("application/json",ra.andReturn().getResponse().getContentType()); - } - - -} diff --git a/ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/controller/CollaborationControllerTest.java b/ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/controller/CollaborationControllerTest.java deleted file mode 100644 index 099cf518..00000000 --- a/ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/controller/CollaborationControllerTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.openecomp.portalapp.controller; - -import org.junit.Assert; -import org.junit.Test; -import org.openecomp.portalsdk.core.MockApplicationContextTestSuite; -import org.openecomp.portalsdk.core.domain.User; -import org.openecomp.portalsdk.core.util.SystemProperties; -import org.springframework.test.web.servlet.ResultActions; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; - -public class CollaborationControllerTest extends MockApplicationContextTestSuite{ - - @Test - public void testGetAvailableRoles() throws Exception { - MockHttpServletRequestBuilder requestBuilder = MockMvcRequestBuilders.get("/collaborate_list"); - User user = new User(); - user.setId(1l); - user.setOrgUserId("abc"); - requestBuilder.sessionAttr(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME), user); - - ResultActions ra =getMockMvc().perform(requestBuilder); - Assert.assertEquals(2,ra.andReturn().getModelAndView().getModelMap().size()); - } - - -} diff --git a/ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/controller/NetMapTest.java b/ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/controller/NetMapTest.java deleted file mode 100644 index 4622f66e..00000000 --- a/ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/controller/NetMapTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.openecomp.portalapp.controller; - -import org.junit.Assert; -import org.junit.Test; -import org.openecomp.portalsdk.core.MockApplicationContextTestSuite; -import org.springframework.test.web.servlet.ResultActions; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; - -public class NetMapTest extends MockApplicationContextTestSuite { - - @Test - public void testGetNetMap() throws Exception { - ResultActions ra =getMockMvc().perform(MockMvcRequestBuilders.get("/net_map")); - //Assert.assertEquals(UrlAccessRestrictedException.class,ra.andReturn().getResolvedException().getClass()); - Assert.assertEquals("net_map_int",ra.andReturn().getModelAndView().getModel().get("frame_int")); - } - - -} diff --git a/ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/service/ProfileServiceTest.java b/ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/service/ProfileServiceTest.java deleted file mode 100644 index f7f30fe5..00000000 --- a/ecomp-sdk/sdk-app/src/test/java/org/openecomp/portalapp/service/ProfileServiceTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.openecomp.portalapp.service; - -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; -import org.openecomp.portalsdk.core.MockApplicationContextTestSuite; -import org.openecomp.portalsdk.core.domain.Profile; -import org.openecomp.portalsdk.core.domain.User; -import org.openecomp.portalsdk.core.service.ProfileService; -import org.openecomp.portalsdk.core.service.UserProfileService; -import org.springframework.beans.factory.annotation.Autowired; - - -public class ProfileServiceTest extends MockApplicationContextTestSuite { - - @Autowired - ProfileService service; - - @Autowired - UserProfileService userProfileService; - - @Test - public void testFindAll() { - - List profiles = service.findAll(); - Assert.assertTrue(profiles.size() > 0); - } - - @Test - public void testFindAllActive() { - - List users = userProfileService.findAllActive(); - List activeUsers = userProfileService.findAllActive(); - Assert.assertTrue(users.size() - activeUsers.size() >= 0); - } -} -- cgit 1.2.3-korg