Fix simple sonar issues in models: errors to sim-pdp

[policy/models.git] / models-sim / policy-models-sim-pdp / src / test / java / org / onap / policy / models / sim / pdp / comm / TestPdpStateChangeListener.java

diff --git a/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/comm/TestPdpStateChangeListener.java b/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/comm/TestPdpStateChangeListener.java
index 8e3582e..324edd7 100644 (file)
--- a/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/comm/TestPdpStateChangeListener.java
+++ b/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/comm/TestPdpStateChangeListener.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +24,6 @@ package org.onap.policy.models.sim.pdp.comm;
 import static org.junit.Assert.assertEquals;
 
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -33,7 +33,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -46,7 +45,6 @@ import org.onap.policy.models.pdp.enums.PdpState;
 import org.onap.policy.models.sim.pdp.PdpSimulatorActivator;
 import org.onap.policy.models.sim.pdp.PdpSimulatorCommandLineArguments;
 import org.onap.policy.models.sim.pdp.PdpSimulatorConstants;
-import org.onap.policy.models.sim.pdp.exception.PdpSimulatorException;
 import org.onap.policy.models.sim.pdp.parameters.PdpSimulatorParameterGroup;
 import org.onap.policy.models.sim.pdp.parameters.PdpSimulatorParameterHandler;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
@@ -57,6 +55,8 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
  * @author Ajith Sreekumar (ajith.sreekumar@est.tech)
  */
 public class TestPdpStateChangeListener {
+    private static final String PDP_SUBGROUP = "pdpSubgroup";
+    private static final String PDP_GROUP = "pdpGroup";
     private PdpUpdateListener pdpUpdateMessageListener;
     private PdpStateChangeListener pdpStateChangeListener;
     private static final CommInfrastructure INFRA = CommInfrastructure.NOOP;
@@ -66,12 +66,10 @@ public class TestPdpStateChangeListener {
     /**
      * Method for setup before each test.
      *
-     * @throws PdpSimulatorException if some error occurs while starting up the pdp simulator
-     * @throws FileNotFoundException if the file is missing
-     * @throws IOException if IO exception occurs
+     * @throws Exception if an error occurs
      */
     @Before
-    public void setUp() throws PdpSimulatorException, FileNotFoundException, IOException {
+    public void setUp() throws Exception {
         pdpUpdateMessageListener = new PdpUpdateListener();
         pdpStateChangeListener = new PdpStateChangeListener();
         Registry.newRegistry();
@@ -125,8 +123,8 @@ public class TestPdpStateChangeListener {
     private PdpUpdate performPdpUpdate(final String instance) {
         final PdpUpdate pdpUpdateMsg = new PdpUpdate();
         pdpUpdateMsg.setDescription("dummy pdp status for test");
-        pdpUpdateMsg.setPdpGroup("pdpGroup");
-        pdpUpdateMsg.setPdpSubgroup("pdpSubgroup");
+        pdpUpdateMsg.setPdpGroup(PDP_GROUP);
+        pdpUpdateMsg.setPdpSubgroup(PDP_SUBGROUP);
         pdpUpdateMsg.setName(instance);
         final ToscaPolicy toscaPolicy = new ToscaPolicy();
         toscaPolicy.setType("apexpolicytype");
@@ -142,7 +140,7 @@ public class TestPdpStateChangeListener {
             propertiesMap.put("content", "");
         }
         toscaPolicy.setProperties(propertiesMap);
-        final List<ToscaPolicy> toscaPolicies = new ArrayList<ToscaPolicy>();
+        final List<ToscaPolicy> toscaPolicies = new ArrayList<>();
         toscaPolicies.add(toscaPolicy);
         pdpUpdateMsg.setPolicies(toscaPolicies);
         pdpUpdateMessageListener.onTopicEvent(INFRA, TOPIC, null, pdpUpdateMsg);
@@ -155,8 +153,8 @@ public class TestPdpStateChangeListener {
         performPdpUpdate(pdpStatus.getName());
         final PdpStateChange pdpStateChangeMsg = new PdpStateChange();
         pdpStateChangeMsg.setState(PdpState.PASSIVE);
-        pdpStateChangeMsg.setPdpGroup("pdpGroup");
-        pdpStateChangeMsg.setPdpSubgroup("pdpSubgroup");
+        pdpStateChangeMsg.setPdpGroup(PDP_GROUP);
+        pdpStateChangeMsg.setPdpSubgroup(PDP_SUBGROUP);
         pdpStateChangeMsg.setName(pdpStatus.getName());
         pdpStateChangeListener.onTopicEvent(INFRA, TOPIC, null, pdpStateChangeMsg);
 
@@ -170,8 +168,8 @@ public class TestPdpStateChangeListener {
         pdpStatus.setState(PdpState.ACTIVE);
         final PdpStateChange pdpStateChangeMsg = new PdpStateChange();
         pdpStateChangeMsg.setState(PdpState.ACTIVE);
-        pdpStateChangeMsg.setPdpGroup("pdpGroup");
-        pdpStateChangeMsg.setPdpSubgroup("pdpSubgroup");
+        pdpStateChangeMsg.setPdpGroup(PDP_GROUP);
+        pdpStateChangeMsg.setPdpSubgroup(PDP_SUBGROUP);
         pdpStateChangeMsg.setName(pdpStatus.getName());
         pdpStateChangeListener.onTopicEvent(INFRA, TOPIC, null, pdpStateChangeMsg);