Code Review
/
holmes
/
engine-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Optimized Rule Deployment Logic
[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
6be232f
..
a09eb3a
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
@@
-44,7
+44,7
@@
public class EngineResourcesTest {
droolsEngine = PowerMock.createMock(DroolsEngine.class);
\r
engineResources = new EngineResources();
\r
\r
droolsEngine = PowerMock.createMock(DroolsEngine.class);
\r
engineResources = new EngineResources();
\r
\r
- Whitebox.setInternalState(engineResources,"droolsEngine",droolsEngine);
\r
+ Whitebox.setInternalState(engineResources,"droolsEngine",
droolsEngine);
\r
PowerMock.resetAll();
\r
}
\r
\r
PowerMock.resetAll();
\r
}
\r
\r
@@
-56,7
+56,7
@@
public class EngineResourcesTest {
thrown.expect(WebApplicationException.class);
\r
\r
expect(httpRequest.getHeader("language-option")).andReturn("en_US");
\r
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
andThrow(new CorrelationException(""));
\r
PowerMock.replayAll();
\r
engineResources.deployRule(deployRuleRequest, httpRequest);
\r
@@
-71,8
+71,7
@@
public class EngineResourcesTest {
HttpServletRequest httpRequest = PowerMock.createMock(HttpServletRequest.class);
\r
\r
expect(httpRequest.getHeader("language-option")).andReturn("en_US");
\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
PowerMock.replayAll();
\r
engineResources.deployRule(deployRuleRequest, httpRequest);
\r
PowerMock.verifyAll();
\r
@@
-86,7
+85,7
@@
public class EngineResourcesTest {
thrown.expect(WebApplicationException.class);
\r
\r
expect(httpRequest.getHeader("language-option")).andReturn("en_US");
\r
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
expectLastCall().andThrow(new CorrelationException(""));
\r
PowerMock.replayAll();
\r
engineResources.undeployRule(packageName, httpRequest);
\r
@@
-99,7
+98,7
@@
public class EngineResourcesTest {
HttpServletRequest httpRequest = PowerMock.createMock(HttpServletRequest.class);
\r
\r
expect(httpRequest.getHeader("language-option")).andReturn("en_US");
\r
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
PowerMock.replayAll();
\r
engineResources.undeployRule(packageName, httpRequest);
\r
PowerMock.verifyAll();
\r
@@
-113,7
+112,7
@@
public class EngineResourcesTest {
thrown.expect(WebApplicationException.class);
\r
\r
expect(httpRequest.getHeader("language-option")).andReturn("en_US");
\r
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
expectLastCall().andThrow(new CorrelationException(""));
\r
PowerMock.replayAll();
\r
engineResources.compileRule(compileRuleRequest, httpRequest);
\r
@@
-126,7
+125,7
@@
public class EngineResourcesTest {
HttpServletRequest httpRequest = PowerMock.createMock(HttpServletRequest.class);
\r
\r
expect(httpRequest.getHeader("language-option")).andReturn("en_US");
\r
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
PowerMock.replayAll();
\r
engineResources.compileRule(compileRuleRequest, httpRequest);
\r
PowerMock.verifyAll();
\r