remove ability to disable cert chain validation

[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 5e7d8c1..7155f9a 100644 (file)
--- a/src/test/java/org/onap/aai/restclient/rest/RestClientBuilderTest.java
+++ b/src/test/java/org/onap/aai/restclient/rest/RestClientBuilderTest.java
@@ -141,6 +141,7 @@ public class RestClientBuilderTest {
     restClientBuilder.setReadTimeoutInMs(54321);\r
     restClientBuilder.setBasicAuthUsername("username");\r
     restClientBuilder.setBasicAuthPassword("password");\r
+    restClientBuilder.setTruststoreFilename("truststore");\r
     \r
     Client client = restClientBuilder.getClient();\r
    \r
@@ -155,7 +156,7 @@ public class RestClientBuilderTest {
     \r
   }\r
 \r
-  @Test\r
+  @Test (expected=IllegalArgumentException.class)\r
   public void validateSslCertClient_noHostOrCertChainValidation() throws Exception {\r
     \r
     RestClientBuilder restClientBuilder = new RestClientBuilder();\r
@@ -166,18 +167,10 @@ public class RestClientBuilderTest {
     restClientBuilder.setValidateServerCertChain(false);\r
     restClientBuilder.setValidateServerHostname(false);\r
     \r
-    Client client = restClientBuilder.getClient();\r
-   \r
-    Object sslPropertiesObj = client.getProperties().get(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES);\r
-    HTTPSProperties sslProps = null;\r
-    if ( sslPropertiesObj instanceof HTTPSProperties ) {\r
-      sslProps = (HTTPSProperties)sslPropertiesObj;\r
-      assertNotNull(sslProps.getHostnameVerifier());\r
-    } else {\r
-      fail("Unexpected value for https properties object");\r
-    }  }\r
+    Client client = restClientBuilder.getClient(); \r
+  }\r
   \r
-  @Test\r
+  @Test (expected=IllegalArgumentException.class)\r
   public void validateSslCertClient_hostOnlyValidation() throws Exception {\r
     \r
     RestClientBuilder restClientBuilder = new RestClientBuilder();\r
@@ -190,15 +183,7 @@ public class RestClientBuilderTest {
     \r
     Client client = restClientBuilder.getClient();\r
    \r
-    Object sslPropertiesObj = client.getProperties().get(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES);\r
-    HTTPSProperties sslProps = null;\r
-    if ( sslPropertiesObj instanceof HTTPSProperties ) {\r
-      sslProps = (HTTPSProperties)sslPropertiesObj;\r
-      assertNull(sslProps.getHostnameVerifier());\r
-    } else {\r
-      fail("Unexpected value for https properties object");\r
-    }\r
-   }\r
+  }\r
   \r
   @Test\r
   public void validateSslCertClient_certChainOnlyValidation() throws Exception {\r