1 files changed, 8 insertions, 8 deletions

diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopFailureTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopFailureTest.java
index 112d4df93..86e7d6de8 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopFailureTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopFailureTest.java
@@ -68,7 +68,7 @@ public class ControlLoopFailureTest implements TopicListener {
     private static List<? extends TopicSink> noopTopics;
 
     private static KieSession kieSession;
-    private static Util.Pair<ControlLoopPolicy, String> pair;
+    private static SupportUtil.Pair<ControlLoopPolicy, String> pair;
     private UUID requestId;
     private UUID requestId2;
     private UUID requestId3;
@@ -76,9 +76,9 @@ public class ControlLoopFailureTest implements TopicListener {
 
     static {
         /* Set environment properties */
-        Util.setAaiProps();
-        Util.setGuardProps();
-        Util.setPuProp();
+        SupportUtil.setAaiProps();
+        SupportUtil.setGuardProps();
+        SupportUtil.setPuProp();
     }
 
     /**
@@ -118,8 +118,8 @@ public class ControlLoopFailureTest implements TopicListener {
                 .customJacksonCoder(null)
                 .modelClassLoaderHash(1111));
         try {
-            Util.buildAaiSim();
-            Util.buildGuardSim();
+            SupportUtil.buildAaiSim();
+            SupportUtil.buildGuardSim();
         } catch (Exception e) {
             fail(e.getMessage());
         }
@@ -242,7 +242,7 @@ public class ControlLoopFailureTest implements TopicListener {
         /*
          * Load policies from yaml
          */
-        pair = Util.loadYaml(yamlFile);
+        pair = SupportUtil.loadYaml(yamlFile);
         assertNotNull(pair);
         assertNotNull(pair.first);
         assertNotNull(pair.first.getControlLoop());
@@ -252,7 +252,7 @@ public class ControlLoopFailureTest implements TopicListener {
         /*
          * Construct a kie session
          */
-        final KieSession kieSession = Util.buildContainer(droolsTemplate, 
+        final KieSession kieSession = SupportUtil.buildContainer(droolsTemplate, 
                 pair.first.getControlLoop().getControlLoopName(),
                 policyScope, policyName, policyVersion, URLEncoder.encode(pair.second, "UTF-8"));