X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=PolicyEngineClient%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2FpolicyEngine%2FGeneralTestClient.java;h=4298e81679cf5878de9423dac816864e3ffb6c8c;hb=4ca818fdfb9b807562166800a086b413593d6894;hp=c78fc6f119f12b0b0773f8e7d61679c80038a124;hpb=91d04c64771832a0b8815ffbe1f0f9920320d94d;p=policy%2Fengine.git diff --git a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GeneralTestClient.java b/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GeneralTestClient.java index c78fc6f11..4298e8167 100644 --- a/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GeneralTestClient.java +++ b/PolicyEngineClient/src/main/java/org/openecomp/policyEngine/GeneralTestClient.java @@ -47,6 +47,8 @@ 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; /** * Class reads from .testCases file and run the test cases available in the file @@ -58,6 +60,9 @@ import org.openecomp.policy.api.PolicyEngineException; * */ public class GeneralTestClient { + + private static final Logger LOGGER = FlexLogger.getLogger(GeneralTestClient.class); + static int totalTC = 0, passTC = 0, failTC = 0; public static void main(String[] args) { @@ -121,8 +126,8 @@ public class GeneralTestClient { for (Object jsonObject : jsonObjectArray) { totalTC++; totalTCforFile++; - ArrayList expectedResult = new ArrayList(); - ArrayList resultReceived = new ArrayList(); + ArrayList expectedResult = new ArrayList<>(); + ArrayList resultReceived = new ArrayList<>(); JSONObject testCase = (JSONObject) jsonObject; // get a String from the JSON object long id = (long) testCase.get("id"); @@ -150,7 +155,7 @@ public class GeneralTestClient { .get("ECOMPName"); String configName = (String) testCase .get("ConfigName"); - Map configAttributes = new HashMap(); + Map configAttributes = new HashMap<>(); configAttributes.put("key", "value"); JSONArray configAttributesJSON = (JSONArray) testCase .get("configAttributes"); @@ -186,7 +191,7 @@ public class GeneralTestClient { break; case "getAction": - Map eventAttributes = new HashMap(); + Map eventAttributes = new HashMap<>(); eventAttributes.put("Key", "Value"); JSONArray eventAttributesJSON = (JSONArray) testCase .get("eventAttributes"); @@ -223,7 +228,7 @@ public class GeneralTestClient { case "getDecision": eCOMPComponentName = (String) testCase .get("ECOMPName"); - Map decisionAttributes = new HashMap(); + Map decisionAttributes = new HashMap<>(); decisionAttributes.put("Key", "Value"); JSONArray decisionAttributesJSON = (JSONArray) testCase .get("decisionAttributes"); @@ -275,29 +280,26 @@ public class GeneralTestClient { } } catch (PolicyEngineException e) { - // TODO Auto-generated catch block printResult(id, testFor, testCaseDescription, "FAILED"); failTCforFile++; failTC++; - e.printStackTrace(); + LOGGER.error("Exception Occured"+e); } catch (Exception e) { - // TODO Auto-generated catch block printResult(id, testFor, testCaseDescription, "FAILED"); failTCforFile++; failTC++; - e.printStackTrace(); + LOGGER.error("Exception Occured"+e); } } } catch (FileNotFoundException ex) { - ex.printStackTrace(); + LOGGER.error("Exception Occured due to File not found"+ex); } catch (IOException ex) { - ex.printStackTrace(); + LOGGER.error("Exception Occured"+ex); } catch (NullPointerException ex) { - ex.printStackTrace(); + LOGGER.error("Exception Occured due to Null Pointer"+ex); } catch (org.json.simple.parser.ParseException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + LOGGER.error("Exception Occured while Parsing"+e); } } System.out.println("\n\n\t Summary for the file: TOTAL: "