X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fholmes%2Frulemgt%2Fresources%2FRuleMgtResourcesTest.java;h=0c3bd89aa4628b7ba85e87e9b72602acf52715ce;hb=d2e0902630ccf06bb466360e036212f5060b9055;hp=dd68ad8dadde2868ebac20313f71fb51d6084010;hpb=20a1514bf93035472d4f940f00a357106d4bec1f;p=holmes%2Frule-management.git diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java index dd68ad8..0c3bd89 100644 --- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java +++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java @@ -16,6 +16,7 @@ package org.onap.holmes.rulemgt.resources; +import com.google.gson.JsonSyntaxException; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.WebApplicationException; import org.easymock.EasyMock; @@ -111,23 +112,23 @@ public class RuleMgtResourcesTest { public void deleteCorrelationRule_correlation_exception() throws Exception { thrown.expect(WebApplicationException.class); - final RuleDeleteRequest ruleDeleteRequest = new RuleDeleteRequest(); - ruleMgtWrapper.deleteCorrelationRule(ruleDeleteRequest); + final String ruleId = "mockedRule"; + ruleMgtWrapper.deleteCorrelationRule(EasyMock.anyObject(RuleDeleteRequest.class)); EasyMock.expectLastCall().andThrow(new CorrelationException(EasyMock.anyObject(String.class))); EasyMock.expect(request.getHeader("language-option")).andReturn("en_US"); PowerMock.replayAll(); - ruleMgtResources.deleteCorrelationRule(request, ruleDeleteRequest); + ruleMgtResources.deleteCorrelationRule(request, ruleId); PowerMock.verifyAll(); } @Test public void deleteCorrelationRule_normal() throws Exception { - final RuleDeleteRequest ruleDeleteRequest = new RuleDeleteRequest(); - ruleMgtWrapper.deleteCorrelationRule(ruleDeleteRequest); + final String ruleId = "mockedRule"; + ruleMgtWrapper.deleteCorrelationRule(EasyMock.anyObject(RuleDeleteRequest.class)); EasyMock.expectLastCall(); EasyMock.expect(request.getHeader("language-option")).andReturn("en_US"); PowerMock.replayAll(); - ruleMgtResources.deleteCorrelationRule(request, ruleDeleteRequest); + ruleMgtResources.deleteCorrelationRule(request, ruleId); PowerMock.verifyAll(); } @@ -147,7 +148,7 @@ public class RuleMgtResourcesTest { @Test public void getCorrelationRules_param_translate_exception() { - thrown.expect(WebApplicationException.class); + thrown.expect(JsonSyntaxException.class); String queryRequest = "this is error param"; EasyMock.expect(request.getHeader("language-option")).andReturn("en_US").times(2);