1 files changed, 66 insertions, 62 deletions

diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyRolesControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyRolesControllerTest.java
index 96b27b178..d665aae5e 100644
--- a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyRolesControllerTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyRolesControllerTest.java
@@ -4,12 +4,14 @@
  * ================================================================================
  * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (C) 2019 Samsung
+ * ================================================================================
  * 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.
@@ -23,14 +25,11 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-
 import java.io.BufferedReader;
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -42,65 +41,70 @@ import org.onap.portalsdk.core.util.SystemProperties;
 import org.springframework.mock.web.MockHttpServletResponse;
 
 public class PolicyRolesControllerTest {
-	private static Logger logger = FlexLogger.getLogger(PolicyRolesControllerTest.class);
-	private HttpServletRequest request = null;
-	private MockHttpServletResponse response = null;
-	private PolicyRolesController controller = null;	
-	private static CommonClassDao commonClassDao;
-	
-	@Before
-	public void setUp() throws Exception {
-		logger.info("setUp: Entering");
-		controller = new PolicyRolesController();
-		commonClassDao = Mockito.mock(CommonClassDao.class);
-		request = mock(HttpServletRequest.class);       
-		response =  new MockHttpServletResponse();
-		controller.setCommonClassDao(commonClassDao);
-		
-		HttpSession mockSession = mock(HttpSession.class);
+    private static Logger logger = FlexLogger.getLogger(PolicyRolesControllerTest.class);
+    private HttpServletRequest request = null;
+    private MockHttpServletResponse response = null;
+    private PolicyRolesController controller = null;
+    private static CommonClassDao commonClassDao;
+
+    @Before
+    public void setUp() throws Exception {
+        logger.info("setUp: Entering");
+        controller = new PolicyRolesController();
+        commonClassDao = Mockito.mock(CommonClassDao.class);
+        request = mock(HttpServletRequest.class);
+        response = new MockHttpServletResponse();
+        controller.setCommonClassDao(commonClassDao);
+
+        HttpSession mockSession = mock(HttpSession.class);
         User user = new User();
-		user.setOrgUserId("Test");
-		Mockito.when(mockSession.getAttribute(SystemProperties.getProperty("user_attribute_name"))).thenReturn(user);
-		Mockito.when(request.getSession(false)).thenReturn(mockSession);
-		
-		logger.info("setUp: exit");
-	}
+        user.setOrgUserId("Test");
+        Mockito.when(mockSession.getAttribute(SystemProperties.getProperty("user_attribute_name")))
+                .thenReturn(user);
+        Mockito.when(request.getSession(false)).thenReturn(mockSession);
 
-	@Test
-	public void testGetPolicyRolesEntityData() {
-	try {
-		controller.getPolicyRolesEntityData(request, response);
-		assertTrue(response.getContentAsString() != null && response.getContentAsString().contains("rolesDatas"));
-	} catch (UnsupportedEncodingException e) {
-		logger.error("Exception Occured"+e);
-		fail();
-	}
-}
+        logger.info("setUp: exit");
+    }
 
-	@Test
-	public void testGetPolicyScopesEntityData() {
-		try {
-			controller.getPolicyScopesEntityData(request, response);
-			assertTrue(response.getContentAsString() != null && response.getContentAsString().contains("scopeDatas"));
-		} catch (UnsupportedEncodingException e) {
-			logger.error("Exception Occured"+e);
-			fail();
-		}
-	}
+    @Test
+    public void testGetPolicyRolesEntityData() {
+        try {
+            controller.getPolicyRolesEntityData(request, response);
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("rolesDatas"));
+        } catch (UnsupportedEncodingException e) {
+            logger.error("Exception Occured" + e);
+            fail();
+        }
+    }
 
-	@Test
-	public void testSaveRolesEntityData() {
-			logger.info("PolicyRolesControllerTest: Entering");
-			String jsonString = "{\"editRoleData\": {\"id\": 1,\"loginId\": {\"userLoginId\" : \"test\", \"userName\" : \"test\"},\"role\":\"test\",\"scope\":[\"scope\"]}}";
-			try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
-				when(request.getReader()).thenReturn(br); 		    
-				controller.SaveRolesEntityData(request, response);
-				logger.info("response.getContentAsString(): " + response.getContentAsString());
-				assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("rolesDatas"));
-			} catch (Exception e) {
-			fail("Exception: " + e);
-		}
-		logger.info("PolicyRolesControllerTest: exit");
-	}
-}
+    @Test
+    public void testGetPolicyScopesEntityData() {
+        try {
+            controller.getPolicyScopesEntityData(request, response);
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("scopeDatas"));
+        } catch (UnsupportedEncodingException e) {
+            logger.error("Exception Occured" + e);
+            fail();
+        }
+    }
 
+    @Test
+    public void testSaveRolesEntityData() {
+        logger.info("PolicyRolesControllerTest: Entering");
+        String jsonString =
+                "{\"editRoleData\": {\"id\": 1,\"loginId\": {\"userLoginId\" : \"test\", \"userName\" : \"test\"},"
+                        + "\"role\":\"test\",\"scope\":[\"scope\"]}}";
+        try (BufferedReader br = new BufferedReader(new StringReader(jsonString))) {
+            when(request.getReader()).thenReturn(br);
+            controller.SaveRolesEntityData(request, response);
+            logger.info("response.getContentAsString(): " + response.getContentAsString());
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("rolesDatas"));
+        } catch (Exception e) {
+            fail("Exception: " + e);
+        }
+        logger.info("PolicyRolesControllerTest: exit");
+    }
+}