Add drools factory clean up statements to junits

An attempt to tackle some intermittent junit errors
experienced by team mates.

Issue-ID: POLICY-1407
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I68a90dc50fe2fa5bfc7214aa26e2e5f78f1e6c23
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

2 files changed, 7 insertions, 5 deletions

diff --git a/policy-management/src/test/resources/rules1.drl b/policy-management/src/test/resources/rules1.drl
index dd7051c6..18de28de 100644
--- a/policy-management/src/test/resources/rules1.drl
+++ b/policy-management/src/test/resources/rules1.drl
@@ -20,7 +20,7 @@
 
 package rules;
 
-import org.onap.policy.drools.controller.internal.MavenDroolsController3Test;
+import org.onap.policy.drools.controller.internal.MavenDroolsControllerUpgradesTest;
 
 declare Version
     version : String
@@ -33,7 +33,7 @@ then
     v1.setVersion("1");
     insert(v1);
 
-    MavenDroolsController3Test.running1a.countDown();
+    MavenDroolsControllerUpgradesTest.running1a.countDown();
 end
 
 rule "VERSION.12"
@@ -42,5 +42,5 @@ when
 then
     retract($v12);
 
-    MavenDroolsController3Test.running1b.countDown();
+    MavenDroolsControllerUpgradesTest.running1b.countDown();
 end
\ No newline at end of file
diff --git a/policy-management/src/test/resources/rules2.drl b/policy-management/src/test/resources/rules2.drl
index 22d56d0c..4ec0873c 100644
--- a/policy-management/src/test/resources/rules2.drl
+++ b/policy-management/src/test/resources/rules2.drl
@@ -20,6 +20,8 @@
 
 package rules;
 
+import org.onap.policy.drools.controller.internal.MavenDroolsControllerUpgradesTest;
+
 declare Version
     version : String
 end
@@ -31,7 +33,7 @@ then
     v2.setVersion("2");
     insert(v2);
 
-    MavenDroolsController3Test.running2a.countDown();
+    MavenDroolsControllerUpgradesTest.running2a.countDown();
 end
 
 rule "VERSION.2"
@@ -44,5 +46,5 @@ then
     v12.setVersion("12");
     insert(v12);
 
-    MavenDroolsController3Test.running2b.countDown();
+    MavenDroolsControllerUpgradesTest.running2b.countDown();
 end