1 files changed, 84 insertions, 46 deletions
diff --git a/core/src/test/java/fi/iki/elonen/integration/CookieIntegrationTest.java b/core/src/test/java/fi/iki/elonen/integration/CookieIntegrationTest.java
index 0d54b37..5cf5719 100644
--- a/core/src/test/java/fi/iki/elonen/integration/CookieIntegrationTest.java
+++ b/core/src/test/java/fi/iki/elonen/integration/CookieIntegrationTest.java
@@ -1,6 +1,45 @@
 package fi.iki.elonen.integration;
 
-import fi.iki.elonen.NanoHTTPD;
+/*
+ * #%L
+ * NanoHttpd-Core
+ * %%
+ * Copyright (C) 2012 - 2015 nanohttpd
+ * %%
+ * 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.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
 import org.apache.http.client.CookieStore;
 import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.methods.HttpGet;
@@ -8,78 +47,77 @@ import org.apache.http.impl.client.BasicResponseHandler;
 import org.apache.http.impl.cookie.BasicClientCookie;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-import static org.junit.Assert.*;
+import fi.iki.elonen.NanoHTTPD;
 
 /**
- * @author Paul S. Hawke (paul.hawke@gmail.com)
- *         On: 9/2/13 at 10:10 PM
+ * @author Paul S. Hawke (paul.hawke@gmail.com) On: 9/2/13 at 10:10 PM
  */
 public class CookieIntegrationTest extends IntegrationTestBase<CookieIntegrationTest.CookieTestServer> {
 
-    @Test
-    public void testNoCookies() throws Exception {
-        HttpGet httpget = new HttpGet("http://localhost:8192/");
-        ResponseHandler<String> responseHandler = new BasicResponseHandler();
-        httpclient.execute(httpget, responseHandler);
+    public static class CookieTestServer extends NanoHTTPD {
 
-        CookieStore cookies = httpclient.getCookieStore();
-        assertEquals(0, cookies.getCookies().size());
+        List<Cookie> cookiesReceived = new ArrayList<Cookie>();
+
+        List<Cookie> cookiesToSend = new ArrayList<Cookie>();
+
+        public CookieTestServer() {
+            super(8192);
+        }
+
+        @Override
+        public Response serve(IHTTPSession session) {
+            CookieHandler cookies = session.getCookies();
+            for (String cookieName : cookies) {
+                this.cookiesReceived.add(new Cookie(cookieName, cookies.read(cookieName)));
+            }
+            for (Cookie c : this.cookiesToSend) {
+                cookies.set(c);
+            }
+            return newFixedLengthResponse("Cookies!");
+        }
+    }
+
+    @Override
+    public CookieTestServer createTestServer() {
+        return new CookieTestServer();
     }
 
     @Test
     public void testCookieSentBackToClient() throws Exception {
-        testServer.cookiesToSend.add(new NanoHTTPD.Cookie("name", "value", 30));
+        this.testServer.cookiesToSend.add(new NanoHTTPD.Cookie("name", "value", 30));
         HttpGet httpget = new HttpGet("http://localhost:8192/");
         ResponseHandler<String> responseHandler = new BasicResponseHandler();
-        httpclient.execute(httpget, responseHandler);
+        this.httpclient.execute(httpget, responseHandler);
 
-        CookieStore cookies = httpclient.getCookieStore();
+        CookieStore cookies = this.httpclient.getCookieStore();
         assertEquals(1, cookies.getCookies().size());
         assertEquals("name", cookies.getCookies().get(0).getName());
         assertEquals("value", cookies.getCookies().get(0).getValue());
     }
 
     @Test
+    public void testNoCookies() throws Exception {
+        HttpGet httpget = new HttpGet("http://localhost:8192/");
+        ResponseHandler<String> responseHandler = new BasicResponseHandler();
+        this.httpclient.execute(httpget, responseHandler);
+
+        CookieStore cookies = this.httpclient.getCookieStore();
+        assertEquals(0, cookies.getCookies().size());
+    }
+
+    @Test
     public void testServerReceivesCookiesSentFromClient() throws Exception {
         BasicClientCookie clientCookie = new BasicClientCookie("name", "value");
         Calendar calendar = Calendar.getInstance();
         calendar.add(Calendar.DAY_OF_YEAR, 100);
         clientCookie.setExpiryDate(calendar.getTime());
         clientCookie.setDomain("localhost");
-        httpclient.getCookieStore().addCookie(clientCookie);
+        this.httpclient.getCookieStore().addCookie(clientCookie);
         HttpGet httpget = new HttpGet("http://localhost:8192/");
         ResponseHandler<String> responseHandler = new BasicResponseHandler();
-        httpclient.execute(httpget, responseHandler);
+        this.httpclient.execute(httpget, responseHandler);
 
-        assertEquals(1, testServer.cookiesReceived.size());
-        assertTrue(testServer.cookiesReceived.get(0).getHTTPHeader().contains("name=value"));
-    }
-
-    @Override public CookieTestServer createTestServer() {
-        return new CookieTestServer();
-    }
-
-    public static class CookieTestServer extends NanoHTTPD {
-        List<Cookie> cookiesReceived = new ArrayList<Cookie>();
-        List<Cookie> cookiesToSend = new ArrayList<Cookie>();
-
-        public CookieTestServer() {
-            super(8192);
-        }
-
-        @Override public Response serve(IHTTPSession session) {
-            CookieHandler cookies = session.getCookies();
-            for (String cookieName : cookies) {
-                cookiesReceived.add(new Cookie(cookieName, cookies.read(cookieName)));
-            }
-            for (Cookie c : cookiesToSend) {
-                cookies.set(c);
-            }
-            return new Response("Cookies!");
-        }
+        assertEquals(1, this.testServer.cookiesReceived.size());
+        assertTrue(this.testServer.cookiesReceived.get(0).getHTTPHeader().contains("name=value"));
     }
 }