Consolidate PolicyRestAdapter setup

[policy/engine.git] / POLICY-SDK-APP / src / test / java / org / onap / policy / controller / PolicyControllerTest.java

diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyControllerTest.java
index af3c882..554c40f 100644 (file)
--- a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyControllerTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/PolicyControllerTest.java
@@ -47,12 +47,16 @@ public class PolicyControllerTest {
     private static Logger logger = FlexLogger.getLogger(PolicyControllerTest.class);
     private static CommonClassDao commonClassDao;
 
+    /**
+     * setUp.
+     *
+     * @throws Exception Should not throw one
+     */
     @Before
     public void setUp() throws Exception {
         logger.info("setUp: Entering");
         commonClassDao = mock(CommonClassDao.class);
         PolicyController.setCommonClassDao(commonClassDao);
-        List<Object> data = new ArrayList<>();
         String policyData = "";
         try {
             ClassLoader classLoader = getClass().getClassLoader();
@@ -64,6 +68,7 @@ public class PolicyControllerTest {
         entity.setPolicyName("Config_SampleTest.1.xml");
         entity.setPolicyData(policyData);
         entity.setScope("com");
+        List<Object> data = new ArrayList<>();
         data.add(entity);
 
         when(commonClassDao.getDataByQuery(