Refactor LiveTest

Grzegorz Piwowarek · Grzegorz Piwowarek · commit bfddf3344d5f · 2016-10-23T07:55:07.000+02:00
diff --git a/httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientSandboxLiveTest.java b/httpclient/src/test/java/org/baeldung/httpclient/base/HttpClientSandboxLiveTest.java
@@ -9,23 +9,25 @@
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.junit.After;
 import org.junit.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 public class HttpClientSandboxLiveTest {
 
-    private CloseableHttpClient client;
+    @Test
+    public final void givenGetRequestExecuted_whenAnalyzingTheResponse_thenCorrectStatusCode() throws IOException {
+        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        final AuthScope authscp = new AuthScope("localhost", 8080);
+        credentialsProvider.setCredentials(authscp, new UsernamePasswordCredentials("user1", "user1Pass"));
 
-    private CloseableHttpResponse response;
+        CloseableHttpClient client = HttpClientBuilder.create().setDefaultCredentialsProvider(credentialsProvider).build();
 
-    @After
-    public final void after() throws IllegalStateException, IOException {
-        if (response == null) {
-            return;
-        }
+        final HttpGet httpGet = new HttpGet("http://localhost:8080/spring-security-rest-basic-auth/api/foos/1");
+        CloseableHttpResponse response = client.execute(httpGet);
+
+        System.out.println(response.getStatusLine());
 
         try {
             final HttpEntity entity = response.getEntity();
@@ -38,22 +40,4 @@ public final void after() throws IllegalStateException, IOException {
             response.close();
         }
     }
-
-    // tests
-
-    // simple request - response
-
-    @Test
-    public final void givenGetRequestExecuted_whenAnalyzingTheResponse_thenCorrectStatusCode() throws IOException {
-        final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-        final AuthScope authscp = new AuthScope("localhost", 8080);
-        credentialsProvider.setCredentials(authscp, new UsernamePasswordCredentials("user1", "user1Pass"));
-
-        client = HttpClientBuilder.create().setDefaultCredentialsProvider(credentialsProvider).build();
-
-        final HttpGet httpGet = new HttpGet("http://localhost:8080/spring-security-rest-basic-auth/api/foos/1");
-        response = client.execute(httpGet);
-
-        System.out.println(response.getStatusLine());
-    }
 }
