Making test method names more helpful, adding tests for deleting streams

Graylog2 · Jun 25, 2015 · 2a6c7f5 · 2a6c7f5
1 parent 1491a9e
commit 2a6c7f5
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/integration-tests/src/test/java/integration/streams/StreamsTest.java b/integration-tests/src/test/java/integration/streams/StreamsTest.java
@@ -110,7 +110,7 @@ public void createStreamWithTitleAndDescription() throws Exception {
     }
 
     @Test
-    public void incompleteStream() throws Exception {
+    public void creatingIncompleteStreamShouldFail() throws Exception {
         final int beforeCount = streamCount();
 
         final ValidatableResponse response = createStreamFromRequest(jsonResourceForMethod());
@@ -121,7 +121,8 @@ public void incompleteStream() throws Exception {
     }
 
     @Test
-    public void invalidStream() throws Exception {
+    @MongoDbSeed
+    public void creatingInvalidStreamShouldFail() throws Exception {
         final int beforeCount = streamCount();
 
         final ValidatableResponse response = createStreamFromRequest("{}");
@@ -131,6 +132,42 @@ public void invalidStream() throws Exception {
         assertThat(afterCount).isEqualTo(beforeCount);
     }
 
+    @Test
+    @MongoDbSeed(locations = {"single-stream"})
+    public void deletingSingleStream() {
+        final String streamId = "552b92b2e4b0c055e41ffb8e";
+        assertThat(streamCount()).isEqualTo(1);
+
+        given()
+                .when()
+                .delete("/streams/"+streamId)
+                .then()
+                .statusCode(204);
+
+        assertThat(streamCount()).isEqualTo(0);
+
+        given()
+                .when()
+                .get("/streams/"+streamId)
+                .then()
+                .statusCode(404);
+    }
+
+    @Test
+    @MongoDbSeed(locations = {"single-stream"})
+    public void deletingNonexistentStreamShouldFail() {
+        final String streamId = "552b92b2e4b0c055e41ffb8f";
+        assertThat(streamCount()).isEqualTo(1);
+
+        given()
+                .when()
+                .delete("/streams/"+streamId)
+                .then()
+                .statusCode(404);
+
+        assertThat(streamCount()).isEqualTo(1);
+    }
+
     protected ValidatableResponse createStreamFromRequest(byte[] request) {
         return given()
             .when()

diff --git a/...ams/StreamsTest/delete-single-stream.json → ...on/streams/StreamsTest/single-stream.json b/...ams/StreamsTest/delete-single-stream.json → ...on/streams/StreamsTest/single-stream.json
diff --git a/...ntegration/streams/incomplete-stream.json → ...eating-incomplete-stream-should-fail.json b/...ntegration/streams/incomplete-stream.json → ...eating-incomplete-stream-should-fail.json