X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fholmes%2Frulemgt%2Fdcae%2FDcaeConfigurationPollingTest.java;h=1037495e72a9f3920667800265e5b64069d003fd;hb=3a2c70f1ee024dbad4dc091d3105064641908e1d;hp=a33030685151d3cc39346ae058ab53f3b2152440;hpb=3893b89844f0e76d1a80c578216c4320fac65ed9;p=holmes%2Frule-management.git diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java index a330306..1037495 100644 --- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java +++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java @@ -15,14 +15,9 @@ */ package org.onap.holmes.rulemgt.dcae; -import static org.easymock.EasyMock.anyObject; -import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; import static org.powermock.api.mockito.PowerMockito.when; - -import com.fasterxml.jackson.databind.ObjectMapper; -import javax.ws.rs.ProcessingException; import org.junit.Before; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -39,7 +34,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -@PrepareForTest({DcaeConfigurationPolling.class, MicroServiceConfig.class, ObjectMapper.class}) +@PrepareForTest({DcaeConfigurationPolling.class, MicroServiceConfig.class}) @RunWith(PowerMockRunner.class) public class DcaeConfigurationPollingTest { @@ -57,7 +52,7 @@ public class DcaeConfigurationPollingTest { public void testDaceConfigurationPolling_getDcaeConfigurations_exception() throws Exception { PowerMock.resetAll(); thrown.expect(CorrelationException.class); - thrown.expectMessage("host"); + thrown.expectMessage("syntax error, pos 1"); PowerMockito.mockStatic(MicroServiceConfig.class); when(MicroServiceConfig.getServiceConfigInfoFromCBS("holmes-rule-mgmt")) .thenReturn("host"); @@ -93,7 +88,7 @@ public class DcaeConfigurationPollingTest { public void testDaceConfigurationPolling_addAllCorrelationRules_connection_exception() throws Exception { PowerMock.resetAll(); - thrown.expect(ProcessingException.class); + thrown.expect(CorrelationException.class); DcaeConfigurations dcaeConfigurations = new DcaeConfigurations(); Rule rule = new Rule("test", "test", "tset",1); dcaeConfigurations.getDefaultRules().add(rule);