NEW - bug 232813: [Discovery][jSLP] No OSGi service is registered

https://bugs.eclipse.org/bugs/show_bug.cgi?id=232813
NEW - bug 218308: [Discovery][jSLP] org.eclipse.ecf.discovery.IDiscoveryContainerAdapter.getServices() doesn't return all "reachable" services
https://bugs.eclipse.org/bugs/show_bug.cgi?id=218308

2 files changed, 3 insertions, 11 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/src/org/eclipse/ecf/tests/provider/jmdns/JMDNSDiscoveryServiceTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/src/org/eclipse/ecf/tests/provider/jmdns/JMDNSDiscoveryServiceTest.java
index 4818a9318..cbe8a7b32 100755
--- a/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/src/org/eclipse/ecf/tests/provider/jmdns/JMDNSDiscoveryServiceTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/src/org/eclipse/ecf/tests/provider/jmdns/JMDNSDiscoveryServiceTest.java
@@ -32,7 +32,7 @@ public class JMDNSDiscoveryServiceTest extends DiscoveryTest {
 	static final int TEST_PORT = 3282;
 
 	public JMDNSDiscoveryServiceTest() {
-		super("ecf.discovery.jmdns", 1000);
+		super("ecf.discovery.jmdns");
 	}
 
 	/*
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/src/org/eclipse/ecf/tests/provider/jmdns/remoteservice/JMDNSRemoteServiceDiscoveryTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/src/org/eclipse/ecf/tests/provider/jmdns/remoteservice/JMDNSRemoteServiceDiscoveryTest.java
index a5f7bd214..406226e3c 100755
--- a/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/src/org/eclipse/ecf/tests/provider/jmdns/remoteservice/JMDNSRemoteServiceDiscoveryTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.jmdns/src/org/eclipse/ecf/tests/provider/jmdns/remoteservice/JMDNSRemoteServiceDiscoveryTest.java
@@ -23,7 +23,6 @@ import org.eclipse.ecf.discovery.ServiceInfo;
 import org.eclipse.ecf.discovery.identity.IServiceID;
 import org.eclipse.ecf.discovery.identity.IServiceTypeID;
 import org.eclipse.ecf.tests.discovery.DiscoveryTest;
-import org.eclipse.ecf.tests.discovery.DiscoveryTestHelper;
 
 /**
  *
@@ -42,21 +41,14 @@ public class JMDNSRemoteServiceDiscoveryTest extends DiscoveryTest {
 	IServiceInfo serviceInfo;
 
 	public JMDNSRemoteServiceDiscoveryTest() {
-		super(JMDNS_CONTAINER_NAME, 1000);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.tests.discovery.AbstractDiscoveryTest#getPort()
-	 */
-	protected int getPort() {
-		return SERVER_PORT;
+		super(JMDNS_CONTAINER_NAME);
 	}
 
 	protected void setUp() throws Exception {
 		super.setUp();
 		container = ContainerFactory.getDefault().createContainer(containerUnderTest);
 		discoveryContainer = (IDiscoveryContainerAdapter) container.getAdapter(IDiscoveryContainerAdapter.class);
-		final ServiceInfo svcInfo = new ServiceInfo(DiscoveryTestHelper.createDefaultURI(), createServiceID(SERVICE_TYPE, "JMDNSRemoteServiceDiscoveryTest" + System.currentTimeMillis()));
+		final ServiceInfo svcInfo = new ServiceInfo(createDefaultURI(), createServiceID(SERVICE_TYPE, "JMDNSRemoteServiceDiscoveryTest" + System.currentTimeMillis()));
 		svcInfo.setContainerProperties("ecf.generic.client", "ecftcp", "server", null);
 		serviceInfo = svcInfo;
 	}