commit d8e2797f4021311b6bb8135eab06cec052652887
author Florian Waibel <fwaibel@datenkollektiv.de> Wed Dec 25 14:07:16 2019 +0100
committer Florian Waibel <fwaibel@datenkollektiv.de> Thu Dec 26 11:37:10 2019 +0100
tree 7db0d4fbfb46b334f2a3ba7ccf9bce37c13ca35e
parent acd2c3a75dddbdeec32e2b38a2ef4cab6079bea2

Reduce idle waiting time in StubEventAdminTests

Also rework test to use Java 8 closures for better readability.

test/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/event/StubEventAdminTests.java

diff --git a/test/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/event/StubEventAdminTests.java b/test/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/event/StubEventAdminTests.java
index 9b084fd..b946989 100644
--- a/test/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/event/StubEventAdminTests.java
+++ b/test/org.eclipse.virgo.test.stubs/src/test/java/org/eclipse/virgo/test/stubs/service/event/StubEventAdminTests.java
@@ -39,7 +39,7 @@
     private final Dictionary<String, ?> expectedProperties = createProperties();
     
     private Dictionary<String, ?> createProperties() {
-        Dictionary<String, Object> properties = new Hashtable<String, Object>();
+        Dictionary<String, Object> properties = new Hashtable<>();
         
         properties.put("booleanArray", new boolean[] {false, true});
         properties.put("byteArray", new byte[] {1, 2});
@@ -104,12 +104,9 @@
 
         final CountDownLatch latch = new CountDownLatch(1);
 
-        Thread awaitingThread = new Thread(new Runnable() {
-
-            public void run() {
-                if (eventAdmin.awaitPostingOfEvent(expected, 10000)) {
-                    latch.countDown();
-                }
+        Thread awaitingThread = new Thread(() -> {
+            if (eventAdmin.awaitPostingOfEvent(expected, 10000)) {
+                latch.countDown();
             }
         });
 
@@ -127,12 +124,9 @@
 
         final CountDownLatch latch = new CountDownLatch(1);
 
-        Thread awaitingThread = new Thread(new Runnable() {
-
-            public void run() {
-                if (eventAdmin.awaitSendingOfEvent(expected, 10000)) {
-                    latch.countDown();
-                }
+        Thread awaitingThread = new Thread(() -> {
+            if (eventAdmin.awaitSendingOfEvent(expected, 10000)) {
+                latch.countDown();
             }
         });
 
@@ -169,19 +163,16 @@
 
         final CountDownLatch latch = new CountDownLatch(1);
 
-        Thread awaitingThread = new Thread(new Runnable() {
-
-            public void run() {
-                eventAdmin.awaitSendingOfEvent(expected, Long.MAX_VALUE);
-                latch.countDown();
-            }
+        Thread awaitingThread = new Thread(() -> {
+            eventAdmin.awaitSendingOfEvent(expected, Long.MAX_VALUE);
+            latch.countDown();
         });
 
         awaitingThread.start();
 
         ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
 
-        ThreadInfo threadInfo = null;
+        ThreadInfo threadInfo;
 
         while ((threadInfo = threadBean.getThreadInfo(awaitingThread.getId())) == null || threadInfo.getThreadState() != State.TIMED_WAITING) {
             Thread.sleep(10);
@@ -240,12 +231,9 @@
 
         final CountDownLatch latch = new CountDownLatch(1);
 
-        Thread awaitingThread = new Thread(new Runnable() {
-
-            public void run() {
-                if (eventAdmin.awaitPostingOfEvent("topic", 10000) != null) {
-                    latch.countDown();
-                }
+        Thread awaitingThread = new Thread(() -> {
+            if (eventAdmin.awaitPostingOfEvent("topic", 1000) != null) {
+                latch.countDown();
             }
         });
 
@@ -262,12 +250,9 @@
 
         final CountDownLatch latch = new CountDownLatch(1);
 
-        Thread awaitingThread = new Thread(new Runnable() {
-
-            public void run() {
-                if (eventAdmin.awaitSendingOfEvent("topic", 10000) != null) {
-                    latch.countDown();
-                }
+        Thread awaitingThread = new Thread(() -> {
+            if (eventAdmin.awaitSendingOfEvent("topic", 1000) != null) {
+                latch.countDown();
             }
         });
 
@@ -301,19 +286,16 @@
 
         final CountDownLatch latch = new CountDownLatch(1);
 
-        Thread awaitingThread = new Thread(new Runnable() {
-
-            public void run() {
-                eventAdmin.awaitSendingOfEvent("topic", Long.MAX_VALUE);
-                latch.countDown();
-            }
+        Thread awaitingThread = new Thread(() -> {
+            eventAdmin.awaitSendingOfEvent("topic", Long.MAX_VALUE);
+            latch.countDown();
         });
 
         awaitingThread.start();
 
         ThreadMXBean threadBean = ManagementFactory.getThreadMXBean();
 
-        ThreadInfo threadInfo = null;
+        ThreadInfo threadInfo;
 
         while ((threadInfo = threadBean.getThreadInfo(awaitingThread.getId())) == null || threadInfo.getThreadState() != State.TIMED_WAITING) {
             Thread.sleep(10);