more SSE tests

Author: ryber

unirest-bdd-tests/src/test/java/BehaviorTests/MockServer.java

@@ -402,6 +402,14 @@ public static void sendEvent(String content) {
             TestSSEConsumer.sendEvent(content);
         }
 
+        public static void sendEvent(String id, String event, String content) {
+           TestSSEConsumer.sendEvent(id, event, content);
+        }
+
+        public static void sendEvent(String event, String content) {
+            TestSSEConsumer.sendEvent(event, content);
+        }
+
         public static RequestCapture lastRequest() {
             return TestSSEConsumer.getLastRequest();
         }

unirest-bdd-tests/src/test/java/BehaviorTests/SSETest.java

@@ -62,6 +62,19 @@ void basicConnection() {
                 .assertHasEvent("message", "Whats Happening?");
     }
 
+    @Test
+    void eventsWithIds() {
+        runWith(sse(MockServer.SSE), listener);
+
+        MockServer.Sse.sendEvent("123", "cheese", "cheddar");
+        MockServer.Sse.sendEvent(       "cheese", "gouda");
+
+        sleep(500);
+
+        listener.assertHasEvent("123", "cheese", "cheddar")
+                .assertHasEvent("cheese", "gouda");
+    }
+
     @Test
     void queryParams(){
         runWith(sse(MockServer.SSE)

unirest-bdd-tests/src/test/java/BehaviorTests/TestListener.java

@@ -45,8 +45,12 @@ TestListener assertHasComment(String comment) {
     }
 
     public TestListener assertHasEvent(String event, String content) {
+        return assertHasEvent("", event, content);
+    }
+
+    public TestListener assertHasEvent(String id, String event, String content) {
         assertThat(events)
-                .contains(new Event("", event, content));
+                .contains(new Event(id, event, content));
         return this;
     }
 

unirest-bdd-tests/src/test/java/BehaviorTests/TestSSEConsumer.java

@@ -47,6 +47,14 @@ public static void sendEvent(String data) {
         clients.forEach(c -> c.sendEvent(data));
     }
 
+    public static void sendEvent(String id, String event, String content) {
+        clients.forEach(c -> c.sendEvent(event, content, id));
+    }
+
+    public static void sendEvent(String event, String content) {
+        clients.forEach(c -> c.sendEvent(event, content));
+    }
+
     @Override
     public void accept(SseClient client) {
         lastRequest = new RequestCapture(client.ctx());

unirest/src/main/java/kong/unirest/core/SseRequestImpl.java

@@ -38,7 +38,7 @@ public class SseRequestImpl implements SseRequest {
 
     public SseRequestImpl(Config config, String url) {
         Objects.requireNonNull(config, "Config cannot be null");
-        Objects.requireNonNull(url, "URL cannot be null");
+        Objects.requireNonNull(url,    "URL cannot be null");
 
         this.config = config;
         this.url = new Path(url, config.getDefaultBaseUrl());