cleanup of httpclient tests

gregellis · Nov 25, 2014 · 72279b8 · 72279b8
1 parent d8e4f04
commit 72279b8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
@@ -173,7 +173,7 @@
 		<mockito.version>1.10.8</mockito.version>
 
 		<httpcore.version>4.3.3</httpcore.version>
-		<httpclient.version>4.3.4</httpclient.version>
+		<httpclient.version>4.3.6</httpclient.version>
 
 		<rest-assured.version>2.4.0</rest-assured.version>
 

diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpsClientSslLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/HttpsClientSslLiveTest.java
@@ -7,7 +7,7 @@
 import java.security.GeneralSecurityException;
 import java.security.cert.X509Certificate;
 
-import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLException;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.ClientProtocolException;
@@ -39,7 +39,7 @@ public class HttpsClientSslLiveTest {
 
     // tests
 
-    @Test(expected = SSLPeerUnverifiedException.class)
+    @Test(expected = SSLException.class)
     public final void whenHttpsUrlIsConsumed_thenException() throws ClientProtocolException, IOException {
         final CloseableHttpClient httpClient = HttpClientBuilder.create().build();
 
@@ -71,6 +71,28 @@ public final boolean isTrusted(final X509Certificate[] certificate, final String
         httpClient.close();
     }
 
+    @Test
+    public final void givenHttpClientAfter4_3_whenAcceptingAllCertificates_thenCanConsumeHttpsUriWithSelfSignedCertificate() throws IOException, GeneralSecurityException {
+        final TrustStrategy acceptingTrustStrategy = new TrustStrategy() {
+            @Override
+            public final boolean isTrusted(final X509Certificate[] certificate, final String authType) {
+                return true;
+            }
+        };
+        final SSLSocketFactory sf = new SSLSocketFactory(acceptingTrustStrategy, SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+        final SchemeRegistry registry = new SchemeRegistry();
+        registry.register(new Scheme("https", 443, sf));
+        final ClientConnectionManager ccm = new PoolingClientConnectionManager(registry);
+
+        final CloseableHttpClient httpClient = new DefaultHttpClient(ccm);
+
+        final HttpGet getMethod = new HttpGet(HOST_WITH_SSL);
+        final HttpResponse response = httpClient.execute(getMethod);
+        assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
+
+        httpClient.close();
+    }
+
     @Test
     public final void givenHttpClientPost4_3_whenAcceptingAllCertificates_thenCanConsumeHttpsUriWithSelfSignedCertificate() throws IOException, GeneralSecurityException {
         final SSLContextBuilder builder = new SSLContextBuilder();