commit 0bfc04abbd4c8a61c92ba3dcca14a2635e255a43
author Hyunsun Moon <hyunsun.moon@gmail.com> Mon May 08 11:02:14 2017 +0900
committer Yoonseon Han <yoonseon@onlab.us> Wed May 10 18:46:24 2017 +0000
tree 18b821a4cd5755ae93eec9fcf15acc6e79ab978e
parent 7bbe7b1850304e32af98709bc00cefd4dc89cf7e

Removed delays from unit tests

Change-Id: I10679f09d4c533bad26b37419ca2ac8f821b08f6

apps/ofagent/src/test/java/org/onosproject/ofagent/impl/OFAgentManagerTest.java

diff --git a/apps/ofagent/src/test/java/org/onosproject/ofagent/impl/OFAgentManagerTest.java b/apps/ofagent/src/test/java/org/onosproject/ofagent/impl/OFAgentManagerTest.java
index 52b06f4..6e98181 100644
--- a/apps/ofagent/src/test/java/org/onosproject/ofagent/impl/OFAgentManagerTest.java
+++ b/apps/ofagent/src/test/java/org/onosproject/ofagent/impl/OFAgentManagerTest.java
@@ -17,6 +17,7 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.MoreExecutors;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -112,6 +113,7 @@
         ofAgentStore = new DistributedOFAgentStore();
         TestUtils.setField(ofAgentStore, "coreService", createMock(CoreService.class));
         TestUtils.setField(ofAgentStore, "storageService", new TestStorageService());
+        TestUtils.setField(ofAgentStore, "eventExecutor", MoreExecutors.newDirectExecutorService());
         ofAgentStore.activate();
 
         expect(mockCoreService.registerApplication(anyObject()))
@@ -243,15 +245,13 @@
     }
 
     private void validateEvents(Enum... types) {
-        TestTools.assertAfter(100, () -> {
-            int i = 0;
-            assertEquals("Number of events does not match", types.length, testListener.events.size());
-            for (Event event : testListener.events) {
-                assertEquals("Incorrect event received", types[i], event.type());
-                i++;
-            }
-            testListener.events.clear();
-        });
+        int i = 0;
+        assertEquals("Number of events does not match", types.length, testListener.events.size());
+        for (Event event : testListener.events) {
+            assertEquals("Incorrect event received", types[i], event.type());
+            i++;
+        }
+        testListener.events.clear();
     }
 
     private static class TestOFAgentListener implements OFAgentListener {