diff options
author | FrancescoFioraEst <francesco.fiora@est.tech> | 2021-11-02 16:08:46 +0000 |
---|---|---|
committer | FrancescoFioraEst <francesco.fiora@est.tech> | 2021-11-10 12:58:26 +0000 |
commit | a88c9a232d486865ce007886daff56392ebf2d7b (patch) | |
tree | f3531235a4b12dfd48a8199f2b841126ffcf36e1 /runtime-controlloop | |
parent | e920b54e30c58f117d0c021ca82301900c9d5541 (diff) |
Add support transaction in Statistics Providers
Add support transaction
in ClElementStatisticsProvider and ParticipantStatisticsProvider
Issue-ID: POLICY-3801
Change-Id: Iaf9d55a268627f9d548afdf108476441b19e1413
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>
Diffstat (limited to 'runtime-controlloop')
5 files changed, 109 insertions, 63 deletions
diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/Application.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/Application.java index 3f51f1f2b..64d1393ac 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/Application.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/Application.java @@ -30,7 +30,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableScheduling @SpringBootApplication -@EnableJpaRepositories +@EnableJpaRepositories({"org.onap.policy.clamp.controlloop.models.controlloop.persistence.repository"}) @ComponentScan({"org.onap.policy.clamp.controlloop.models.controlloop.persistence.provider", "org.onap.policy.clamp.controlloop.runtime", "org.onap.policy.clamp.controlloop.common.rest"}) diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java index 8fbd47136..564109e5d 100644 --- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java +++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/instantiation/ControlLoopInstantiationProviderTest.java @@ -26,6 +26,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.mock; import java.io.IOException; import java.util.ArrayList; @@ -124,10 +125,8 @@ class ControlLoopInstantiationProviderTest { clProvider = new ControlLoopProvider(controlLoopParameters.getDatabaseProviderParameters()); participantProvider = new ParticipantProvider(controlLoopParameters.getDatabaseProviderParameters()); - var participantStatisticsProvider = - new ParticipantStatisticsProvider(controlLoopParameters.getDatabaseProviderParameters()); - var clElementStatisticsProvider = - new ClElementStatisticsProvider(controlLoopParameters.getDatabaseProviderParameters()); + var participantStatisticsProvider = Mockito.mock(ParticipantStatisticsProvider.class); + var clElementStatisticsProvider = mock(ClElementStatisticsProvider.class); commissioningProvider = new CommissioningProvider(new ServiceTemplateProvider(modelsProvider), clProvider, null, participantProvider); var monitoringProvider = diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/TestMonitoringProvider.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/TestMonitoringProvider.java index 2fcbf1297..2233e862c 100644 --- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/TestMonitoringProvider.java +++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/TestMonitoringProvider.java @@ -24,13 +24,19 @@ package org.onap.policy.clamp.controlloop.runtime.monitoring; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.io.File; import java.time.Instant; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.UUID; +import javax.ws.rs.core.Response; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -47,6 +53,7 @@ import org.onap.policy.clamp.controlloop.runtime.util.CommonTestData; import org.onap.policy.common.utils.coder.Coder; import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; +import org.onap.policy.models.base.PfModelRuntimeException; import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier; class TestMonitoringProvider { @@ -61,14 +68,23 @@ class TestMonitoringProvider { "src/test/resources/rest/monitoring/TestClElementStatistics_Invalid.json"; private static final Coder CODER = new StandardCoder(); - private static final String LIST_IS_NULL = ".*StatisticsList is marked .*ull but is null"; + private static final String STAT_LIST_IS_NULL = ".*StatisticsList is marked .*ull but is null"; + private static final String PARTICIPANT_STAT_LIST_IS_NULL = + "participantStatisticsList is marked .*null but is null"; + private static final String NAME_IS_NULL = "name is marked .*null but is null"; + private static final String CL_LIST_IS_NULL = "clElementStatisticsList is marked .*null but is null"; + private static final String ID_VERSION1 = "1.001"; + private static final String ID_VERSION2 = "1.002"; + private static final String ID_NAME1 = "name1"; + private static final String ID_NAME2 = "name2"; + private static final String SORT_DESC = "DESC"; + private static final String ID_NAME3 = "testCLName"; + private static final String ID_INVALID_NAME = "invalidCLName"; private static ParticipantStatisticsList inputParticipantStatistics; private static ParticipantStatisticsList invalidParticipantInput; private static ClElementStatisticsList inputClElementStatistics; private static ClElementStatisticsList invalidClElementInput; - private ParticipantStatisticsProvider participantStatisticsProvider = null; - private ClElementStatisticsProvider clElementStatisticsProvider = null; private ControlLoopProvider clProvider = null; @BeforeAll @@ -84,12 +100,6 @@ class TestMonitoringProvider { @AfterEach void close() throws Exception { - if (participantStatisticsProvider != null) { - participantStatisticsProvider.close(); - } - if (clElementStatisticsProvider != null) { - clElementStatisticsProvider.close(); - } if (clProvider != null) { clProvider.close(); } @@ -97,20 +107,28 @@ class TestMonitoringProvider { @Test void testCreateParticipantStatistics() throws Exception { + var participantStatisticsProvider = mock(ParticipantStatisticsProvider.class); + var clElementStatisticsProvider = mock(ClElementStatisticsProvider.class); ClRuntimeParameterGroup parameters = CommonTestData.geParameterGroup("createparStat"); - participantStatisticsProvider = new ParticipantStatisticsProvider(parameters.getDatabaseProviderParameters()); - clElementStatisticsProvider = new ClElementStatisticsProvider(parameters.getDatabaseProviderParameters()); clProvider = new ControlLoopProvider(parameters.getDatabaseProviderParameters()); MonitoringProvider provider = new MonitoringProvider(participantStatisticsProvider, clElementStatisticsProvider, clProvider); + + when(participantStatisticsProvider.createParticipantStatistics(any())) + .thenReturn(inputParticipantStatistics.getStatisticsList()); + + when(participantStatisticsProvider.createParticipantStatistics(eq(null))) + .thenThrow(new PfModelRuntimeException(Response.Status.BAD_REQUEST, PARTICIPANT_STAT_LIST_IS_NULL)); + // Creating statistics data in db with null input + assertThatThrownBy(() -> { provider.createParticipantStatistics(null); - }).hasMessageMatching(LIST_IS_NULL); + }).hasMessageMatching(STAT_LIST_IS_NULL); assertThatThrownBy(() -> { provider.createParticipantStatistics(invalidParticipantInput.getStatisticsList()); - }).hasMessageMatching("participantStatisticsList is marked .*null but is null"); + }).hasMessageMatching(PARTICIPANT_STAT_LIST_IS_NULL); // Creating statistics data from input json ParticipantStatisticsList createResponse = @@ -123,32 +141,41 @@ class TestMonitoringProvider { @Test void testGetParticipantStatistics() throws Exception { + var participantStatisticsProvider = mock(ParticipantStatisticsProvider.class); + when(participantStatisticsProvider.getFilteredParticipantStatistics(eq(ID_NAME1), any(), any(), any(), eq(null), + eq(SORT_DESC), eq(0))).thenReturn(List.of(inputParticipantStatistics.getStatisticsList().get(0))); + + when(participantStatisticsProvider.getFilteredParticipantStatistics(eq(ID_NAME1), any(), + eq(Instant.parse("2021-01-11T12:00:00.000Z")), eq(Instant.parse("2021-01-11T16:00:00.000Z")), eq(null), + eq(SORT_DESC), eq(0))).thenReturn(List.of()); + + when(participantStatisticsProvider.getFilteredParticipantStatistics(eq(ID_NAME2), any(), any(), any(), eq(null), + eq(SORT_DESC), eq(1))).thenReturn(List.of(inputParticipantStatistics.getStatisticsList().get(2))); + ClRuntimeParameterGroup parameters = CommonTestData.geParameterGroup("getparStat"); - participantStatisticsProvider = new ParticipantStatisticsProvider(parameters.getDatabaseProviderParameters()); - clElementStatisticsProvider = new ClElementStatisticsProvider(parameters.getDatabaseProviderParameters()); clProvider = new ControlLoopProvider(parameters.getDatabaseProviderParameters()); + var clElementStatisticsProvider = mock(ClElementStatisticsProvider.class); MonitoringProvider provider = new MonitoringProvider(participantStatisticsProvider, clElementStatisticsProvider, clProvider); - provider.createParticipantStatistics(inputParticipantStatistics.getStatisticsList()); assertThatThrownBy(() -> { provider.fetchFilteredParticipantStatistics(null, null, 0, null, null); - }).hasMessageMatching("name is marked .*null but is null"); + }).hasMessageMatching(NAME_IS_NULL); // Fetch specific statistics record with name, version and record count ParticipantStatisticsList getResponse = - provider.fetchFilteredParticipantStatistics("name2", "1.001", 1, null, null); + provider.fetchFilteredParticipantStatistics(ID_NAME2, ID_VERSION1, 1, null, null); assertThat(getResponse.getStatisticsList()).hasSize(1); assertEquals(getResponse.getStatisticsList().get(0).toString().replaceAll("\\s+", ""), inputParticipantStatistics.getStatisticsList().get(2).toString().replaceAll("\\s+", "")); // Fetch statistics using timestamp - getResponse = provider.fetchFilteredParticipantStatistics("name1", "1.001", 0, null, + getResponse = provider.fetchFilteredParticipantStatistics(ID_NAME1, ID_VERSION1, 0, null, Instant.parse("2021-01-10T15:00:00.000Z")); assertThat(getResponse.getStatisticsList()).hasSize(1); - getResponse = provider.fetchFilteredParticipantStatistics("name1", "1.001", 0, + getResponse = provider.fetchFilteredParticipantStatistics(ID_NAME1, ID_VERSION1, 0, Instant.parse("2021-01-11T12:00:00.000Z"), Instant.parse("2021-01-11T16:00:00.000Z")); assertThat(getResponse.getStatisticsList()).isEmpty(); @@ -156,21 +183,27 @@ class TestMonitoringProvider { @Test void testCreateClElementStatistics() throws Exception { + var clElementStatisticsProvider = mock(ClElementStatisticsProvider.class); + when(clElementStatisticsProvider.createClElementStatistics(any())) + .thenReturn(inputClElementStatistics.getClElementStatistics()); + + when(clElementStatisticsProvider.createClElementStatistics(eq(null))) + .thenThrow(new PfModelRuntimeException(Response.Status.BAD_REQUEST, CL_LIST_IS_NULL)); + ClRuntimeParameterGroup parameters = CommonTestData.geParameterGroup("createelemstat"); - participantStatisticsProvider = new ParticipantStatisticsProvider(parameters.getDatabaseProviderParameters()); - clElementStatisticsProvider = new ClElementStatisticsProvider(parameters.getDatabaseProviderParameters()); clProvider = new ControlLoopProvider(parameters.getDatabaseProviderParameters()); + var participantStatisticsProvider = mock(ParticipantStatisticsProvider.class); MonitoringProvider provider = new MonitoringProvider(participantStatisticsProvider, clElementStatisticsProvider, clProvider); // Creating statistics data in db with null input assertThatThrownBy(() -> { provider.createClElementStatistics(null); - }).hasMessageMatching(LIST_IS_NULL); + }).hasMessageMatching(STAT_LIST_IS_NULL); assertThatThrownBy(() -> { provider.createClElementStatistics(invalidClElementInput.getClElementStatistics()); - }).hasMessageMatching("clElementStatisticsList is marked .*null but is null"); + }).hasMessageMatching(CL_LIST_IS_NULL); // Creating clElement statistics data from input json ClElementStatisticsList createResponse = @@ -183,42 +216,46 @@ class TestMonitoringProvider { @Test void testGetClElementStatistics() throws Exception { + var participantStatisticsProvider = mock(ParticipantStatisticsProvider.class); + var clElementStatisticsProvider = mock(ClElementStatisticsProvider.class); ClRuntimeParameterGroup parameters = CommonTestData.geParameterGroup("getelemstat"); - participantStatisticsProvider = new ParticipantStatisticsProvider(parameters.getDatabaseProviderParameters()); - clElementStatisticsProvider = new ClElementStatisticsProvider(parameters.getDatabaseProviderParameters()); clProvider = new ControlLoopProvider(parameters.getDatabaseProviderParameters()); + when(clElementStatisticsProvider.getFilteredClElementStatistics(eq(ID_NAME1), any(), any(), any(), anyMap(), + eq(SORT_DESC), eq(0))) + .thenReturn(List.of(inputClElementStatistics.getClElementStatistics().get(0), + inputClElementStatistics.getClElementStatistics().get(1))); + MonitoringProvider provider = new MonitoringProvider(participantStatisticsProvider, clElementStatisticsProvider, clProvider); assertThatThrownBy(() -> { provider.fetchFilteredClElementStatistics(null, null, null, null, null, 0); - }).hasMessageMatching("name is marked .*null but is null"); + }).hasMessageMatching(NAME_IS_NULL); provider.createClElementStatistics(inputClElementStatistics.getClElementStatistics()); ClElementStatisticsList getResponse = - provider.fetchFilteredClElementStatistics("name1", null, null, null, null, 0); + provider.fetchFilteredClElementStatistics(ID_NAME1, null, null, null, null, 0); assertThat(getResponse.getClElementStatistics()).hasSize(2); assertEquals(getResponse.getClElementStatistics().get(0).toString().replaceAll("\\s+", ""), inputClElementStatistics.getClElementStatistics().get(0).toString().replaceAll("\\s+", "")); // Fetch specific statistics record with name, id and record count - getResponse = provider.fetchFilteredClElementStatistics("name1", "1.001", + getResponse = provider.fetchFilteredClElementStatistics(ID_NAME1, ID_VERSION1, "709c62b3-8918-41b9-a747-d21eb79c6c20", null, null, 0); assertThat(getResponse.getClElementStatistics()).hasSize(2); // Fetch statistics using timestamp - getResponse = provider.fetchFilteredClElementStatistics("name1", "1.001", null, + getResponse = provider.fetchFilteredClElementStatistics(ID_NAME1, ID_VERSION1, null, Instant.parse("2021-01-10T13:45:00.000Z"), null, 0); assertThat(getResponse.getClElementStatistics()).hasSize(2); } @Test void testGetParticipantStatsPerCL() throws Exception { - ClRuntimeParameterGroup parameters = CommonTestData.geParameterGroup("getparStatCL"); - participantStatisticsProvider = new ParticipantStatisticsProvider(parameters.getDatabaseProviderParameters()); - clElementStatisticsProvider = new ClElementStatisticsProvider(parameters.getDatabaseProviderParameters()); + var participantStatisticsProvider = mock(ParticipantStatisticsProvider.class); + var clElementStatisticsProvider = mock(ClElementStatisticsProvider.class); var mockClProvider = Mockito.mock(ControlLoopProvider.class); var provider = new MonitoringProvider(participantStatisticsProvider, clElementStatisticsProvider, mockClProvider); @@ -227,56 +264,63 @@ class TestMonitoringProvider { var controlLoop = new ControlLoop(); var element = new ControlLoopElement(); - element.setParticipantId(new ToscaConceptIdentifier("name1", "1.001")); + element.setParticipantId(new ToscaConceptIdentifier(ID_NAME1, ID_VERSION1)); controlLoop.setElements(Map.of(UUID.randomUUID(), element)); - when(mockClProvider.getControlLoop(new ToscaConceptIdentifier("testName", "1.001"))) - .thenReturn(controlLoop); + when(mockClProvider.getControlLoop(new ToscaConceptIdentifier(ID_NAME2, ID_VERSION1))).thenReturn(controlLoop); + + when(participantStatisticsProvider.getFilteredParticipantStatistics(eq(ID_NAME1), eq(ID_VERSION1), any(), any(), + eq(null), eq(SORT_DESC), eq(0))) + .thenReturn(List.of(inputParticipantStatistics.getStatisticsList().get(0), + inputParticipantStatistics.getStatisticsList().get(1))); - ParticipantStatisticsList getResponse = provider.fetchParticipantStatsPerControlLoop("testName", "1.001"); + ParticipantStatisticsList getResponse = provider.fetchParticipantStatsPerControlLoop(ID_NAME2, ID_VERSION1); assertThat(getResponse.getStatisticsList()).hasSize(2); assertEquals(getResponse.getStatisticsList().get(0).toString().replaceAll("\\s+", ""), inputParticipantStatistics.getStatisticsList().get(0).toString().replaceAll("\\s+", "")); - assertThat(provider.fetchParticipantStatsPerControlLoop("invalidCLName", "1.002").getStatisticsList()) + assertThat(provider.fetchParticipantStatsPerControlLoop(ID_INVALID_NAME, ID_VERSION2).getStatisticsList()) .isEmpty(); } @Test void testClElementStatsPerCL() throws Exception { // Setup a dummy Control loop data - ControlLoopElement mockClElement = new ControlLoopElement(); + var mockClElement = new ControlLoopElement(); mockClElement.setId(inputClElementStatistics.getClElementStatistics().get(0).getId()); mockClElement.setParticipantId(new ToscaConceptIdentifier( inputClElementStatistics.getClElementStatistics().get(0).getParticipantId().getName(), inputClElementStatistics.getClElementStatistics().get(0).getParticipantId().getVersion())); - ControlLoop mockCL = new ControlLoop(); + var mockCL = new ControlLoop(); mockCL.setElements(new LinkedHashMap<>()); mockCL.getElements().put(mockClElement.getId(), mockClElement); - ClRuntimeParameterGroup parameters = CommonTestData.geParameterGroup("getelemstatPerCL"); - participantStatisticsProvider = new ParticipantStatisticsProvider(parameters.getDatabaseProviderParameters()); - clElementStatisticsProvider = new ClElementStatisticsProvider(parameters.getDatabaseProviderParameters()); - ControlLoopProvider mockClProvider = Mockito.mock(ControlLoopProvider.class); + var participantStatisticsProvider = mock(ParticipantStatisticsProvider.class); + var clElementStatisticsProvider = mock(ClElementStatisticsProvider.class); + var mockClProvider = Mockito.mock(ControlLoopProvider.class); var monitoringProvider = new MonitoringProvider(participantStatisticsProvider, clElementStatisticsProvider, mockClProvider); // Mock controlloop data to be returned for the given CL Id - when(mockClProvider.getControlLoop(new ToscaConceptIdentifier("testCLName", "1.001"))).thenReturn(mockCL); + when(mockClProvider.getControlLoop(new ToscaConceptIdentifier(ID_NAME3, ID_VERSION1))).thenReturn(mockCL); + + when(clElementStatisticsProvider.getFilteredClElementStatistics(eq(ID_NAME1), eq(ID_VERSION1), any(), any(), + anyMap(), eq(SORT_DESC), eq(0))) + .thenReturn(List.of(inputClElementStatistics.getClElementStatistics().get(0), + inputClElementStatistics.getClElementStatistics().get(1))); monitoringProvider.createClElementStatistics(inputClElementStatistics.getClElementStatistics()); ClElementStatisticsList getResponse = - monitoringProvider.fetchClElementStatsPerControlLoop("testCLName", "1.001"); + monitoringProvider.fetchClElementStatsPerControlLoop(ID_NAME3, ID_VERSION1); assertThat(getResponse.getClElementStatistics()).hasSize(2); assertEquals(getResponse.getClElementStatistics().get(1).toString().replaceAll("\\s+", ""), inputClElementStatistics.getClElementStatistics().get(1).toString().replaceAll("\\s+", "")); - assertThat( - monitoringProvider.fetchClElementStatsPerControlLoop("invalidCLName", "1.002").getClElementStatistics()) - .isEmpty(); + assertThat(monitoringProvider.fetchClElementStatsPerControlLoop(ID_INVALID_NAME, ID_VERSION2) + .getClElementStatistics()).isEmpty(); Map<String, ToscaConceptIdentifier> clElementIds = - monitoringProvider.getAllClElementsIdPerControlLoop("testCLName", "1.001"); + monitoringProvider.getAllClElementsIdPerControlLoop(ID_NAME3, ID_VERSION1); assertThat(clElementIds) .containsKey(inputClElementStatistics.getClElementStatistics().get(0).getId().toString()); } diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryControllerTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryControllerTest.java index 77742aea9..eaf824623 100644 --- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryControllerTest.java +++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/monitoring/rest/MonitoringQueryControllerTest.java @@ -141,7 +141,12 @@ class MonitoringQueryControllerTest extends CommonRestController { assertNotNull(result1); assertThat(result1.getClElementStatistics()).hasSize(2); - assertEquals(result1.getClElementStatistics().get(0), clElementStatisticsList.getClElementStatistics().get(0)); + + var clElementStat0 = clElementStatisticsList.getClElementStatistics().get(0); + for (var clElement : result1.getClElementStatistics()) { + assertEquals(clElement.getParticipantId().asConceptKey(), clElementStat0.getParticipantId().asConceptKey()); + assertEquals(clElement.getId(), clElementStat0.getId()); + } // Filter statistics based on timestamp Invocation.Builder invokeRequest2 = super.sendRequest(CLELEMENT_STATS_ENDPOINT + "?name=" @@ -155,7 +160,7 @@ class MonitoringQueryControllerTest extends CommonRestController { assertNotNull(result2); assertThat(result2.getClElementStatistics()).hasSize(1); - assertEquals(result1.getClElementStatistics().get(0), clElementStatisticsList.getClElementStatistics().get(0)); + assertEquals(result2.getClElementStatistics().get(0), clElementStat0); } @Test @@ -178,7 +183,7 @@ class MonitoringQueryControllerTest extends CommonRestController { assertNotNull(result1); assertThat(result1.getStatisticsList()).hasSize(2); - assertEquals(result1.getStatisticsList().get(0), participantStatisticsList.getStatisticsList().get(0)); + assertThat(result1.getStatisticsList()).contains(participantStatisticsList.getStatisticsList().get(0)); // Filter statistics based on timestamp Invocation.Builder invokeRequest2 = super.sendRequest(PARTICIPANT_STATS_ENDPOINT + "?name=" @@ -191,7 +196,7 @@ class MonitoringQueryControllerTest extends CommonRestController { assertNotNull(result2); assertThat(result2.getStatisticsList()).hasSize(1); - assertEquals(result1.getStatisticsList().get(0), participantStatisticsList.getStatisticsList().get(0)); + assertEquals(result2.getStatisticsList().get(0), participantStatisticsList.getStatisticsList().get(0)); } @Test diff --git a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/SupervisionMessagesTest.java b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/SupervisionMessagesTest.java index ade2723cb..93433f59c 100644 --- a/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/SupervisionMessagesTest.java +++ b/runtime-controlloop/src/test/java/org/onap/policy/clamp/controlloop/runtime/supervision/comm/SupervisionMessagesTest.java @@ -76,10 +76,8 @@ class SupervisionMessagesTest extends CommonRestController { clProvider = new ControlLoopProvider(controlLoopParameters.getDatabaseProviderParameters()); - var participantStatisticsProvider = - new ParticipantStatisticsProvider(controlLoopParameters.getDatabaseProviderParameters()); - var clElementStatisticsProvider = - new ClElementStatisticsProvider(controlLoopParameters.getDatabaseProviderParameters()); + var participantStatisticsProvider = mock(ParticipantStatisticsProvider.class); + var clElementStatisticsProvider = mock(ClElementStatisticsProvider.class); var monitoringProvider = new MonitoringProvider(participantStatisticsProvider, clElementStatisticsProvider, clProvider); var participantProvider = new ParticipantProvider(controlLoopParameters.getDatabaseProviderParameters()); |