Trying to fix the Jenkins Job

[holmes/engine-management.git] / engine-d / src / test / java / org / onap / holmes / engine / manager / DroolsEngineTest.java

diff --git a/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java b/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java
index 4ad9107..f7b7fbd 100644 (file)
--- a/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java
+++ b/engine-d/src/test/java/org/onap/holmes/engine/manager/DroolsEngineTest.java
@@ -17,13 +17,13 @@
 package org.onap.holmes.engine.manager;\r
 \r
 import org.junit.Before;\r
-import org.junit.BeforeClass;\r
 import org.junit.Rule;\r
 import org.junit.Test;\r
 import org.junit.rules.ExpectedException;\r
 import org.onap.holmes.common.api.entity.AlarmInfo;\r
 import org.onap.holmes.common.api.entity.CorrelationRule;\r
 import org.onap.holmes.common.api.stat.VesAlarm;\r
+import org.onap.holmes.common.dmaap.store.ClosedLoopControlNameCache;\r
 import org.onap.holmes.common.exception.CorrelationException;\r
 import org.onap.holmes.common.utils.DbDaoUtil;\r
 import org.onap.holmes.engine.db.AlarmInfoDao;\r
@@ -32,12 +32,11 @@ import org.onap.holmes.engine.wrapper.RuleMgtWrapper;
 import org.powermock.api.easymock.PowerMock;\r
 import org.powermock.reflect.Whitebox;\r
 \r
-import java.lang.reflect.InvocationTargetException;\r
-import java.lang.reflect.Method;\r
-import java.util.*;\r
+import java.util.ArrayList;\r
+import java.util.List;\r
+import java.util.UUID;\r
 import java.util.stream.Collectors;\r
 \r
-import static org.easymock.EasyMock.anyObject;\r
 import static org.hamcrest.CoreMatchers.is;\r
 import static org.hamcrest.core.IsEqual.equalTo;\r
 import static org.junit.Assert.assertThat;\r
@@ -49,18 +48,21 @@ public class DroolsEngineTest {
 \r
     private RuleMgtWrapper ruleMgtWrapper;\r
 \r
-    private AlarmInfoDao alarmInfoDaoMock;\r
-\r
     private DroolsEngine droolsEngine;\r
 \r
     private DbDaoUtil dbDaoUtilStub;\r
 \r
+    private ClosedLoopControlNameCache closedLoopControlNameCache;\r
+\r
     public DroolsEngineTest() throws Exception {\r
         droolsEngine = new DroolsEngine();\r
         ruleMgtWrapper = new RuleMgtWrapperStub();\r
         dbDaoUtilStub = new DbDaoUtilStub();\r
-        Whitebox.setInternalState(droolsEngine, "daoUtil", dbDaoUtilStub);\r
-        Whitebox.setInternalState(droolsEngine, "ruleMgtWrapper", ruleMgtWrapper);\r
+        closedLoopControlNameCache = new ClosedLoopControlNameCache();\r
+        droolsEngine.setClosedLoopControlNameCache(closedLoopControlNameCache);\r
+        droolsEngine.setDaoUtil(dbDaoUtilStub);\r
+        droolsEngine.setRuleMgtWrapper(ruleMgtWrapper);\r
+\r
         Whitebox.invokeMethod(droolsEngine, "init");\r
     }\r
 \r
@@ -295,17 +297,18 @@ class AlarmInfoDaoStub extends AlarmInfoDao {
     }\r
 \r
     @Override\r
-    protected int deleteAlarmByAlarmIsCleared(int alarmIsCleared) {\r
+    protected int deleteAlarmByAlarmIsCleared(String alarmName, String sourceName, String sourceId) {\r
         return 1;\r
     }\r
 }\r
 \r
 class DbDaoUtilStub extends DbDaoUtil {\r
     private AlarmInfoDao dao = new AlarmInfoDaoStub();\r
+\r
     @Override\r
     public <T> T getJdbiDaoByOnDemand(Class<T> daoClazz) {\r
 \r
-        return (T)dao;\r
+        return (T) dao;\r
 \r
     }\r
 }\r