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%2Fadmin%2FCheckPDPTest.java;h=358b69f1f35e0fc9e1e864af7fd0ef6b2adcb942;hp=e97e89eae27980f3142c0a7694d7639db7265f04;hb=dfd9c0a09c35e4b5b4b61be08b8424e4a3d0d500;hpb=c579209f8a4045d7f96f2b566a82ce1b8cf8660d

diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/CheckPDPTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/CheckPDPTest.java
index e97e89eae..358b69f1f 100644
--- a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/CheckPDPTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/CheckPDPTest.java
@@ -2,14 +2,16 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 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,6 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.admin;
 
 import static org.junit.Assert.assertFalse;
@@ -33,45 +36,53 @@ import org.junit.runners.MethodSorters;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class CheckPDPTest {
 
-	@Test
-	public final void test1NoPropertySet() {
-		try {
-			System.clearProperty("xacml.rest.pdp.idfile");
-			assertFalse(CheckPDP.validateID("http://localhost:8082/pdp/"));
+    @Test
+    public final void test1NoPropertySet() {
+        try {
+            System.clearProperty("xacml.rest.pdp.idfile");
+            assertFalse(CheckPDP.validateID("http://localhost:8082/pdp/"));
+
+            System.setProperty("xacml.rest.pdp.idfile",
+                    new File(".").getCanonicalPath() + File.separator + "src" + File.separator + "test" + File.separator
+                            + "resources" + File.separator + "idonotexist.properties");
+            assertFalse(CheckPDP.validateID("http://localhost:8082/pdp/"));
+
+            System.setProperty("xacml.rest.pdp.idfile",
+                    new File(".").getCanonicalPath() + File.separator + "src" + File.separator + "test" + File.separator
+                            + "resources" + File.separator + "doesnothaveproperties.atall");
+            assertFalse(CheckPDP.validateID("http://localhost:8082/pdp/"));
+
+            System.setProperty("xacml.rest.pdp.idfile", new File(".").getCanonicalPath() + File.separator + "src"
+                    + File.separator + "test" + File.separator + "resources" + File.separator + "testbad.properties");
+            assertFalse(CheckPDP.validateID("http://localhost:8082/pdp/"));
 
-			System.setProperty("xacml.rest.pdp.idfile", new File(".").getCanonicalPath() + File.separator + "src"+ File.separator + "test" + File.separator + "resources" + File.separator + "idonotexist.properties");
-			assertFalse(CheckPDP.validateID("http://localhost:8082/pdp/"));
+            System.setProperty("xacml.rest.pdp.idfile", new File(".").getCanonicalPath() + File.separator + "src"
+                    + File.separator + "test" + File.separator + "resources" + File.separator + "empty.properties");
+            assertFalse(CheckPDP.validateID("http://localhost:8082/pdp/"));
 
-			System.setProperty("xacml.rest.pdp.idfile", new File(".").getCanonicalPath() + File.separator + "src"+ File.separator + "test" + File.separator + "resources" + File.separator + "doesnothaveproperties.atall");
-			assertFalse(CheckPDP.validateID("http://localhost:8082/pdp/"));
+            System.setProperty("xacml.rest.pdp.idfile",
+                    new File(".").getCanonicalPath() + File.separator + "src" + File.separator + "test" + File.separator
+                            + "resources" + File.separator + "testnotenoughvalues.properties");
+            assertFalse(CheckPDP.validateID("http://localhost:8082/pdp/"));
 
-			System.setProperty("xacml.rest.pdp.idfile", new File(".").getCanonicalPath() + File.separator + "src"+ File.separator + "test" + File.separator + "resources" + File.separator + "testbad.properties");
-			assertFalse(CheckPDP.validateID("http://localhost:8082/pdp/"));
-			
-			System.setProperty("xacml.rest.pdp.idfile", new File(".").getCanonicalPath() + File.separator + "src"+ File.separator + "test" + File.separator + "resources" + File.separator + "empty.properties");
-			assertFalse(CheckPDP.validateID("http://localhost:8082/pdp/"));
-						
-			System.setProperty("xacml.rest.pdp.idfile", new File(".").getCanonicalPath() + File.separator + "src"+ File.separator + "test" + File.separator + "resources" + File.separator + "testnotenoughvalues.properties");
-			assertFalse(CheckPDP.validateID("http://localhost:8082/pdp/"));
-						
-			assertNull(CheckPDP.getPdpMap());
-			assertNull(CheckPDP.getEncoding("http://localhost:8082/pdp/"));
+            assertNull(CheckPDP.getPdpMap());
+            assertNull(CheckPDP.getEncoding("http://localhost:8082/pdp/"));
 
-		} catch (Exception e) {
-			fail("Error occured in CheckPDP test");
-		}
-	}
-	
-	@Test
-	public final void test2CheckPDP() {
-		try {
-			System.setProperty("xacml.rest.pdp.idfile", new File(".").getCanonicalPath() + File.separator + "src"+ File.separator + "test" + File.separator + "resources" + File.separator + "test.properties");
-			assertTrue(CheckPDP.validateID("http://localhost:8082/pdp/"));
-			assertTrue(CheckPDP.getPdpMap().containsKey("http://localhost:8082/pdp/"));
-			assertTrue(CheckPDP.getEncoding("http://localhost:8082/pdp/").equals("dGVzdHBkcDphbHBoYTQ1Ng=="));
-		} catch (Exception e) {
-			fail("Error occured in CheckPDP test");
-		}
-	}
+        } catch (Exception e) {
+            fail("Error occured in CheckPDP test");
+        }
+    }
 
+    @Test
+    public final void test2CheckPDP() {
+        try {
+            System.setProperty("xacml.rest.pdp.idfile", new File(".").getCanonicalPath() + File.separator + "src"
+                    + File.separator + "test" + File.separator + "resources" + File.separator + "test.properties");
+            assertTrue(CheckPDP.validateID("http://localhost:8082/pdp/"));
+            assertTrue(CheckPDP.getPdpMap().containsKey("http://localhost:8082/pdp/"));
+            assertTrue(CheckPDP.getEncoding("http://localhost:8082/pdp/").equals("dGVzdHBkcDphbHBoYTQ1Ng=="));
+        } catch (Exception e) {
+            fail("Error occured in CheckPDP test");
+        }
+    }
 }