From d901722a4ebc68c78df8a2643a46287497d3ac81 Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Tue, 17 Dec 2019 10:22:39 +0100 Subject: [PATCH] Add use of @Mock Change-Id: I9fe733038119b124928cfffc2dae54e65928104d Issue-ID: NONRTRIC-81 Signed-off-by: elinuxhenrik --- policy-agent/pom.xml | 35 +++++++++++++++++----- .../org/oransc/policyagent/ApplicationTest.java | 2 -- .../configuration/ApplicationConfigTest.java | 16 ++++++---- .../policyagent/tasks/StartupServiceTest.java | 18 +++++++---- 4 files changed, 50 insertions(+), 21 deletions(-) diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml index d9a28e33..0969f149 100644 --- a/policy-agent/pom.xml +++ b/policy-agent/pom.xml @@ -53,6 +53,7 @@ 2.0.0 20180130 3.8.0 + 1.3.2 2.8.1 1.18.0 1.4.13 @@ -111,6 +112,16 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.onap.dcaegen2.services.sdk.rest.services + cbs-client + ${sdk.version} + io.springfox @@ -122,11 +133,7 @@ springfox-swagger-ui ${springfox.version} - - org.onap.dcaegen2.services.sdk.rest.services - cbs-client - ${sdk.version} - + io.projectreactor reactor-test @@ -138,9 +145,14 @@ test - org.springframework.boot - spring-boot-configuration-processor - true + org.mockito + mockito-junit-jupiter + test + + + org.mockito + mockito-core + test @@ -181,6 +193,13 @@ false + + + org.junit.platform + junit-platform-surefire-provider + ${junit-platform-surefire-provider.version} + + org.codehaus.mojo diff --git a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java index b3e2c983..84841c7a 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -26,11 +26,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; - import java.net.URL; import java.util.List; import java.util.Vector; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.oransc.policyagent.configuration.ApplicationConfig; diff --git a/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigTest.java b/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigTest.java index 2680608d..ff1db6af 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigTest.java @@ -24,21 +24,18 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; - import com.google.common.base.Charsets; import com.google.common.io.Resources; import com.google.gson.JsonIOException; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.JsonSyntaxException; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -48,23 +45,30 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Properties; import java.util.Vector; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClient; import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.EnvProperties; import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.ImmutableEnvProperties; import org.oransc.policyagent.exceptions.ServiceException; import org.oransc.policyagent.utils.LoggingUtils; - import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; +@ExtendWith(MockitoExtension.class) +@RunWith(MockitoJUnitRunner.class) public class ApplicationConfigTest { private ApplicationConfig appConfigUnderTest; - CbsClient cbsClient = mock(CbsClient.class); + + @Mock + CbsClient cbsClient; public static final ImmutableRicConfig CORRECT_RIC_CONIFG = ImmutableRicConfig.builder() // .name("ric1") // diff --git a/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java b/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java index fd98e07a..39722070 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java @@ -23,7 +23,7 @@ package org.oransc.policyagent.tasks; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.mock; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -32,6 +32,11 @@ import static org.oransc.policyagent.repository.Ric.RicState.ACTIVE; import java.util.Vector; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.oransc.policyagent.clients.RicClient; import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.configuration.ImmutableRicConfig; @@ -43,6 +48,8 @@ import org.oransc.policyagent.repository.PolicyTypes; import org.oransc.policyagent.repository.Ric; import org.oransc.policyagent.repository.Rics; +@ExtendWith(MockitoExtension.class) +@RunWith(MockitoJUnitRunner.class) public class StartupServiceTest { private static final String FIRST_RIC_NAME = "first"; private static final String FIRST_RIC_URL = "firstUrl"; @@ -55,11 +62,14 @@ public class StartupServiceTest { private static final String POLICY_TYPE_1_NAME = "type1"; private static final String POLICY_TYPE_2_NAME = "type2"; + @Mock ApplicationConfig appConfigMock; + @Mock + RicClient ricClientMock; + @Test public void startup_allOk() throws ServiceException { - ApplicationConfig appConfigMock = mock(ApplicationConfig.class); Vector ricConfigs = new Vector<>(2); ricConfigs.add(getRicConfig(FIRST_RIC_NAME, FIRST_RIC_URL, MANAGED_NODE_A)); ricConfigs.add(getRicConfig(SECOND_RIC_NAME, SECOND_RIC_URL, MANAGED_NODE_B, MANAGED_NODE_C)); @@ -72,9 +82,7 @@ public class StartupServiceTest { secondTypes.add(type1); PolicyType type2 = ImmutablePolicyType.builder().name(POLICY_TYPE_2_NAME).jsonSchema("{}").build(); secondTypes.add(type2); - RicClient ricClientMock = mock(RicClient.class); - when(ricClientMock.getPolicyTypes(FIRST_RIC_URL)).thenReturn(firstTypes); - when(ricClientMock.getPolicyTypes("secondUrl")).thenReturn(secondTypes); + when(ricClientMock.getPolicyTypes(anyString())).thenReturn(firstTypes, secondTypes); Rics rics = new Rics(); PolicyTypes policyTypes = new PolicyTypes(); -- 2.16.6