X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=r-app-catalogue%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Frappcatalogue%2FHttpsRequestTest.java;h=8a66e14b999a9039131b330c664f594095a787d1;hb=c5b6948e2a6fe657134de0d26385470c8803655f;hp=3cf2c2e79ef08b9bde016e48286b4fe7bf8d4f48;hpb=64cb483277e5162c1fbc943df043f44aff7f85f9;p=nonrtric.git diff --git a/r-app-catalogue/src/test/java/org/oransc/rappcatalogue/HttpsRequestTest.java b/r-app-catalogue/src/test/java/org/oransc/rappcatalogue/HttpsRequestTest.java index 3cf2c2e7..8a66e14b 100644 --- a/r-app-catalogue/src/test/java/org/oransc/rappcatalogue/HttpsRequestTest.java +++ b/r-app-catalogue/src/test/java/org/oransc/rappcatalogue/HttpsRequestTest.java @@ -18,9 +18,9 @@ package org.oransc.rappcatalogue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import javax.net.ssl.SSLContext; @@ -28,8 +28,8 @@ import org.apache.http.client.HttpClient; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.impl.client.HttpClients; import org.apache.http.ssl.SSLContextBuilder; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.context.SpringBootTest; @@ -43,11 +43,11 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.util.ResourceUtils; import org.springframework.web.client.ResourceAccessException; -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @TestPropertySource( properties = { // @@ -69,7 +69,7 @@ public class HttpsRequestTest { @Test public void testSsl() { - assertEquals(this.webServerFactory.getSsl().isEnabled(), true); + assertEquals(true, this.webServerFactory.getSsl().isEnabled()); } @Test