NEW - bug 318086: [Discovery] discovery tests take too long on build.ecf-project.org

https://bugs.eclipse.org/bugs/show_bug.cgi?id=318086

2 files changed, 22 insertions, 6 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryTest.java b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryTest.java
index 476ef80e1..f1b9a116b 100755
--- a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryTest.java
@@ -209,7 +209,7 @@ public abstract class DiscoveryTest extends AbstractDiscoveryTest {
 		IServiceInfo[] services = discoveryLocator.getServices();
 		assertTrue("No Services must be registerd at this point " + (services.length == 0 ? "" : services[0].toString()), services.length == 0);
 
-		final TestServiceListener tsl = new TestServiceListener(eventsToExpect);
+		final TestServiceListener tsl = new TestServiceListener(eventsToExpect, discoveryLocator);
 		addServiceListener(tsl);
 	}
 
@@ -222,7 +222,7 @@ public abstract class DiscoveryTest extends AbstractDiscoveryTest {
 		IServiceInfo[] services = discoveryLocator.getServices();
 		assertTrue("No Services must be registerd at this point " + (services.length == 0 ? "" : services[0].toString()), services.length == 0);
 
-		final TestServiceListener tsl = new TestServiceListener(eventsToExpect);
+		final TestServiceListener tsl = new TestServiceListener(eventsToExpect, discoveryLocator);
 		discoveryLocator.addServiceListener(serviceInfo.getServiceID().getServiceTypeID(), tsl);
 		addListenerRegisterAndWait(tsl, serviceInfo);
 		discoveryLocator.removeServiceListener(serviceInfo.getServiceID().getServiceTypeID(), tsl);
@@ -271,7 +271,7 @@ public abstract class DiscoveryTest extends AbstractDiscoveryTest {
 	 * @throws ContainerConnectException 
 	 */
 	public void testRemoveServiceListenerIServiceListener() throws ContainerConnectException {
-		final TestServiceListener serviceListener = new TestServiceListener(eventsToExpect);
+		final TestServiceListener serviceListener = new TestServiceListener(eventsToExpect, discoveryLocator);
 		addServiceListener(serviceListener);
 		//TODO reregister and verify the listener doesn't receive any events any longer.
 	}
@@ -282,7 +282,7 @@ public abstract class DiscoveryTest extends AbstractDiscoveryTest {
 	 * @throws ContainerConnectException 
 	 */
 	public void testRemoveServiceListenerIServiceTypeIDIServiceListener() throws ContainerConnectException {
-		final TestServiceListener serviceListener = new TestServiceListener(eventsToExpect);
+		final TestServiceListener serviceListener = new TestServiceListener(eventsToExpect, discoveryLocator);
 		addServiceListener(serviceListener);
 		//TODO reregister and verify the listener doesn't receive any events any longer.
 	}
@@ -393,7 +393,7 @@ public abstract class DiscoveryTest extends AbstractDiscoveryTest {
 		final Object object = aFuture.get();
 		assertTrue(object instanceof IServiceTypeID[]);
 		final IServiceTypeID[] services = (IServiceTypeID[]) object;
-		assertTrue("Found: " + services.length + Arrays.asList(services), services.length == eventsToExpect);
+		assertTrue("Found: " + services.length + Arrays.asList(services), services.length == 1); // just expect one event as the implementation filters dupes
 		for (int i = 0; i < services.length; i++) {
 			IServiceTypeID iServiceTypeId = services[i];
 			if(serviceInfo.getServiceID().getServiceTypeID().equals(iServiceTypeId)) {
diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/listener/TestServiceListener.java b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/listener/TestServiceListener.java
index bc99c61a9..541697142 100755
--- a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/listener/TestServiceListener.java
+++ b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/listener/TestServiceListener.java
@@ -10,13 +10,21 @@
  *******************************************************************************/
 package org.eclipse.ecf.tests.discovery.listener;
 
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.ecf.core.IContainer;
+import org.eclipse.ecf.discovery.IDiscoveryLocator;
 import org.eclipse.ecf.discovery.IServiceEvent;
 import org.eclipse.ecf.discovery.IServiceListener;
 
 public class TestServiceListener extends TestListener implements IServiceListener {
 
-	public TestServiceListener(int eventsToExpect) {
+	private IDiscoveryLocator locator;
+
+
+	public TestServiceListener(int eventsToExpect, IDiscoveryLocator aLocator) {
 		super(eventsToExpect);
+		Assert.isNotNull(aLocator);
+		locator = aLocator;
 	}
 
 	/* (non-Javadoc)
@@ -37,4 +45,12 @@ public class TestServiceListener extends TestListener implements IServiceListene
 	public void serviceUndiscovered(IServiceEvent anEvent) {
 		throw new java.lang.UnsupportedOperationException("TestServiceListener#serviceUndiscovered not yet implemented");
 	}
+
+
+	/**
+	 * @return A DiscoveryLocator (Container)
+	 */
+	public IContainer getLocator() {
+		return (IContainer) locator;
+	}
 }