X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fservice%2FTestModelLoaderService.java;h=f926d8e1ba0ede961a8a7bbbbc77f65ae3613687;hb=b5c15a4baafeac466c1565f2237d6f8cdaf9fd72;hp=e40ca3cee6b9a9b9859bf0ddab5a0892c6f35e97;hpb=7e6fe8c29c5a5cfa5caf6ab47b30280e1fc20432;p=aai%2Fmodel-loader.git diff --git a/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderService.java b/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderService.java index e40ca3c..f926d8e 100644 --- a/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderService.java +++ b/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderService.java @@ -21,25 +21,25 @@ package org.onap.aai.modelloader.service; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; 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, MockBabelServiceClientFactory.class}) @TestPropertySource(properties = {"CONFIG_HOME=src/test/resources",}) public class TestModelLoaderService { @@ -47,7 +47,7 @@ public class TestModelLoaderService { @Autowired private ModelLoaderService service; - @After + @AfterEach public void shutdown() { service.preShutdownOperations(); } @@ -55,6 +55,7 @@ public class TestModelLoaderService { @Test public void testMissingConfig() { new ModelLoaderService().start(); + assertTrue(true); } @Test