Merge pull request ably#626 from ably/move-event-emitter-tests-to-unit-tests

Move tests for EventEmitter to unit tests

Author: QuintinWillison

lib/src/test/java/io/ably/lib/test/realtime/RealtimeSuite.java

@@ -14,7 +14,6 @@
 @RunWith(Suite.class)
 @SuiteClasses({
     ConnectionManagerTest.class,
-    EventEmitterTest.class,
     RealtimeHttpHeaderTest.class,
     RealtimeAuthTest.class,
     RealtimeJWTTest.class,

…/lib/test/realtime/EventEmitterTest.java …a/io/ably/lib/util/EventEmitterTest.javalib/src/test/java/io/ably/lib/test/realtime/EventEmitterTest.java renamed to lib/src/test/java/io/ably/lib/util/EventEmitterTest.java lib/src/test/java/io/ably/lib/test/realtime/EventEmitterTest.java renamed to lib/src/test/java/io/ably/lib/util/EventEmitterTest.java

@@ -1,18 +1,16 @@
-package io.ably.lib.test.realtime;
+package io.ably.lib.util;
 
 import org.junit.Test;
 
 import java.util.HashMap;
 
-import io.ably.lib.util.EventEmitter;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 public class EventEmitterTest {
 
-    private static enum MyEvents {
+    private enum MyEvents {
         event_0,
         event_1
     }
@@ -32,7 +30,7 @@ public void onMyThingHappened(MyEventPayload theThing) {
             Integer count = counts.get(theThing.event); if(count == null) count = 0;
             counts.put(theThing.event, count + 1);
         }
-        HashMap<MyEvents, Integer> counts = new HashMap<MyEvents, Integer>();
+        HashMap<MyEvents, Integer> counts = new HashMap<>();
     }
 
     private static class MyEmitter extends EventEmitter<MyEvents, MyListener> {
@@ -320,7 +318,6 @@ public void onMyThingHappened(MyEventPayload theThing) {
     /**
      * "off" event specific listeners inside the listener and ensure they are not called during that event.
      */
-
     @Test
     public void off_specific_event_listener_in_listener() {
         final MyEmitter emitter = new MyEmitter();