X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontroller%2FAutoPushControllerTest.java;h=64c3b04ff1baecca040ef8e14439090fda145d31;hp=95fa962a0eb755a1aaf48c2d4c406db37e09d838;hb=4e6615528e03f1a6f7808e28481bd55fe39ed572;hpb=c08d7d80907f2799a49987d61e4260bb44ff8aba

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 95fa962a0..64c3b04ff 100644
--- 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,14 +2,16 @@
  * ============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
  * ================================================================================
  * 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.
@@ -17,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;
@@ -33,75 +42,73 @@ 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 AutoPushController apController = new AutoPushController();
-
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
-
-  @Test
-  public void testAutoPushSetGet() throws IOException {
-    // Get and set tests
-    apController.setPolicyController(controller);
-    assertEquals(apController.getPolicyController(), controller);
-  }
-
-  @Test
-  public void testNegativeCase1() {
-    try {
-      apController.getPolicyGroupContainerData(null, null);
-    } catch (Exception ex) {
-      fail("No exceptions expected, received: " + ex);
+    private PolicyController controller = new PolicyController();
+    private AutoPushController apController = new AutoPushController();
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void testAutoPushSetGet() throws IOException {
+        // Get and set tests
+        apController.setPolicyController(controller);
+        assertEquals(apController.getPolicyController(), controller);
+    }
+
+    @Test
+    public void testNegativeCase1() {
+        try {
+            apController.getPolicyGroupContainerData(null, null);
+        } catch (Exception ex) {
+            fail("No exceptions expected, received: " + ex);
+        }
+    }
+
+    @Test
+    public void testNegativeCase2() throws IOException {
+        thrown.expect(NullPointerException.class);
+        apController.pushPolicyToPDPGroup(null, null);
+    }
+
+    @Test
+    public void testNegativeCase3() throws IOException {
+        thrown.expect(NullPointerException.class);
+        apController.removePDPGroup(null, null);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testRefresh() throws IOException {
+        apController.refreshGroups();
+    }
+
+    @PrepareForTest({UserUtils.class})
+    @Test
+    public void testRequests() throws Exception {
+        // Mock user utilities
+        PowerMockito.mockStatic(UserUtils.class);
+        User user = new User();
+        Mockito.when(UserUtils.getUserSession(Mockito.any())).thenReturn(user);
+
+        // Mock policy controller
+        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(HttpServletResponse.SC_OK, response.getStatusCode());
+
+        // Test push
+        apController.pushPolicyToPDPGroup(request, response);
+        assertEquals(HttpServletResponse.SC_OK, response.getStatusCode());
+
+        // Test remove
+        apController.removePDPGroup(request, response);
+        assertEquals(HttpServletResponse.SC_OK, response.getStatusCode());
     }
-  }
-
-  @Test
-  public void testNegativeCase2() throws IOException {
-    thrown.expect(NullPointerException.class);
-    apController.pushPolicyToPDPGroup(null, null);
-  }
-
-  @Test
-  public void testNegativeCase3() throws IOException {
-    thrown.expect(NullPointerException.class);
-    apController.removePDPGroup(null, null);
-  }
-
-  @Test(expected = NullPointerException.class)
-  public void testRefresh() throws IOException {
-    apController.refreshGroups();
-  }
-
-  @PrepareForTest({UserUtils.class})
-  @Test
-  public void testRequests() throws Exception {
-    // Mock user utilities
-    PowerMockito.mockStatic(UserUtils.class);
-    User user = new User();
-    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);
-
-    // Test group container
-    MockHttpServletRequest request = new MockHttpServletRequest();
-    MockHttpServletResponse response = new MockHttpServletResponse();
-    apController.getPolicyGroupContainerData(request, response);
-    assertEquals(response.getStatusCode(), HttpServletResponse.SC_OK);
-
-    // Test push
-    apController.pushPolicyToPDPGroup(request, response);
-    assertEquals(response.getStatusCode(), HttpServletResponse.SC_OK);
-
-    // Test remove
-    apController.removePDPGroup(request, response);
-    assertEquals(response.getStatusCode(), HttpServletResponse.SC_OK);
-  }
 }