X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fmodel-loader.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fservice%2FTestModelLoaderServiceWithSdc.java;fp=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fservice%2FTestModelLoaderServiceWithSdc.java;h=6a01bfcc9cfa0fa4baee095dcb965ccd42a52fe7;hp=976acbc56311ba2864cf6577a0f572521d964b1a;hb=b5c15a4baafeac466c1565f2237d6f8cdaf9fd72;hpb=c7d3869e64534a06692191d0cdfecb2b30138c13 diff --git a/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java b/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java index 976acbc..6a01bfc 100644 --- a/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java +++ b/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java @@ -28,20 +28,17 @@ import java.util.Base64; import javax.ws.rs.core.Response; -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.onap.aai.modelloader.util.ArtifactTestUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; /** * Tests for the ModelLoaderService class. * */ -@RunWith(SpringRunner.class) @SpringBootTest(classes = {ModelLoaderService.class, HttpsBabelServiceClientFactory.class}) @TestPropertySource(properties = {"CONFIG_HOME=src/test/resources",}) public class TestModelLoaderServiceWithSdc { @@ -49,7 +46,7 @@ public class TestModelLoaderServiceWithSdc { @Autowired private ModelLoaderService service; - @After + @AfterEach public void shutdown() { service.preShutdownOperations(); }