aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Hawke <paul.hawke@gmail.com>2013-12-12 06:06:25 -0600
committerPaul Hawke <paul.hawke@gmail.com>2013-12-12 06:06:25 -0600
commitef3be58ec24d3e155c8036f8806dba7172f61d0c (patch)
treee829db9643634d8320e5cbb3282ac2197759bbbe
parent68394ef81a80928d25e584475be59a2e937a5ae0 (diff)
downloadnanohttpd-ef3be58ec24d3e155c8036f8806dba7172f61d0c.tar.gz
Tests and documentation cleanup.
Diffstat
-rw-r--r--README.md76
-rw-r--r--core/src/test/java/fi/iki/elonen/HttpGetRequestTest.java4
-rw-r--r--core/src/test/java/fi/iki/elonen/HttpHeadRequestTest.java4
-rw-r--r--core/src/test/java/fi/iki/elonen/HttpServerTest.java25
-rw-r--r--samples/src/main/java/fi/iki/elonen/TempFilesServer.java2
-rw-r--r--samples/src/main/java/fi/iki/elonen/debug/DebugServer.java (renamed from samples/src/main/java/fi/iki/elonen/DebugServer.java)35
6 files changed, 108 insertions, 38 deletions
diff --git a/README.md b/README.md
index ff92ddd..6c04773 100644
--- a/README.md
+++ b/README.md
@@ -77,33 +77,83 @@ Secondly, you can run the standalone *NanoHttpd Webserver*.
Or, create your own class that extends `NanoHTTPD` and overrides one of the two flavors of the `serve()` method. For example:
```java
+package fi.iki.elonen.debug;
+
+import fi.iki.elonen.NanoHTTPD;
+import fi.iki.elonen.ServerRunner;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class DebugServer extends NanoHTTPD {
- /**
- * Constructs an HTTP server on given port.
- */
public DebugServer() {
super(8080);
}
- @Override
- public Response serve(String uri, Method method, Map<String, String> header, Map<String, String> parms, Map<String, String> files) {
+ public static void main(String[] args) {
+ ServerRunner.run(DebugServer.class);
+ }
+
+ @Override public Response serve(IHTTPSession session) {
+ Map<String, List<String>> decodedQueryParameters =
+ decodeParameters(session.getQueryParameterString());
+
StringBuilder sb = new StringBuilder();
sb.append("<html>");
sb.append("<head><title>Debug Server</title></head>");
sb.append("<body>");
- sb.append("<h1>Response</h1>");
- sb.append("<p><blockquote><b>URI -</b> ").append(uri).append("<br />");
- sb.append("<b>Method -</b> ").append(method).append("</blockquote></p>");
- sb.append("<h3>Headers</h3><p><blockquote>").append(header).append("</blockquote></p>");
- sb.append("<h3>Parms</h3><p><blockquote>").append(parms).append("</blockquote></p>");
- sb.append("<h3>Files</h3><p><blockquote>").append(files).append("</blockquote></p>");
+ sb.append("<h1>Debug Server</h1>");
+
+ sb.append("<p><blockquote><b>URI</b> = ").append(
+ String.valueOf(session.getUri())).append("<br />");
+
+ sb.append("<b>Method</b> = ").append(
+ String.valueOf(session.getMethod())).append("</blockquote></p>");
+
+ sb.append("<h3>Headers</h3><p><blockquote>").
+ append(toString(session.getHeaders())).append("</blockquote></p>");
+
+ sb.append("<h3>Parms</h3><p><blockquote>").
+ append(toString(session.getParms())).append("</blockquote></p>");
+
+ sb.append("<h3>Parms (multi values?)</h3><p><blockquote>").
+ append(toString(decodedQueryParameters)).append("</blockquote></p>");
+
+ try {
+ Map<String, String> files = new HashMap<String, String>();
+ session.parseBody(files);
+ sb.append("<h3>Files</h3><p><blockquote>").
+ append(toString(files)).append("</blockquote></p>");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
sb.append("</body>");
sb.append("</html>");
return new Response(sb.toString());
}
- public static void main(String[] args) {
- ServerRunner.run(DebugServer.class);
+ private String toString(Map<String, ? extends Object> map) {
+ if (map.size() == 0) {
+ return "";
+ }
+ return unsortedList(map);
+ }
+
+ private String unsortedList(Map<String, ? extends Object> map) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("<ul>");
+ for (Map.Entry entry : map.entrySet()) {
+ listItem(sb, entry);
+ }
+ sb.append("</ul>");
+ return sb.toString();
+ }
+
+ private void listItem(StringBuilder sb, Map.Entry entry) {
+ sb.append("<li><code><b>").append(entry.getKey()).
+ append("</b> = ").append(entry.getValue()).append("</code></li>");
}
}
```
diff --git a/core/src/test/java/fi/iki/elonen/HttpGetRequestTest.java b/core/src/test/java/fi/iki/elonen/HttpGetRequestTest.java
index c914249..598e50b 100644
--- a/core/src/test/java/fi/iki/elonen/HttpGetRequestTest.java
+++ b/core/src/test/java/fi/iki/elonen/HttpGetRequestTest.java
@@ -108,7 +108,7 @@ public class HttpGetRequestTest extends HttpServerTest {
@Test
public void testDecodingParametersWithSingleValue() {
invokeServer("GET " + URI + "?foo=bar&baz=zot HTTP/1.1");
- assertEquals("foo=bar&baz=zot", testServer.parms.get("NanoHttpd.QUERY_STRING"));
+ assertEquals("foo=bar&baz=zot", testServer.queryParameterString);
assertTrue(testServer.decodedParamters.get("foo") instanceof List);
assertEquals(1, testServer.decodedParamters.get("foo").size());
assertEquals("bar", testServer.decodedParamters.get("foo").get(0));
@@ -120,7 +120,7 @@ public class HttpGetRequestTest extends HttpServerTest {
@Test
public void testDecodingParametersWithSingleValueAndMissingValue() {
invokeServer("GET " + URI + "?foo&baz=zot HTTP/1.1");
- assertEquals("foo&baz=zot", testServer.parms.get("NanoHttpd.QUERY_STRING"));
+ assertEquals("foo&baz=zot", testServer.queryParameterString);
assertTrue(testServer.decodedParamters.get("foo") instanceof List);
assertEquals(0, testServer.decodedParamters.get("foo").size());
assertTrue(testServer.decodedParamters.get("baz") instanceof List);
diff --git a/core/src/test/java/fi/iki/elonen/HttpHeadRequestTest.java b/core/src/test/java/fi/iki/elonen/HttpHeadRequestTest.java
index 6dc547f..1c5901f 100644
--- a/core/src/test/java/fi/iki/elonen/HttpHeadRequestTest.java
+++ b/core/src/test/java/fi/iki/elonen/HttpHeadRequestTest.java
@@ -95,7 +95,7 @@ public class HttpHeadRequestTest extends HttpServerTest {
@Test
public void testDecodingParametersWithSingleValue() {
invokeServer("HEAD " + URI + "?foo=bar&baz=zot HTTP/1.1");
- assertEquals("foo=bar&baz=zot", testServer.parms.get("NanoHttpd.QUERY_STRING"));
+ assertEquals("foo=bar&baz=zot", testServer.queryParameterString);
assertTrue(testServer.decodedParamters.get("foo") instanceof List);
assertEquals(1, testServer.decodedParamters.get("foo").size());
assertEquals("bar", testServer.decodedParamters.get("foo").get(0));
@@ -107,7 +107,7 @@ public class HttpHeadRequestTest extends HttpServerTest {
@Test
public void testDecodingParametersWithSingleValueAndMissingValue() {
invokeServer("HEAD " + URI + "?foo&baz=zot HTTP/1.1");
- assertEquals("foo&baz=zot", testServer.parms.get("NanoHttpd.QUERY_STRING"));
+ assertEquals("foo&baz=zot", testServer.queryParameterString);
assertTrue(testServer.decodedParamters.get("foo") instanceof List);
assertEquals(0, testServer.decodedParamters.get("foo").size());
assertTrue(testServer.decodedParamters.get("baz") instanceof List);
diff --git a/core/src/test/java/fi/iki/elonen/HttpServerTest.java b/core/src/test/java/fi/iki/elonen/HttpServerTest.java
index d9b99b3..ef209d1 100644
--- a/core/src/test/java/fi/iki/elonen/HttpServerTest.java
+++ b/core/src/test/java/fi/iki/elonen/HttpServerTest.java
@@ -7,6 +7,7 @@ import org.junit.Test;
import java.io.*;
import java.net.InetAddress;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -102,6 +103,7 @@ public class HttpServerTest {
public Map<String, String> files;
public Map<String, List<String>> decodedParamters;
public Map<String, List<String>> decodedParamtersFromParameter;
+ public String queryParameterString;
public TestServer() {
super(8192);
@@ -115,15 +117,20 @@ public class HttpServerTest {
return new HTTPSession(tempFileManager, inputStream, outputStream, inetAddress);
}
- @Override
- public Response serve(String uri, Method method, Map<String, String> header, Map<String, String> parms, Map<String, String> files) {
- this.uri = uri;
- this.method = method;
- this.header = header;
- this.parms = parms;
- this.files = files;
- this.decodedParamtersFromParameter = decodeParameters(parms);
- this.decodedParamters = decodeParameters(parms.get("NanoHttpd.QUERY_STRING"));
+ @Override public Response serve(IHTTPSession session) {
+ this.uri = session.getUri();
+ this.method = session.getMethod();
+ this.header = session.getHeaders();
+ this.parms = session.getParms();
+ this.files = new HashMap<String, String>();
+ try {
+ session.parseBody(files);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ queryParameterString = session.getQueryParameterString();
+ this.decodedParamtersFromParameter = decodeParameters(queryParameterString);
+ this.decodedParamters = decodeParameters(session.getQueryParameterString());
return response;
}
diff --git a/samples/src/main/java/fi/iki/elonen/TempFilesServer.java b/samples/src/main/java/fi/iki/elonen/TempFilesServer.java
index 84eb871..fb96911 100644
--- a/samples/src/main/java/fi/iki/elonen/TempFilesServer.java
+++ b/samples/src/main/java/fi/iki/elonen/TempFilesServer.java
@@ -1,5 +1,7 @@
package fi.iki.elonen;
+import fi.iki.elonen.debug.DebugServer;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/samples/src/main/java/fi/iki/elonen/DebugServer.java b/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java
index ae3fff1..1c83876 100644
--- a/samples/src/main/java/fi/iki/elonen/DebugServer.java
+++ b/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java
@@ -1,7 +1,10 @@
-package fi.iki.elonen;
+package fi.iki.elonen.debug;
+
+import fi.iki.elonen.NanoHTTPD;
+import fi.iki.elonen.ServerRunner;
-import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
public class DebugServer extends NanoHTTPD {
@@ -14,32 +17,39 @@ public class DebugServer extends NanoHTTPD {
}
@Override public Response serve(IHTTPSession session) {
+ Map<String, List<String>> decodedQueryParameters =
+ decodeParameters(session.getQueryParameterString());
+
StringBuilder sb = new StringBuilder();
sb.append("<html>");
sb.append("<head><title>Debug Server</title></head>");
sb.append("<body>");
sb.append("<h1>Debug Server</h1>");
- sb.append("<p><blockquote><b>URI</b> = ").append(String.valueOf(session.getUri())).append("<br />");
+ sb.append("<p><blockquote><b>URI</b> = ").append(
+ String.valueOf(session.getUri())).append("<br />");
- sb.append("<b>Method</b> = ").append(String.valueOf(session.getMethod())).append("</blockquote></p>");
+ sb.append("<b>Method</b> = ").append(
+ String.valueOf(session.getMethod())).append("</blockquote></p>");
- sb.append("<h3>Headers</h3><p><blockquote>").append(toString(session.getHeaders())).append("</blockquote></p>");
+ sb.append("<h3>Headers</h3><p><blockquote>").
+ append(toString(session.getHeaders())).append("</blockquote></p>");
- sb.append("<h3>Parms</h3><p><blockquote>").append(toString(session.getParms())).append("</blockquote></p>");
+ sb.append("<h3>Parms</h3><p><blockquote>").
+ append(toString(session.getParms())).append("</blockquote></p>");
sb.append("<h3>Parms (multi values?)</h3><p><blockquote>").
- append(toString(decodeParameters(session.getQueryParameterString()))).append("</blockquote></p>");
+ append(toString(decodedQueryParameters)).append("</blockquote></p>");
try {
Map<String, String> files = new HashMap<String, String>();
session.parseBody(files);
- sb.append("<h3>Files</h3><p><blockquote>").append(toString(files)).append("</blockquote></p>");
- } catch (IOException e) {
- e.printStackTrace();
- } catch (ResponseException e) {
+ sb.append("<h3>Files</h3><p><blockquote>").
+ append(toString(files)).append("</blockquote></p>");
+ } catch (Exception e) {
e.printStackTrace();
}
+
sb.append("</body>");
sb.append("</html>");
return new Response(sb.toString());
@@ -63,6 +73,7 @@ public class DebugServer extends NanoHTTPD {
}
private void listItem(StringBuilder sb, Map.Entry entry) {
- sb.append("<li><code><b>").append(entry.getKey()).append("</b> = ").append(entry.getValue()).append("</code></li>");
+ sb.append("<li><code><b>").append(entry.getKey()).
+ append("</b> = ").append(entry.getValue()).append("</code></li>");
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 05:31:11 +0000