[BAEL-13598] - Added old API, moved TimerTask Junit to httpclient-simple

amit2103 · amit2103 · commit e3a40972fe8c · 2019-04-28T16:31:11.000+05:30
diff --git a/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java b/httpclient-simple/src/test/java/org/baeldung/httpclient/HttpClientTimeoutLiveTest.java
@@ -4,14 +4,21 @@
 import static org.junit.Assert.assertThat;
 
 import java.io.IOException;
+import java.util.Timer;
+import java.util.TimerTask;
 
+import org.apache.http.HttpResponse;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.params.ClientPNames;
 import org.apache.http.config.SocketConfig;
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.params.CoreConnectionPNames;
+import org.apache.http.params.HttpParams;
 import org.junit.After;
 import org.junit.Test;
 
@@ -25,6 +32,20 @@ public final void after() throws IllegalStateException, IOException {
     }
 
     // tests
+    @Test
+    public final void givenUsingOldApi_whenSettingTimeoutViaParameter_thenCorrect() throws IOException {
+        
+        DefaultHttpClient httpClient = new DefaultHttpClient();
+        int timeout = 5; // seconds
+        HttpParams httpParams = httpClient.getParams();
+        httpParams.setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout * 1000);
+        httpParams.setParameter(CoreConnectionPNames.SO_TIMEOUT, timeout * 1000);
+        httpParams.setParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000));
+        
+        final HttpGet request = new HttpGet("http://www.github.com");
+        HttpResponse execute = httpClient.execute(request);
+        assertThat(execute.getStatusLine().getStatusCode(), equalTo(200));
+    }
 
     @Test
     public final void givenUsingNewApi_whenSettingTimeoutViaRequestConfig_thenCorrect() throws IOException {
@@ -33,8 +54,6 @@ public final void givenUsingNewApi_whenSettingTimeoutViaRequestConfig_thenCorrec
         final CloseableHttpClient client = HttpClientBuilder.create().setDefaultRequestConfig(config).build();
         final HttpGet request = new HttpGet("http://www.github.com");
 
-        // httpParams.setLongParameter(ClientPNames.CONN_MANAGER_TIMEOUT, new Long(timeout * 1000)); // https://issues.apache.org/jira/browse/HTTPCLIENT-1418
-
         response = client.execute(request);
 
         assertThat(response.getStatusLine().getStatusCode(), equalTo(200));
@@ -81,5 +100,28 @@ public final void givenTimeoutIsConfigured_whenTimingOut_thenTimeoutException()
         final HttpGet request = new HttpGet("http://www.google.com:81");
         client.execute(request);
     }
-
+    
+    @Test
+    public void whenSecuredRestApiIsConsumed_then200OK() throws IOException {
+        CloseableHttpClient httpClient = HttpClientBuilder.create().build();
+
+        int timeout = 20; // seconds
+        RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(timeout * 1000)
+          .setConnectTimeout(timeout * 1000).setSocketTimeout(timeout * 1000).build();
+        HttpGet getMethod = new HttpGet("http://localhost:8082/httpclient-simple/api/bars/1");
+        getMethod.setConfig(requestConfig);
+
+        int hardTimeout = 5; // seconds
+        TimerTask task = new TimerTask() {
+            @Override
+            public void run() {
+                getMethod.abort();
+            }
+        };
+        new Timer(true).schedule(task, hardTimeout * 1000);
+
+        HttpResponse response = httpClient.execute(getMethod);
+        System.out.println("HTTP Status of response: " + response.getStatusLine().getStatusCode());
+    }
+    
 }
diff --git a/spring-security-mvc-digest-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java b/spring-security-mvc-digest-auth/src/test/java/org/baeldung/client/RawClientLiveTest.java
@@ -1,7 +1,8 @@
 package org.baeldung.client;
 
+import java.io.IOException;
+
 import org.apache.http.HttpResponse;
-import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
@@ -12,10 +13,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
-import java.io.IOException;
-import java.util.Timer;
-import java.util.TimerTask;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = {ClientConfig.class}, loader = AnnotationConfigContextLoader.class)
 public class RawClientLiveTest {
@@ -25,22 +22,7 @@ public class RawClientLiveTest {
     @Test
     public void whenSecuredRestApiIsConsumed_then200OK() throws IOException {
         CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-
-        int timeout = 20; // seconds
-        RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(timeout)
-          .setConnectTimeout(timeout).setSocketTimeout(timeout).build();
         HttpGet getMethod = new HttpGet("http://localhost:8082/spring-security-rest-basic-auth/api/bars/1");
-        getMethod.setConfig(requestConfig);
-
-        int hardTimeout = 5; // seconds
-        TimerTask task = new TimerTask() {
-            @Override
-            public void run() {
-                getMethod.abort();
-            }
-        };
-        new Timer(true).schedule(task, hardTimeout * 1000);
-
         HttpResponse response = httpClient.execute(getMethod);
         System.out.println("HTTP Status of response: " + response.getStatusLine().getStatusCode());
     }
