Add coverage to a few Controllers

[policy/engine.git] / POLICY-SDK-APP / src / test / java / org / onap / policy / controller / AutoPushControllerTest.java

diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/AutoPushControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/AutoPushControllerTest.java
index 5dd5d7e..64c3b04 100644 (file)
--- a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/AutoPushControllerTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/AutoPushControllerTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Modifications Copyright (C) 2019 Samsung
  * ================================================================================
@@ -19,12 +19,19 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.controller;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
+
+import com.mockrunner.mock.web.MockHttpServletRequest;
+import com.mockrunner.mock.web.MockHttpServletResponse;
+
 import java.io.IOException;
+
 import javax.servlet.http.HttpServletResponse;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -35,12 +42,10 @@ import org.onap.portalsdk.core.web.support.UserUtils;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
-import com.mockrunner.mock.web.MockHttpServletRequest;
-import com.mockrunner.mock.web.MockHttpServletResponse;
 
 @RunWith(PowerMockRunner.class)
 public class AutoPushControllerTest {
-    private PolicyController controller = new PolicyController();;
+    private PolicyController controller = new PolicyController();
     private AutoPushController apController = new AutoPushController();
 
     @Rule
@@ -88,22 +93,22 @@ public class AutoPushControllerTest {
         Mockito.when(UserUtils.getUserSession(Mockito.any())).thenReturn(user);
 
         // Mock policy controller
-        PolicyController pController = Mockito.mock(PolicyController.class);
-        PowerMockito.whenNew(PolicyController.class).withNoArguments().thenReturn(pController);
-        Mockito.when(pController.getRoles(Mockito.any())).thenReturn(null);
+        PolicyController policyController = Mockito.mock(PolicyController.class);
+        PowerMockito.whenNew(PolicyController.class).withNoArguments().thenReturn(policyController);
+        Mockito.when(policyController.getRoles(Mockito.any())).thenReturn(null);
 
         // Test group container
         MockHttpServletRequest request = new MockHttpServletRequest();
         MockHttpServletResponse response = new MockHttpServletResponse();
         apController.getPolicyGroupContainerData(request, response);
-        assertEquals(response.getStatusCode(), HttpServletResponse.SC_OK);
+        assertEquals(HttpServletResponse.SC_OK, response.getStatusCode());
 
         // Test push
         apController.pushPolicyToPDPGroup(request, response);
-        assertEquals(response.getStatusCode(), HttpServletResponse.SC_OK);
+        assertEquals(HttpServletResponse.SC_OK, response.getStatusCode());
 
         // Test remove
         apController.removePDPGroup(request, response);
-        assertEquals(response.getStatusCode(), HttpServletResponse.SC_OK);
+        assertEquals(HttpServletResponse.SC_OK, response.getStatusCode());
     }
 }