1 files changed, 18 insertions, 9 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/listener/TestListener.java b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/listener/TestListener.java
index cbd56aa96..a6e7a3535 100755
--- a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/listener/TestListener.java
+++ b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/listener/TestListener.java
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package org.eclipse.ecf.tests.discovery.listener;
 
+import junit.framework.TestCase;
+
 import org.eclipse.ecf.core.events.IContainerEvent;
 import org.eclipse.ecf.discovery.IServiceEvent;
 import org.eclipse.ecf.discovery.IServiceListener;
@@ -19,25 +21,28 @@ import org.eclipse.ecf.discovery.IServiceTypeListener;
 public class TestListener implements IServiceListener, IServiceTypeListener {
 
 	private IContainerEvent event;
-
-	public TestListener() {
-	}
-
-	public boolean isDone() {
-		return event != null;
-	}
-
+	
 	/**
-	 * @return the event
+	 * @return the event that has been received by this TestListener
 	 */
 	public IContainerEvent getEvent() {
 		return event;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.ecf.discovery.IServiceListener#serviceDiscovered(org.eclipse.ecf.discovery.IServiceEvent)
+	 */
 	public void serviceDiscovered(IServiceEvent anEvent) {
+		TestCase.assertNull("Received several IServiceEvent", event);
 		event = anEvent;
+		synchronized (this) {
+			notifyAll();
+		}
 	}
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.ecf.discovery.IServiceListener#serviceUndiscovered(org.eclipse.ecf.discovery.IServiceEvent)
+	 */
 	public void serviceUndiscovered(IServiceEvent anEvent) {
 		throw new java.lang.UnsupportedOperationException("TestServiceListener#serviceUndiscovered not yet implemented");
 	}
@@ -46,6 +51,10 @@ public class TestListener implements IServiceListener, IServiceTypeListener {
 	 * @see org.eclipse.ecf.discovery.IServiceTypeListener#serviceTypeDiscovered(org.eclipse.ecf.discovery.IServiceTypeEvent)
 	 */
 	public void serviceTypeDiscovered(IServiceTypeEvent event) {
+		TestCase.assertNull("Received several IServiceEvent", event);
 		this.event = event;
+		synchronized (this) {
+			notifyAll();
+		}
 	}
 }