1 files changed, 58 insertions, 40 deletions
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..a06afc997 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
@@ -4,12 +4,14 @@
  * ================================================================================
  * Copyright (C) 2017 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,9 +25,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-
 import java.io.File;
-
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
@@ -33,45 +33,63 @@ 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");
+        }
+    }
 }