Trying to fix the Jenkins Job

[holmes/engine-management.git] / engine-d / src / test / java / org / onap / holmes / engine / resources / EngineResourcesTest.java

diff --git a/engine-d/src/test/java/org/onap/holmes/engine/resources/EngineResourcesTest.java b/engine-d/src/test/java/org/onap/holmes/engine/resources/EngineResourcesTest.java
index 3c68182..aa2052d 100644 (file)
--- a/engine-d/src/test/java/org/onap/holmes/engine/resources/EngineResourcesTest.java
+++ b/engine-d/src/test/java/org/onap/holmes/engine/resources/EngineResourcesTest.java
@@ -20,6 +20,7 @@ import org.junit.Before;
 import org.junit.Rule;\r
 import org.junit.Test;\r
 import org.junit.rules.ExpectedException;\r
+import org.onap.holmes.common.dmaap.store.ClosedLoopControlNameCache;\r
 import org.onap.holmes.common.exception.CorrelationException;\r
 import org.onap.holmes.engine.manager.DroolsEngine;\r
 import org.onap.holmes.engine.request.CompileRuleRequest;\r
@@ -36,15 +37,18 @@ import static org.easymock.EasyMock.*;
 public class EngineResourcesTest {\r
     @Rule\r
     public ExpectedException thrown = ExpectedException.none();\r
-    DroolsEngine droolsEngine;\r
+    private DroolsEngine droolsEngine;\r
     private EngineResources engineResources;\r
+    private ClosedLoopControlNameCache closedLoopControlNameCache;\r
 \r
     @Before\r
     public void setUp() {\r
         droolsEngine = PowerMock.createMock(DroolsEngine.class);\r
+        closedLoopControlNameCache = new ClosedLoopControlNameCache();\r
         engineResources = new EngineResources();\r
+        engineResources.setClosedLoopControlNameCache(closedLoopControlNameCache);\r
 \r
-        Whitebox.setInternalState(engineResources,"droolsEngine",droolsEngine);\r
+        Whitebox.setInternalState(engineResources,"droolsEngine", droolsEngine);\r
         PowerMock.resetAll();\r
     }\r
 \r
@@ -56,7 +60,7 @@ public class EngineResourcesTest {
         thrown.expect(WebApplicationException.class);\r
 \r
         expect(httpRequest.getHeader("language-option")).andReturn("en_US");\r
-        expect(droolsEngine.deployRule(anyObject(DeployRuleRequest.class), anyObject(Locale.class))).\r
+        expect(droolsEngine.deployRule(anyObject(DeployRuleRequest.class))).\r
                 andThrow(new CorrelationException(""));\r
         PowerMock.replayAll();\r
         engineResources.deployRule(deployRuleRequest, httpRequest);\r
@@ -66,11 +70,12 @@ public class EngineResourcesTest {
     @Test\r
     public void deployRule_normal() throws CorrelationException {\r
         DeployRuleRequest deployRuleRequest = new DeployRuleRequest();\r
+        deployRuleRequest.setContent("package packageName;\n\nimport xxx.xxx.xxx;");\r
+        deployRuleRequest.setLoopControlName("loopControlName");\r
         HttpServletRequest httpRequest = PowerMock.createMock(HttpServletRequest.class);\r
 \r
         expect(httpRequest.getHeader("language-option")).andReturn("en_US");\r
-        expect(droolsEngine.deployRule(anyObject(DeployRuleRequest.class),\r
-                anyObject(Locale.class))).andReturn("packageName");\r
+        expect(droolsEngine.deployRule(anyObject(DeployRuleRequest.class))).andReturn("packageName");\r
         PowerMock.replayAll();\r
         engineResources.deployRule(deployRuleRequest, httpRequest);\r
         PowerMock.verifyAll();\r
@@ -84,7 +89,7 @@ public class EngineResourcesTest {
         thrown.expect(WebApplicationException.class);\r
 \r
         expect(httpRequest.getHeader("language-option")).andReturn("en_US");\r
-        droolsEngine.undeployRule(anyObject(String.class), anyObject(Locale.class));\r
+        droolsEngine.undeployRule(anyObject(String.class));\r
         expectLastCall().andThrow(new CorrelationException(""));\r
         PowerMock.replayAll();\r
         engineResources.undeployRule(packageName, httpRequest);\r
@@ -97,7 +102,7 @@ public class EngineResourcesTest {
         HttpServletRequest httpRequest = PowerMock.createMock(HttpServletRequest.class);\r
 \r
         expect(httpRequest.getHeader("language-option")).andReturn("en_US");\r
-        droolsEngine.undeployRule(anyObject(String.class), anyObject(Locale.class));\r
+        droolsEngine.undeployRule(anyObject(String.class));\r
         PowerMock.replayAll();\r
         engineResources.undeployRule(packageName, httpRequest);\r
         PowerMock.verifyAll();\r
@@ -111,7 +116,7 @@ public class EngineResourcesTest {
         thrown.expect(WebApplicationException.class);\r
 \r
         expect(httpRequest.getHeader("language-option")).andReturn("en_US");\r
-        droolsEngine.compileRule(anyObject(String.class),anyObject(Locale.class));\r
+        droolsEngine.compileRule(anyObject(String.class));\r
         expectLastCall().andThrow(new CorrelationException(""));\r
         PowerMock.replayAll();\r
         engineResources.compileRule(compileRuleRequest, httpRequest);\r
@@ -124,7 +129,7 @@ public class EngineResourcesTest {
         HttpServletRequest httpRequest = PowerMock.createMock(HttpServletRequest.class);\r
 \r
         expect(httpRequest.getHeader("language-option")).andReturn("en_US");\r
-        droolsEngine.compileRule(anyObject(String.class),anyObject(Locale.class));\r
+        droolsEngine.compileRule(anyObject(String.class));\r
         PowerMock.replayAll();\r
         engineResources.compileRule(compileRuleRequest, httpRequest);\r
         PowerMock.verifyAll();\r