diff options
3 files changed, 6 insertions, 9 deletions
diff --git a/so-cnf-adapter-application/pom.xml b/so-cnf-adapter-application/pom.xml index 0daa32c..2928d4b 100755 --- a/so-cnf-adapter-application/pom.xml +++ b/so-cnf-adapter-application/pom.xml @@ -168,11 +168,6 @@ <type>pom</type> </dependency> <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> <scope>test</scope> diff --git a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/healthcheck/HealthCheckServiceTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/healthcheck/HealthCheckServiceTest.java index 33d3104..8803521 100644 --- a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/healthcheck/HealthCheckServiceTest.java +++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/healthcheck/HealthCheckServiceTest.java @@ -1,8 +1,8 @@ package org.onap.so.adapters.cnf.service.healthcheck; import com.github.tomakehurst.wiremock.junit.WireMockRule; +import org.junit.Test; import org.junit.Rule; -import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; @@ -14,6 +14,7 @@ import org.onap.so.adapters.cnf.model.healthcheck.HealthCheckResponse; import org.onap.so.adapters.cnf.model.healthcheck.K8sRbInstanceHealthCheck; import org.onap.so.adapters.cnf.model.healthcheck.K8sRbInstanceHealthCheckSimple; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; import java.util.UUID; @@ -25,8 +26,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @SpringBootTest -@RunWith(MockitoJUnitRunner.class) -class HealthCheckServiceTest { +@RunWith(SpringRunner.class) +public class HealthCheckServiceTest { private final int portNumber = 8443; @Rule public WireMockRule wireMockRule = new WireMockRule(portNumber); diff --git a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/upgrade/InstanceUpgradeServiceTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/upgrade/InstanceUpgradeServiceTest.java index 74d258d..a4e7983 100644 --- a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/upgrade/InstanceUpgradeServiceTest.java +++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/upgrade/InstanceUpgradeServiceTest.java @@ -35,6 +35,7 @@ import org.onap.so.adapters.cnf.model.MulticloudInstanceRequest; import org.onap.so.adapters.cnf.model.upgrade.InstanceUpgradeRequest; import org.onap.so.client.exception.BadResponseException; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; import java.util.Map; @@ -46,7 +47,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @SpringBootTest -@RunWith(MockitoJUnitRunner.class) +@RunWith(SpringRunner.class) public class InstanceUpgradeServiceTest { @InjectMocks |