Constructor inject the jakarte ee ClientBuilder

[aai/rest-client.git] / src / test / java / org / onap / aai / restclient / rest / RestClientBuilderTest.java

diff --git a/src/test/java/org/onap/aai/restclient/rest/RestClientBuilderTest.java b/src/test/java/org/onap/aai/restclient/rest/RestClientBuilderTest.java
index 3878813..490e84a 100644 (file)
--- a/src/test/java/org/onap/aai/restclient/rest/RestClientBuilderTest.java
+++ b/src/test/java/org/onap/aai/restclient/rest/RestClientBuilderTest.java
@@ -28,6 +28,8 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;\r
 \r
 import javax.ws.rs.client.Client;\r
+import javax.ws.rs.client.ClientBuilder;\r
+\r
 import org.junit.Before;\r
 import org.junit.Test;\r
 import org.onap.aai.restclient.enums.RestAuthenticationMode;\r
@@ -37,6 +39,8 @@ import org.onap.aai.restclient.enums.RestAuthenticationMode;
  */\r
 public class RestClientBuilderTest {\r
 \r
+    private final ClientBuilder clientBuilder = ClientBuilder.newBuilder();\r
+\r
     /**\r
      * Test case initialization\r
      *\r
@@ -53,7 +57,7 @@ public class RestClientBuilderTest {
     @Test\r
     public void validateAccesors() {\r
 \r
-        RestClientBuilder restClientBuilder = new RestClientBuilder();\r
+        RestClientBuilder restClientBuilder = new RestClientBuilder(clientBuilder);\r
 \r
         // test defaults\r
         assertEquals(restClientBuilder.isValidateServerHostname(), RestClientBuilder.DEFAULT_VALIDATE_SERVER_HOST);\r
@@ -99,7 +103,7 @@ public class RestClientBuilderTest {
     @Test\r
     public void validateNoAuthClientCreation() throws Exception {\r
 \r
-        RestClientBuilder restClientBuilder = new RestClientBuilder();\r
+        RestClientBuilder restClientBuilder = new RestClientBuilder(clientBuilder);\r
 \r
         restClientBuilder.setAuthenticationMode(RestAuthenticationMode.HTTP_NOAUTH);\r
         restClientBuilder.setConnectTimeoutInMs(12345);\r
@@ -113,7 +117,7 @@ public class RestClientBuilderTest {
     @Test\r
     public void validateUnknownModeCreateNoAuthClient() throws Exception {\r
 \r
-        RestClientBuilder restClientBuilder = new RestClientBuilder();\r
+        RestClientBuilder restClientBuilder = new RestClientBuilder(clientBuilder);\r
 \r
         restClientBuilder.setAuthenticationMode(RestAuthenticationMode.UNKNOWN_MODE);\r
         restClientBuilder.setConnectTimeoutInMs(12345);\r
@@ -126,7 +130,7 @@ public class RestClientBuilderTest {
     @Test\r
     public void validateBasicAuthSslClient() throws Exception {\r
 \r
-        RestClientBuilder restClientBuilder = new RestClientBuilder();\r
+        RestClientBuilder restClientBuilder = new RestClientBuilder(clientBuilder);\r
 \r
         restClientBuilder.setAuthenticationMode(RestAuthenticationMode.SSL_BASIC);\r
         restClientBuilder.setConnectTimeoutInMs(12345);\r
@@ -143,7 +147,7 @@ public class RestClientBuilderTest {
     @Test(expected = IllegalArgumentException.class)\r
     public void validateSslCertClient_noHostOrCertChainValidation() throws Exception {\r
 \r
-        RestClientBuilder restClientBuilder = new RestClientBuilder();\r
+        RestClientBuilder restClientBuilder = new RestClientBuilder(clientBuilder);\r
 \r
         restClientBuilder.setAuthenticationMode(RestAuthenticationMode.SSL_CERT);\r
         restClientBuilder.setConnectTimeoutInMs(12345);\r
@@ -157,7 +161,7 @@ public class RestClientBuilderTest {
     @Test(expected = IllegalArgumentException.class)\r
     public void validateSslCertClient_hostOnlyValidation() throws Exception {\r
 \r
-        RestClientBuilder restClientBuilder = new RestClientBuilder();\r
+        RestClientBuilder restClientBuilder = new RestClientBuilder(clientBuilder);\r
 \r
         restClientBuilder.setAuthenticationMode(RestAuthenticationMode.SSL_CERT);\r
         restClientBuilder.setConnectTimeoutInMs(12345);\r
@@ -172,7 +176,7 @@ public class RestClientBuilderTest {
     @Test\r
     public void validateSslCertClient_certChainOnlyValidation() throws Exception {\r
 \r
-        RestClientBuilder restClientBuilder = new RestClientBuilder();\r
+        RestClientBuilder restClientBuilder = new RestClientBuilder(clientBuilder);\r
 \r
         restClientBuilder.setAuthenticationMode(RestAuthenticationMode.SSL_CERT);\r
         restClientBuilder.setConnectTimeoutInMs(12345);\r
@@ -191,7 +195,7 @@ public class RestClientBuilderTest {
     @Test\r
     public void validateSslCertClient_withHostAndCertChainValidation() throws Exception {\r
 \r
-        RestClientBuilder restClientBuilder = new RestClientBuilder();\r
+        RestClientBuilder restClientBuilder = new RestClientBuilder(clientBuilder);\r
 \r
         restClientBuilder.setAuthenticationMode(RestAuthenticationMode.SSL_CERT);\r
         restClientBuilder.setConnectTimeoutInMs(12345);\r
@@ -210,7 +214,7 @@ public class RestClientBuilderTest {
     @Test(expected = IllegalArgumentException.class)\r
     public void validateSslCertClient_illegalArgumentExceptionWhenTruststoreIsNull() throws Exception {\r
 \r
-        RestClientBuilder restClientBuilder = new RestClientBuilder();\r
+        RestClientBuilder restClientBuilder = new RestClientBuilder(clientBuilder);\r
 \r
         restClientBuilder.setAuthenticationMode(RestAuthenticationMode.SSL_CERT);\r
         restClientBuilder.setConnectTimeoutInMs(12345);\r
@@ -230,7 +234,7 @@ public class RestClientBuilderTest {
     @Test\r
     public void validateSslProtocolConfiguration() throws Exception {\r
 \r
-        RestClientBuilder restClientBuilder = new RestClientBuilder();\r
+        RestClientBuilder restClientBuilder = new RestClientBuilder(clientBuilder);\r
         assertEquals(RestClientBuilder.DEFAULT_SSL_PROTOCOL, restClientBuilder.getSslProtocol());\r
 \r
         restClientBuilder.setSslProtocol("TLSv1.2");\r