1 files changed, 104 insertions, 106 deletions
diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyServiceTest.java
index 24b8497e3..72c12155f 100644
--- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyServiceTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyServiceTest.java
@@ -1,15 +1,17 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP-PAP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2018 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.
@@ -41,107 +43,103 @@ import org.onap.policy.api.PolicyParameters;
 
 public class DecisionPolicyServiceTest {
 
-  DecisionPolicyService service = null;
-
-  @Before
-  public void setUp() throws Exception {
-    Properties prop = new Properties();
-    prop.load(new FileInputStream("src/test/resources/pass.xacml.pdp.properties"));
-    String succeeded = prop.getProperty("xacml.rest.pap.url");
-    List<String> paps = Arrays.asList(succeeded.split(","));
-    PAPServices.setPaps(paps);
-    PAPServices.setJunit(true);
-
-    PolicyParameters policyParameters = new PolicyParameters();
-    policyParameters.setPolicyClass(PolicyClass.Decision);
-    policyParameters.setPolicyName("Test.testDecisionPolicy");
-    policyParameters.setOnapName("MSO");
-    policyParameters
-        .setPolicyDescription("This is a sample Decision policy UPDATE example with Settings");
-
-    Map<String, String> configAttributes = new HashMap<>();
-    configAttributes.put("Template", "UpdateTemplate");
-    configAttributes.put("controller", "default");
-    configAttributes.put("SamPoll", "30");
-    configAttributes.put("value", "abcd");
-    Map<AttributeType, Map<String, String>> attributes = new HashMap<>();
-    attributes.put(AttributeType.MATCHING, configAttributes);
-    Map<String, String> settingsMap = new HashMap<>();
-    settingsMap.put("server", "5");
-    attributes.put(AttributeType.SETTINGS, settingsMap);
-    policyParameters.setAttributes(attributes);
-
-    List<String> dynamicRuleAlgorithmLabels = new LinkedList<>();
-    List<String> dynamicRuleAlgorithmFunctions = new LinkedList<>();
-    List<String> dynamicRuleAlgorithmField1 = new LinkedList<>();
-    List<String> dynamicRuleAlgorithmField2 = new LinkedList<>();
-    dynamicRuleAlgorithmLabels = Arrays.asList("A1", "A2", "A3", "A4", "A5", "A6", "A7");
-    dynamicRuleAlgorithmField1 =
-        Arrays.asList("S_server", "cap", "cobal", "A2", "Config", "A4", "A1");
-    dynamicRuleAlgorithmFunctions = Arrays.asList("integer-equal", "string-contains",
-        "integer-equal", "and", "integer-greater-than", "or", "and");
-    dynamicRuleAlgorithmField2 = Arrays.asList("90", "ca", "90", "A3", "45", "A5", "A6");
-    policyParameters.setDynamicRuleAlgorithmLabels(dynamicRuleAlgorithmLabels);
-    policyParameters.setDynamicRuleAlgorithmField1(dynamicRuleAlgorithmField1);
-    policyParameters.setDynamicRuleAlgorithmFunctions(dynamicRuleAlgorithmFunctions);
-    policyParameters.setDynamicRuleAlgorithmField2(dynamicRuleAlgorithmField2);
-
-    policyParameters.setRequestID(UUID.randomUUID());
-    policyParameters.setGuard(true);
-    policyParameters.setRiskLevel("5");
-    policyParameters.setRiskType("TEST");
-    String policyName = "testDecisionPolicy";
-    String policyScope = "Test";
-    service = new DecisionPolicyService(policyName, policyScope, policyParameters);
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    PAPServices.setPaps(null);
-    PAPServices.setJunit(false);
-  }
-
-  @Test
-  public final void testDecisionPolicyService() {
-    assertNotNull(service);
-  }
-
-  @Test
-  public final void testGetValidation() {
-    assertTrue(service.getValidation());
-  }
-
-  @Test
-  public final void testGetMessage() {
-    String message = service.getMessage();
-    assertNull(message);
-  }
-
-  @Test
-  public final void testGetResult() throws PolicyException {
-    service.getValidation();
-    String result = service.getResult(false);
-    assertEquals("success", result);
-  }
-
-  @Test
-  public void testExtraPaths() throws PolicyException {
-    // Set up test data
-    String value = "testVal";
-    PolicyParameters params = new PolicyParameters();
-    Map<AttributeType, Map<String, String>> attributes =
-        new HashMap<AttributeType, Map<String, String>>();
-    // attributes.put(AttributeType.MATCHING, null);
-    attributes.put(AttributeType.SETTINGS, null);
-    params.setAttributes(attributes);
-    DecisionPolicyService service = new DecisionPolicyService(value, value, params);
-
-    // Negative test methods
-    assertEquals(false, service.getValidation());
-    assertEquals("success", service.getResult(true));
-    attributes.remove(AttributeType.SETTINGS);
-    attributes.put(AttributeType.MATCHING, null);
-    assertEquals("success", service.getResult(true));
-  }
-
+    DecisionPolicyService service = null;
+
+    @Before
+    public void setUp() throws Exception {
+        Properties prop = new Properties();
+        prop.load(new FileInputStream("src/test/resources/pass.xacml.pdp.properties"));
+        String succeeded = prop.getProperty("xacml.rest.pap.url");
+        List<String> paps = Arrays.asList(succeeded.split(","));
+        PAPServices.setPaps(paps);
+        PAPServices.setJunit(true);
+
+        PolicyParameters policyParameters = new PolicyParameters();
+        policyParameters.setPolicyClass(PolicyClass.Decision);
+        policyParameters.setPolicyName("Test.testDecisionPolicy");
+        policyParameters.setOnapName("MSO");
+        policyParameters.setPolicyDescription("This is a sample Decision policy UPDATE example with Settings");
+
+        Map<String, String> configAttributes = new HashMap<>();
+        configAttributes.put("Template", "UpdateTemplate");
+        configAttributes.put("controller", "default");
+        configAttributes.put("SamPoll", "30");
+        configAttributes.put("value", "abcd");
+        Map<AttributeType, Map<String, String>> attributes = new HashMap<>();
+        attributes.put(AttributeType.MATCHING, configAttributes);
+        Map<String, String> settingsMap = new HashMap<>();
+        settingsMap.put("server", "5");
+        attributes.put(AttributeType.SETTINGS, settingsMap);
+        policyParameters.setAttributes(attributes);
+
+        List<String> dynamicRuleAlgorithmLabels = new LinkedList<>();
+        List<String> dynamicRuleAlgorithmFunctions = new LinkedList<>();
+        List<String> dynamicRuleAlgorithmField1 = new LinkedList<>();
+        List<String> dynamicRuleAlgorithmField2 = new LinkedList<>();
+        dynamicRuleAlgorithmLabels = Arrays.asList("A1", "A2", "A3", "A4", "A5", "A6", "A7");
+        dynamicRuleAlgorithmField1 = Arrays.asList("S_server", "cap", "cobal", "A2", "Config", "A4", "A1");
+        dynamicRuleAlgorithmFunctions = Arrays.asList("integer-equal", "string-contains", "integer-equal", "and",
+                "integer-greater-than", "or", "and");
+        dynamicRuleAlgorithmField2 = Arrays.asList("90", "ca", "90", "A3", "45", "A5", "A6");
+        policyParameters.setDynamicRuleAlgorithmLabels(dynamicRuleAlgorithmLabels);
+        policyParameters.setDynamicRuleAlgorithmField1(dynamicRuleAlgorithmField1);
+        policyParameters.setDynamicRuleAlgorithmFunctions(dynamicRuleAlgorithmFunctions);
+        policyParameters.setDynamicRuleAlgorithmField2(dynamicRuleAlgorithmField2);
+
+        policyParameters.setRequestID(UUID.randomUUID());
+        policyParameters.setGuard(true);
+        policyParameters.setRiskLevel("5");
+        policyParameters.setRiskType("TEST");
+        String policyName = "testDecisionPolicy";
+        String policyScope = "Test";
+        service = new DecisionPolicyService(policyName, policyScope, policyParameters);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        PAPServices.setPaps(null);
+        PAPServices.setJunit(false);
+    }
+
+    @Test
+    public final void testDecisionPolicyService() {
+        assertNotNull(service);
+    }
+
+    @Test
+    public final void testGetValidation() {
+        assertTrue(service.getValidation());
+    }
+
+    @Test
+    public final void testGetMessage() {
+        String message = service.getMessage();
+        assertNull(message);
+    }
+
+    @Test
+    public final void testGetResult() throws PolicyException {
+        service.getValidation();
+        String result = service.getResult(false);
+        assertEquals("success", result);
+    }
+
+    @Test
+    public void testExtraPaths() throws PolicyException {
+        // Set up test data
+        String value = "testVal";
+        PolicyParameters params = new PolicyParameters();
+        Map<AttributeType, Map<String, String>> attributes = new HashMap<AttributeType, Map<String, String>>();
+        // attributes.put(AttributeType.MATCHING, null);
+        attributes.put(AttributeType.SETTINGS, null);
+        params.setAttributes(attributes);
+        DecisionPolicyService service = new DecisionPolicyService(value, value, params);
+
+        // Negative test methods
+        assertEquals(false, service.getValidation());
+        assertEquals("success", service.getResult(true));
+        attributes.remove(AttributeType.SETTINGS);
+        attributes.put(AttributeType.MATCHING, null);
+        assertEquals("success", service.getResult(true));
+    }
 }