[POLICY-73] replace openecomp for policy-engine

[policy/engine.git] / PolicyEngineClient / src / main / java / org / onap / policyEngine / GeneralTestClient.java

diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GeneralTestClient.java b/PolicyEngineClient/src/main/java/org/onap/policyEngine/GeneralTestClient.java
similarity index 95%
rename from PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GeneralTestClient.java
rename to PolicyEngineClient/src/main/java/org/onap/policyEngine/GeneralTestClient.java
index 4298e81..423ade2 100644 (file)
--- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GeneralTestClient.java
+++ b/PolicyEngineClient/src/main/java/org/onap/policyEngine/GeneralTestClient.java
@@ -28,7 +28,7 @@
  *              Unpublished and Not for Publication
  *                     All Rights Reserved
  */
-package org.openecomp.policyEngine;
+package org.onap.policyEngine;
 
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -45,10 +45,10 @@ import java.util.Map;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
-import org.openecomp.policy.api.PolicyEngine;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.api.PolicyEngine;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 /**
  * Class reads from .testCases file and run the test cases available in the file
@@ -102,7 +102,7 @@ public class GeneralTestClient {
         * @param file
         */
        private static void runTestClientOnConfigFile(Path file) {
-               String resultReturned, eCOMPComponentName;
+               String resultReturned, onapComponentName;
                int totalTCforFile = 0, passTCforFile = 0, failTCforFile = 0;
                System.out
                .println("\n###############################################################################################");
@@ -151,8 +151,8 @@ public class GeneralTestClient {
                                                switch (testFor) {
 
                                                case "getConfig":
-                                                       eCOMPComponentName = (String) testCase
-                                                       .get("ECOMPName");
+                                                       onapComponentName = (String) testCase
+                                                       .get("ONAPName");
                                                        String configName = (String) testCase
                                                                        .get("ConfigName");
                                                        Map<String, String> configAttributes = new HashMap<>();
@@ -172,7 +172,7 @@ public class GeneralTestClient {
                                                                configAttributes = null;
                                                        }
                                                        resultReceived = PolicyEngineTestClient.getConfig(
-                                                                       policyEngine, eCOMPComponentName,
+                                                                       policyEngine, onapComponentName,
                                                                        configName, configAttributes);
                                                        Collections.sort(expectedResult);
                                                        Collections.sort(resultReceived);
@@ -226,8 +226,8 @@ public class GeneralTestClient {
                                                        break;
 
                                                case "getDecision":
-                                                       eCOMPComponentName = (String) testCase
-                                                       .get("ECOMPName");
+                                                       onapComponentName = (String) testCase
+                                                       .get("ONAPName");
                                                        Map<String, String> decisionAttributes = new HashMap<>();
                                                        decisionAttributes.put("Key", "Value");
                                                        JSONArray decisionAttributesJSON = (JSONArray) testCase
@@ -243,7 +243,7 @@ public class GeneralTestClient {
                                                        
                                                        resultReceived = PolicyEngineTestClient
                                                                        .getDecision(policyEngine,
-                                                                                       eCOMPComponentName,
+                                                                                       onapComponentName,
                                                                                        decisionAttributes);
                                                        Collections.sort(expectedResult);
                                                        Collections.sort(resultReceived);
@@ -264,11 +264,11 @@ public class GeneralTestClient {
 
                                                        // case "getManualNotification":
                                                        // PolicyEngineTestClient
-                                                       // .getManualNotifications(org.openecomp.policyEngine);
+                                                       // .getManualNotifications(org.onap.policyEngine);
                                                        // break;
                                                        // case "getAutoNotification":
                                                        // PolicyEngineTestClient
-                                                       // .getAutoNotifications(org.openecomp.policyEngine);
+                                                       // .getAutoNotifications(org.onap.policyEngine);
                                                        // break;
 
                                                default: