1 files changed, 60 insertions, 64 deletions

diff --git a/core/src/test/java/fi/iki/elonen/integration/GetAndPostIntegrationTest.java b/core/src/test/java/fi/iki/elonen/integration/GetAndPostIntegrationTest.java
index ea4041d..127aac5 100644
--- a/core/src/test/java/fi/iki/elonen/integration/GetAndPostIntegrationTest.java
+++ b/core/src/test/java/fi/iki/elonen/integration/GetAndPostIntegrationTest.java
@@ -8,18 +8,18 @@ package fi.iki.elonen.integration;
  * %%
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice, this
  *    list of conditions and the following disclaimer.
- * 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * 3. Neither the name of the nanohttpd nor the names of its contributors
  *    may be used to endorse or promote products derived from this software without
  *    specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -33,9 +33,14 @@ package fi.iki.elonen.integration;
  * #L%
  */
 
-import fi.iki.elonen.NanoHTTPD;
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.http.NameValuePair;
-import org.apache.http.client.HttpClient;
 import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpGet;
@@ -44,61 +49,61 @@ import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntity;
 import org.apache.http.entity.mime.content.StringBody;
 import org.apache.http.impl.client.BasicResponseHandler;
-import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
+import fi.iki.elonen.NanoHTTPD;
 
 /**
  * @author Paul S. Hawke (paul.hawke@gmail.com) On: 5/19/13 at 5:36 PM
  */
 public class GetAndPostIntegrationTest extends IntegrationTestBase<GetAndPostIntegrationTest.TestServer> {
 
-    @Test
-    public void testSimpleGetRequest() throws Exception {
-        testServer.response = "testSimpleGetRequest";
+    public static class TestServer extends NanoHTTPD {
 
-        HttpGet httpget = new HttpGet("http://localhost:8192/");
-        ResponseHandler<String> responseHandler = new BasicResponseHandler();
-        String responseBody = httpclient.execute(httpget, responseHandler);
+        public String response;
 
-        assertEquals("GET:testSimpleGetRequest", responseBody);
-    }
+        public TestServer() {
+            super(8192);
+        }
 
-    @Test
-    public void testGetRequestWithParameters() throws Exception {
-        testServer.response = "testGetRequestWithParameters";
+        @Override
+        public Response serve(String uri, Method method, Map<String, String> header, Map<String, String> parms, Map<String, String> files) {
+            StringBuilder sb = new StringBuilder(String.valueOf(method) + ':' + this.response);
 
-        HttpGet httpget = new HttpGet("http://localhost:8192/?age=120&gender=Male");
-        ResponseHandler<String> responseHandler = new BasicResponseHandler();
-        String responseBody = httpclient.execute(httpget, responseHandler);
+            if (parms.size() > 1) {
+                parms.remove("NanoHttpd.QUERY_STRING");
+                sb.append("-params=").append(parms.size());
+                List<String> p = new ArrayList<String>(parms.keySet());
+                Collections.sort(p);
+                for (String k : p) {
+                    sb.append(';').append(k).append('=').append(parms.get(k));
+                }
+            }
 
-        assertEquals("GET:testGetRequestWithParameters-params=2;age=120;gender=Male", responseBody);
+            return newFixedLengthResponse(sb.toString());
+        }
+    }
+
+    @Override
+    public TestServer createTestServer() {
+        return new TestServer();
     }
 
     @Test
-    public void testPostWithNoParameters() throws Exception {
-        testServer.response = "testPostWithNoParameters";
+    public void testGetRequestWithParameters() throws Exception {
+        this.testServer.response = "testGetRequestWithParameters";
 
-        HttpPost httppost = new HttpPost("http://localhost:8192/");
+        HttpGet httpget = new HttpGet("http://localhost:8192/?age=120&gender=Male");
         ResponseHandler<String> responseHandler = new BasicResponseHandler();
-        String responseBody = httpclient.execute(httppost, responseHandler);
+        String responseBody = this.httpclient.execute(httpget, responseHandler);
 
-        assertEquals("POST:testPostWithNoParameters", responseBody);
+        assertEquals("GET:testGetRequestWithParameters-params=2;age=120;gender=Male", responseBody);
     }
 
     @Test
     public void testPostRequestWithFormEncodedParameters() throws Exception {
-        testServer.response = "testPostRequestWithFormEncodedParameters";
+        this.testServer.response = "testPostRequestWithFormEncodedParameters";
 
         HttpPost httppost = new HttpPost("http://localhost:8192/");
         List<NameValuePair> postParameters = new ArrayList<NameValuePair>();
@@ -107,14 +112,14 @@ public class GetAndPostIntegrationTest extends IntegrationTestBase<GetAndPostInt
         httppost.setEntity(new UrlEncodedFormEntity(postParameters));
 
         ResponseHandler<String> responseHandler = new BasicResponseHandler();
-        String responseBody = httpclient.execute(httppost, responseHandler);
+        String responseBody = this.httpclient.execute(httppost, responseHandler);
 
         assertEquals("POST:testPostRequestWithFormEncodedParameters-params=2;age=120;gender=Male", responseBody);
     }
 
     @Test
     public void testPostRequestWithMultipartEncodedParameters() throws Exception {
-        testServer.response = "testPostRequestWithMultipartEncodedParameters";
+        this.testServer.response = "testPostRequestWithMultipartEncodedParameters";
 
         HttpPost httppost = new HttpPost("http://localhost:8192/");
         MultipartEntity reqEntity = new MultipartEntity(HttpMultipartMode.BROWSER_COMPATIBLE);
@@ -123,39 +128,30 @@ public class GetAndPostIntegrationTest extends IntegrationTestBase<GetAndPostInt
         httppost.setEntity(reqEntity);
 
         ResponseHandler<String> responseHandler = new BasicResponseHandler();
-        String responseBody = httpclient.execute(httppost, responseHandler);
+        String responseBody = this.httpclient.execute(httppost, responseHandler);
 
         assertEquals("POST:testPostRequestWithMultipartEncodedParameters-params=2;age=120;gender=Male", responseBody);
     }
 
-    @Override
-    public TestServer createTestServer() {
-        return new TestServer();
-    }
-
-    public static class TestServer extends NanoHTTPD {
+    @Test
+    public void testPostWithNoParameters() throws Exception {
+        this.testServer.response = "testPostWithNoParameters";
 
-        public String response;
+        HttpPost httppost = new HttpPost("http://localhost:8192/");
+        ResponseHandler<String> responseHandler = new BasicResponseHandler();
+        String responseBody = this.httpclient.execute(httppost, responseHandler);
 
-        public TestServer() {
-            super(8192);
-        }
+        assertEquals("POST:testPostWithNoParameters", responseBody);
+    }
 
-        @Override
-        public Response serve(String uri, Method method, Map<String, String> header, Map<String, String> parms, Map<String, String> files) {
-            StringBuilder sb = new StringBuilder(String.valueOf(method) + ':' + response);
+    @Test
+    public void testSimpleGetRequest() throws Exception {
+        this.testServer.response = "testSimpleGetRequest";
 
-            if (parms.size() > 1) {
-                parms.remove("NanoHttpd.QUERY_STRING");
-                sb.append("-params=").append(parms.size());
-                List<String> p = new ArrayList<String>(parms.keySet());
-                Collections.sort(p);
-                for (String k : p) {
-                    sb.append(';').append(k).append('=').append(parms.get(k));
-                }
-            }
+        HttpGet httpget = new HttpGet("http://localhost:8192/");
+        ResponseHandler<String> responseHandler = new BasicResponseHandler();
+        String responseBody = this.httpclient.execute(httpget, responseHandler);
 
-            return new Response(sb.toString());
-        }
+        assertEquals("GET:testSimpleGetRequest", responseBody);
     }
 }