X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fholmes%2Fengine%2Fresources%2FEngineResourcesTest.java;h=aa2052d12cc06c9945c4181369983a9189a2fa72;hb=c4dc95bc729afd91c00cab49d0a69bceb102eed9;hp=98f4797bd537bebb0cbaa50801a396da427fd5b6;hpb=e540d3894d2f662a843e5c51535d44b876b9889f;p=holmes%2Fengine-management.git

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 98f4797..aa2052d 100644
--- 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;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.onap.holmes.common.dmaap.store.ClosedLoopControlNameCache;
 import org.onap.holmes.common.exception.CorrelationException;
 import org.onap.holmes.engine.manager.DroolsEngine;
 import org.onap.holmes.engine.request.CompileRuleRequest;
@@ -36,15 +37,18 @@ import static org.easymock.EasyMock.*;
 public class EngineResourcesTest {
     @Rule
     public ExpectedException thrown = ExpectedException.none();
-    DroolsEngine droolsEngine;
+    private DroolsEngine droolsEngine;
     private EngineResources engineResources;
+    private ClosedLoopControlNameCache closedLoopControlNameCache;
 
     @Before
     public void setUp() {
         droolsEngine = PowerMock.createMock(DroolsEngine.class);
+        closedLoopControlNameCache = new ClosedLoopControlNameCache();
         engineResources = new EngineResources();
+        engineResources.setClosedLoopControlNameCache(closedLoopControlNameCache);
 
-        Whitebox.setInternalState(engineResources,"droolsEngine",droolsEngine);
+        Whitebox.setInternalState(engineResources,"droolsEngine", droolsEngine);
         PowerMock.resetAll();
     }
 
@@ -56,7 +60,7 @@ public class EngineResourcesTest {
         thrown.expect(WebApplicationException.class);
 
         expect(httpRequest.getHeader("language-option")).andReturn("en_US");
-        expect(droolsEngine.deployRule(anyObject(DeployRuleRequest.class), anyObject(Locale.class))).
+        expect(droolsEngine.deployRule(anyObject(DeployRuleRequest.class))).
                 andThrow(new CorrelationException(""));
         PowerMock.replayAll();
         engineResources.deployRule(deployRuleRequest, httpRequest);
@@ -66,12 +70,12 @@ public class EngineResourcesTest {
     @Test
     public void deployRule_normal() throws CorrelationException {
         DeployRuleRequest deployRuleRequest = new DeployRuleRequest();
+        deployRuleRequest.setContent("package packageName;\n\nimport xxx.xxx.xxx;");
         deployRuleRequest.setLoopControlName("loopControlName");
         HttpServletRequest httpRequest = PowerMock.createMock(HttpServletRequest.class);
 
         expect(httpRequest.getHeader("language-option")).andReturn("en_US");
-        expect(droolsEngine.deployRule(anyObject(DeployRuleRequest.class),
-                anyObject(Locale.class))).andReturn("packageName");
+        expect(droolsEngine.deployRule(anyObject(DeployRuleRequest.class))).andReturn("packageName");
         PowerMock.replayAll();
         engineResources.deployRule(deployRuleRequest, httpRequest);
         PowerMock.verifyAll();
@@ -85,7 +89,7 @@ public class EngineResourcesTest {
         thrown.expect(WebApplicationException.class);
 
         expect(httpRequest.getHeader("language-option")).andReturn("en_US");
-        droolsEngine.undeployRule(anyObject(String.class), anyObject(Locale.class));
+        droolsEngine.undeployRule(anyObject(String.class));
         expectLastCall().andThrow(new CorrelationException(""));
         PowerMock.replayAll();
         engineResources.undeployRule(packageName, httpRequest);
@@ -98,7 +102,7 @@ public class EngineResourcesTest {
         HttpServletRequest httpRequest = PowerMock.createMock(HttpServletRequest.class);
 
         expect(httpRequest.getHeader("language-option")).andReturn("en_US");
-        droolsEngine.undeployRule(anyObject(String.class), anyObject(Locale.class));
+        droolsEngine.undeployRule(anyObject(String.class));
         PowerMock.replayAll();
         engineResources.undeployRule(packageName, httpRequest);
         PowerMock.verifyAll();
@@ -112,7 +116,7 @@ public class EngineResourcesTest {
         thrown.expect(WebApplicationException.class);
 
         expect(httpRequest.getHeader("language-option")).andReturn("en_US");
-        droolsEngine.compileRule(anyObject(String.class),anyObject(Locale.class));
+        droolsEngine.compileRule(anyObject(String.class));
         expectLastCall().andThrow(new CorrelationException(""));
         PowerMock.replayAll();
         engineResources.compileRule(compileRuleRequest, httpRequest);
@@ -125,7 +129,7 @@ public class EngineResourcesTest {
         HttpServletRequest httpRequest = PowerMock.createMock(HttpServletRequest.class);
 
         expect(httpRequest.getHeader("language-option")).andReturn("en_US");
-        droolsEngine.compileRule(anyObject(String.class),anyObject(Locale.class));
+        droolsEngine.compileRule(anyObject(String.class));
         PowerMock.replayAll();
         engineResources.compileRule(compileRuleRequest, httpRequest);
         PowerMock.verifyAll();