X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcontroller%2FPushPolicyControllerTest.java;h=dbddecc519853858d79b54ff146ef82425798001;hb=refs%2Fchanges%2F19%2F58819%2F1;hp=1f8cb6f90b710ca3ba4cedaa3cdd58456d50522a;hpb=f0fec2a861ea0a92b27b40882ea38f9422cde0c6;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/PushPolicyControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/PushPolicyControllerTest.java
index 1f8cb6f90..dbddecc51 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/PushPolicyControllerTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/PushPolicyControllerTest.java
@@ -54,22 +54,22 @@ import com.att.research.xacml.api.pap.PAPException;
 
 
 public class PushPolicyControllerTest {
-	
-	private static Logger logger = FlexLogger.getLogger(PushPolicyControllerTest.class);
-	private static CommonClassDao commonClassDao;
-	private String jsonString = null;
-	private HttpServletRequest request = null;
-	private PushPolicyController controller = null;
-	private HttpServletResponse response = null;
+
+    private static Logger logger = FlexLogger.getLogger(PushPolicyControllerTest.class);
+    private static CommonClassDao commonClassDao;
+    private String jsonString = null;
+    private HttpServletRequest request = null;
+    private PushPolicyController controller = null;
+    private HttpServletResponse response = null;
     private List<String> headers = new ArrayList<>();
     private ServletConfig servletConfig;
     private XACMLPapServlet pap;
 
-	@Before
-	public void setUp() throws Exception {
-		logger.info("setUp: Entering");
-		request = Mockito.mock(HttpServletRequest.class);
-		response = Mockito.mock(HttpServletResponse.class);
+    @Before
+    public void setUp() throws Exception {
+        logger.info("setUp: Entering");
+        request = Mockito.mock(HttpServletRequest.class);
+        response = Mockito.mock(HttpServletResponse.class);
         Mockito.when(request.getHeaderNames()).thenReturn(Collections.enumeration(headers));
         Mockito.when(request.getAttributeNames()).thenReturn(Collections.enumeration(headers));
 
@@ -78,72 +78,72 @@ public class PushPolicyControllerTest {
         Mockito.when(servletConfig.getInitParameterNames()).thenReturn(Collections.enumeration(headers));
         Mockito.when(servletConfig.getInitParameter("XACML_PROPERTIES_NAME")).thenReturn("src/test/resources/xacml.pap.properties");
        
-		commonClassDao = Mockito.mock(CommonClassDao.class);
-		controller = new PushPolicyController();
-		controller.setCommonClassDao(commonClassDao);
-		logger.info("setUp: exit");
-	}
-	
-	@Test
-	public void testPushPolicy() throws ServletException, PAPException{
-		PolicyVersion versionData = new PolicyVersion();
-		versionData.setPolicyName("com"+File.separator+"Config_Test");
-		versionData.setActiveVersion(1);
-		versionData.setHigherVersion(1);
-		List<Object> data = new ArrayList<>();
-		data.add(versionData);
-		when(commonClassDao.getDataById(PolicyVersion.class, "policyName", "com"+File.separator+"Config_Test")).thenReturn(data);
-		pap = new XACMLPapServlet();
-		pap.init(servletConfig);
-		callPushPolicy();
-		when(commonClassDao.getDataById(PolicyVersion.class, "policyName", "com"+File.separator+"Config_Test")).thenReturn(null);
-		callPushPolicy();
-	}
-	
-	public void callPushPolicy(){
-		jsonString = "{\"policyScope\":\"com\",\"filePrefix\":\"Config_\",\"policyName\":\"Test\",\"pdpGroup\":\"default\"}";
-		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
-			char[] charBuffer = new char[8 * 1024];
-			StringBuilder builder = new StringBuilder();
-			int numCharsRead;
-			while ((numCharsRead = br.read(charBuffer, 0, charBuffer.length)) != -1) {
-				builder.append(charBuffer, 0, numCharsRead);
-			}
-			when(request.getInputStream()).thenReturn(getInputStream(builder.toString().getBytes(StandardCharsets.UTF_8)));
-			controller.pushPolicy(request, response);
-			assertTrue(response != null);
-		}catch(Exception e){
-			logger.error("Exception"+ e);
-		} 
-	}
-	
-	public ServletInputStream getInputStream(byte[] body) throws IOException { 
+        commonClassDao = Mockito.mock(CommonClassDao.class);
+        controller = new PushPolicyController();
+        controller.setCommonClassDao(commonClassDao);
+        logger.info("setUp: exit");
+    }
+
+    @Test
+    public void testPushPolicy() throws ServletException, PAPException{
+        PolicyVersion versionData = new PolicyVersion();
+        versionData.setPolicyName("com"+File.separator+"Config_Test");
+        versionData.setActiveVersion(1);
+        versionData.setHigherVersion(1);
+        List<Object> data = new ArrayList<>();
+        data.add(versionData);
+        when(commonClassDao.getDataById(PolicyVersion.class, "policyName", "com"+File.separator+"Config_Test")).thenReturn(data);
+        pap = new XACMLPapServlet();
+        pap.init(servletConfig);
+        callPushPolicy();
+        when(commonClassDao.getDataById(PolicyVersion.class, "policyName", "com"+File.separator+"Config_Test")).thenReturn(null);
+        callPushPolicy();
+    }
+
+    public void callPushPolicy(){
+        jsonString = "{\"policyScope\":\"com\",\"filePrefix\":\"Config_\",\"policyName\":\"Test\",\"pdpGroup\":\"default\"}";
+        try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+            char[] charBuffer = new char[8 * 1024];
+            StringBuilder builder = new StringBuilder();
+            int numCharsRead;
+            while ((numCharsRead = br.read(charBuffer, 0, charBuffer.length)) != -1) {
+                builder.append(charBuffer, 0, numCharsRead);
+            }
+            when(request.getInputStream()).thenReturn(getInputStream(builder.toString().getBytes(StandardCharsets.UTF_8)));
+            controller.pushPolicy(request, response);
+            assertTrue(response != null);
+        }catch(Exception e){
+            logger.error("Exception"+ e);
+        }
+    }
+
+    public ServletInputStream getInputStream(byte[] body) throws IOException {
         final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(body); 
         ServletInputStream servletInputStream = new ServletInputStream() { 
             public int read() throws IOException { 
                 return byteArrayInputStream.read(); 
             }
 
-			@Override
-			public boolean isFinished() {
-				return false;
-			}
+            @Override
+            public boolean isFinished() {
+                return false;
+            }
 
-			@Override
-			public boolean isReady() {
-				return false;
-			}
+            @Override
+            public boolean isReady() {
+                return false;
+            }
 
-			@Override
-			public void setReadListener(ReadListener readListener) {
-			} 
+            @Override
+            public void setReadListener(ReadListener readListener) {
+            }
         }; 
         return servletInputStream; 
     } 
-	
-	 @After
-	 public void destroy(){
-		 if(pap!=null)
-			 pap.destroy();
-	 }
+
+     @After
+     public void destroy(){
+         if(pap!=null)
+             pap.destroy();
+     }
 }