From 9301fed7c290f52208922f780fdfe4b5a880b5aa Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Wed, 31 Jan 2018 08:15:42 -0500 Subject: Adding code coverage reduce duplicate lines Removed some duplicate code across some of the classes. For CheckPDP, got the code coverage above 80%. Issue-ID: POLICY-482 Change-Id: I41495cf9f92e8fd248350bf33f5a183c876f38f2 Signed-off-by: Pamela Dragosh --- .../java/org/onap/policy/admin/CheckPDPTest.java | 41 ++++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) (limited to 'POLICY-SDK-APP/src/test/java/org/onap') 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 47358a8f2..e97e89eae 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 @@ -19,19 +19,54 @@ */ package org.onap.policy.admin; -import static org.junit.Assert.*; +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; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class CheckPDPTest { @Test - public final void testCheckPDP() { + 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 + "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/")); + + } 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"); - CheckPDP.validateID("http://localhost:8082/pdp/"); + 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) { -- cgit 1.2.3-korg