From 99565bb6bd87cfc46591cea73985c58c3a3697dd Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Mon, 10 Jul 2017 14:04:15 -0400 Subject: [PORTAL-20,PORTAL-23,PORTAL-32] Repair defects PORTAL-20: remove mariadb client reference from be-common pom PORTAL-23: Release Portal's SDK version 1.1.0 PORTAL-32: API URL correction for onboarded Apps Change-Id: If75b54ca9202f94ce63c59343b94384da1040912 Signed-off-by: Christopher Lott (cl778h) --- ecomp-portal-BE-common-test/pom.xml | 2 +- .../UserRecommendationControllerTest.java | 69 ---------------------- 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/UserRecommendationControllerTest.java (limited to 'ecomp-portal-BE-common-test') diff --git a/ecomp-portal-BE-common-test/pom.xml b/ecomp-portal-BE-common-test/pom.xml index a2090cf1..93e153fa 100644 --- a/ecomp-portal-BE-common-test/pom.xml +++ b/ecomp-portal-BE-common-test/pom.xml @@ -4,7 +4,7 @@ org.openecomp.portal ecomp-portal-BE-common-test - 1.1.0-SNAPSHOT + 1.1.0 jar ecompportal-be-common-test diff --git a/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/UserRecommendationControllerTest.java b/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/UserRecommendationControllerTest.java deleted file mode 100644 index 8c0a5cd3..00000000 --- a/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/UserRecommendationControllerTest.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.openecomp.portalapp.portal.test.controller; - -import static org.junit.Assert.assertTrue; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.MockitoAnnotations; -import org.openecomp.portalapp.portal.controller.UserRecommendationController; -import org.openecomp.portalapp.portal.test.core.MockEPUser; -import org.openecomp.portalapp.test.framework.MockitoTestSuite; -import org.openecomp.portalsdk.core.web.support.UserUtils; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - -@RunWith(PowerMockRunner.class) -@PrepareForTest(UserUtils.class) -public class UserRecommendationControllerTest { - - /* - * @Mock FunctionalMenuService functionalMenuService = new - * FunctionalMenuServiceImpl(); - * - * @Mock UserNotificationService userNotificationService = new - * UserNotificationServiceImpl(); - */ - - @InjectMocks - UserRecommendationController userRecommendationController = new UserRecommendationController(); - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - } - - MockEPUser mockUser = new MockEPUser(); - MockitoTestSuite mockitoTestSuite = new MockitoTestSuite(); - - HttpServletRequest mockedRequest = mockitoTestSuite.getMockedRequest(); - HttpServletResponse mockedResponse = mockitoTestSuite.getMockedResponse(); - NullPointerException nullPointerException = new NullPointerException(); - - - @Test - public void getRecommendationsTest() throws Exception { - String recommendations = "{\"id\": \"USERID\", \"timestamp\": \"TIMESTAMP\", \"count\": \"count of recommendations returned\",\"recommendations\": [\"recommended action 1\",\"recommended action 2\"] }"; - // String actualPortalRestResponse = null; - String actualPortalRestResponse = recommendations; - actualPortalRestResponse = userRecommendationController.getRecommendations(mockedRequest, mockedResponse); - assertTrue(actualPortalRestResponse.equals(actualPortalRestResponse)); - - } - - @Test - public void getRecommendationsTestForRecommendations() throws Exception { - String recommendations = "{\"id\": \"USERID\", \"timestamp\": \"TIMESTAMP\", \"count\": \"count of recommendations returned\" }"; - // String actualPortalRestResponse = null; - String actualPortalRestResponse = recommendations; - actualPortalRestResponse = userRecommendationController.getRecommendations(mockedRequest, mockedResponse); - assertTrue(actualPortalRestResponse.equals(actualPortalRestResponse)); - - } - - -} -- cgit 1.2.3-korg