remove timing sensitive portion from DefaultTopologyProviderTest.

Change-Id: I7fa496c421470520df4cb79c036ac8ea25b31c96

 package org.onlab.onos.net.topology.impl;
 package org.onlab.onos.net.topology.impl;
 
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet;
+
 import org.junit.After;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.Test;
@@ -21,10 +22,12 @@ import org.onlab.onos.net.topology.TopologyProviderService;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Set;
 import java.util.Set;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.onlab.junit.TestTools.assertAfter;
+import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.*;
 import static org.onlab.onos.net.NetTestTools.device;
 import static org.onlab.onos.net.NetTestTools.device;
 import static org.onlab.onos.net.NetTestTools.link;
 import static org.onlab.onos.net.NetTestTools.link;
 import static org.onlab.onos.net.device.DeviceEvent.Type.DEVICE_ADDED;
 import static org.onlab.onos.net.device.DeviceEvent.Type.DEVICE_ADDED;
@@ -41,6 +44,9 @@ public class DefaultTopologyProviderTest {
     private TestLinkService linkService = new TestLinkService();
     private TestLinkService linkService = new TestLinkService();
     private TestTopoProviderService providerService;
     private TestTopoProviderService providerService;
 
 
+    // phase corresponds to number of topologyChanged called
+    private Phaser topologyChangedCounts = new Phaser(1);
+
     @Before
     @Before
     public void setUp() {
     public void setUp() {
         provider.deviceService = deviceService;
         provider.deviceService = deviceService;
@@ -66,27 +72,24 @@ public class DefaultTopologyProviderTest {
     }
     }
 
 
     @Test
     @Test
-    public void basics() {
-        assertAfter(100, new Runnable() {
-            @Override
-            public void run() {
+    public void basics() throws InterruptedException, TimeoutException {
+        assertEquals(1, topologyChangedCounts.awaitAdvanceInterruptibly(0, 1, TimeUnit.SECONDS));
         validateSubmission();
         validateSubmission();
     }
     }
-        });
-    }
 
 
     @Test
     @Test
-    public void eventDriven() {
-        assertAfter(100, new Runnable() {
-            @Override
-            public void run() {
+    public void eventDriven() throws InterruptedException, TimeoutException {
+        assertEquals(1, topologyChangedCounts.awaitAdvanceInterruptibly(0, 1, TimeUnit.SECONDS));
         validateSubmission();
         validateSubmission();
+
         deviceService.post(new DeviceEvent(DEVICE_ADDED, device("z"), null));
         deviceService.post(new DeviceEvent(DEVICE_ADDED, device("z"), null));
         linkService.post(new LinkEvent(LINK_ADDED, link("z", 1, "a", 4)));
         linkService.post(new LinkEvent(LINK_ADDED, link("z", 1, "a", 4)));
+        assertThat(topologyChangedCounts.awaitAdvanceInterruptibly(1, 1, TimeUnit.SECONDS),
+                is(greaterThanOrEqualTo(2)));
+        // Note: posting event, to trigger topologyChanged call,
+        // but dummy topology will not change.
         validateSubmission();
         validateSubmission();
     }
     }
-        });
-    }
 
 
 
 
     private class TestTopoRegistry implements TopologyProviderRegistry {
     private class TestTopoRegistry implements TopologyProviderRegistry {
@@ -119,6 +122,7 @@ public class DefaultTopologyProviderTest {
         @Override
         @Override
         public void topologyChanged(GraphDescription graphDescription, List<Event> reasons) {
         public void topologyChanged(GraphDescription graphDescription, List<Event> reasons) {
             graphDesc = graphDescription;
             graphDesc = graphDescription;
+            topologyChangedCounts.arrive();
         }
         }
     }
     }