Merge gbranchaud pull request #29

testinfected · Mar 4, 2015 · e3d7f60 · e3d7f60
2 parents 5fba70a + e9c4953
commit e3d7f60
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/test/java/com/vtence/molecule/testing/http/HttpRequest.java b/src/test/java/com/vtence/molecule/testing/http/HttpRequest.java
@@ -8,6 +8,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.security.GeneralSecurityException;
@@ -177,7 +178,8 @@ private HttpURLConnection openSecureConnection() throws IOException {
     }
 
     private byte[] readResponseBody(HttpURLConnection connection) throws IOException {
-        return Streams.toBytes(successful(connection) ? connection.getInputStream() : connection.getErrorStream());
+        InputStream bodyStream = successful(connection) ? connection.getInputStream() : connection.getErrorStream();
+        return bodyStream != null ? Streams.toBytes(bodyStream) : new byte[0];
     }
 
     private boolean successful(HttpURLConnection connection) throws IOException {
@@ -205,7 +207,6 @@ private void writeContent(HttpURLConnection connection) throws IOException {
         if (content.contentLength() > 0) {
             connection.setDoOutput(true);
             content.writeTo(connection.getOutputStream());
-//            connection.getOutputStream().write(body);
         }
     }
 }
diff --git a/src/test/java/examples/rest/RESTExample.java b/src/test/java/examples/rest/RESTExample.java
@@ -54,7 +54,6 @@ public void handle(Request request, Response response) throws Exception {
                         response.body(album.info());
                     } else {
                         response.statusCode(404);
-                        response.body("No such album");
                     }
                 }
             });
@@ -72,7 +71,6 @@ public void handle(Request request, Response response) throws Exception {
                         response.body(album.info());
                     } else {
                         response.statusCode(404);
-                        response.body("No such album");
                     }
                 }
             });
@@ -86,7 +84,6 @@ public void handle(Request request, Response response) throws Exception {
                         response.body(album.info());
                     } else {
                         response.statusCode(404);
-                        response.body("No such album");
                     }
                 }
             });

diff --git a/src/test/java/examples/rest/RESTTest.java b/src/test/java/examples/rest/RESTTest.java
@@ -92,4 +92,10 @@ public void makingAPostActLikeAnUpdateOrDelete() throws IOException {
         assertThat(response).isOK()
                             .hasBodyText("Your music library is empty");
     }
+
+    @Test
+    public void askingForAMissingAlbum() throws IOException {
+        response = request.get("/albums/9999");
+        assertThat(response).hasStatusCode(404);
+    }
 }