From dae1bb051dc1e2c3215c266018f07f2ef2f299e5 Mon Sep 17 00:00:00 2001
From: mkuppe
Date: Sun, 22 Mar 2009 20:00:30 +0000
Subject: Make all DNS-SD tests pass

---
 .../provider/dnssd/DnsSdDiscoveryComparator.java   |  2 +-
 .../provider/dnssd/DnsSdDiscoveryServiceTest.java  | 64 +++++++++++++++++++++-
 .../DnsSdDiscoveryServiceTestWithWildcards.java    | 10 ++--
 3 files changed, 69 insertions(+), 7 deletions(-)

(limited to 'tests/bundles/org.eclipse.ecf.tests.provider.dnssd')

diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryComparator.java b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryComparator.java
index e356ad497..77a0bf953 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryComparator.java
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryComparator.java
@@ -25,7 +25,7 @@ public class DnsSdDiscoveryComparator extends ServiceInfoComparator {
 			final IServiceInfo second = (IServiceInfo) arg1;
 			final IServiceID firstServiceId = first.getServiceID();
 			final IServiceID secondServiceId = second.getServiceID();
-			boolean idsSame = true;// firstServiceId.equals(secondServiceId);
+			boolean idsSame = firstServiceId.equals(secondServiceId);
 			boolean prioSame = first.getPriority() == second.getPriority();
 			boolean weightSame = first.getWeight() == second.getWeight();
 			boolean servicePropertiesSame = compareServiceProperties(first.getServiceProperties(), second.getServiceProperties());
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryServiceTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryServiceTest.java
index 1631b35d3..5b7ceae95 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryServiceTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryServiceTest.java
@@ -13,6 +13,7 @@ package org.eclipse.ecf.tests.provider.dnssd;
 import java.net.URI;
 import java.util.Properties;
 
+import org.eclipse.ecf.core.ContainerConnectException;
 import org.eclipse.ecf.core.identity.Namespace;
 import org.eclipse.ecf.discovery.IDiscoveryAdvertiser;
 import org.eclipse.ecf.discovery.IServiceInfo;
@@ -53,13 +54,74 @@ public class DnsSdDiscoveryServiceTest extends DiscoveryServiceTest {
 		assertNotNull(serviceTypeID);
 		
 		final ServiceProperties serviceProperties = new ServiceProperties(props);
-		serviceProperties.setPropertyString("path", "/");
+		serviceProperties.setPropertyString("path", "/blog");
 		serviceProperties.setPropertyString("dns-sd.ptcl", "http");
 
 		serviceInfo = new ServiceInfo(uri, "www.kuppe.org", serviceTypeID, 10, 0, serviceProperties);
 		assertNotNull(serviceInfo);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.ecf.tests.discovery.DiscoveryTest#testAddServiceListenerIServiceListener()
+	 */
+	public void testAddServiceListenerIServiceListener()
+			throws ContainerConnectException {
+		// NOP, not applicable for DNS-SD
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ecf.tests.discovery.DiscoveryTest#testAddServiceListenerIServiceTypeIDIServiceListener()
+	 */
+	public void testAddServiceListenerIServiceTypeIDIServiceListener()
+			throws ContainerConnectException {
+		// NOP, not applicable for DNS-SD
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ecf.tests.discovery.DiscoveryTest#testAddServiceTypeListener()
+	 */
+	public void testAddServiceTypeListener() throws ContainerConnectException {
+		// NOP, not applicable for DNS-SD
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ecf.tests.discovery.DiscoveryTest#testRegisterService()
+	 */
+	public void testRegisterService() throws ContainerConnectException {
+		// NOP, not applicable for DNS-SD
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ecf.tests.discovery.DiscoveryTest#testRemoveServiceListenerIServiceListener()
+	 */
+	public void testRemoveServiceListenerIServiceListener()
+			throws ContainerConnectException {
+		// NOP, not applicable for DNS-SD
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ecf.tests.discovery.DiscoveryTest#testRemoveServiceListenerIServiceTypeIDIServiceListener()
+	 */
+	public void testRemoveServiceListenerIServiceTypeIDIServiceListener()
+			throws ContainerConnectException {
+		// NOP, not applicable for DNS-SD
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ecf.tests.discovery.DiscoveryTest#testRemoveServiceTypeListener()
+	 */
+	public void testRemoveServiceTypeListener()
+			throws ContainerConnectException {
+		// NOP, not applicable for DNS-SD
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ecf.tests.discovery.DiscoveryTest#testUnregisterService()
+	 */
+	public void testUnregisterService() throws ContainerConnectException {
+		// NOP, not applicable for DNS-SD
+	}
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.ecf.tests.discovery.DiscoveryServiceTest#getDiscoveryAdvertiser()
 	 */
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryServiceTestWithWildcards.java b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryServiceTestWithWildcards.java
index 14a3af3b0..615280c08 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryServiceTestWithWildcards.java
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryServiceTestWithWildcards.java
@@ -11,9 +11,9 @@
 package org.eclipse.ecf.tests.provider.dnssd;
 
 
-public class DnsSdDiscoveryServiceTestWithWildcards {
-//
-//	public DnsSrvDiscoveryServiceTestWithWildcards() {
-//		super("ecf.discovery.dnssd", "kuppe.org", "", "");
-//	}
+public class DnsSdDiscoveryServiceTestWithWildcards extends DnsSdDiscoveryServiceTest {
+
+	public DnsSdDiscoveryServiceTestWithWildcards() {
+		super("ecf.discovery.dnssd", "kuppe.org", "", "");
+	}
 }
-- 
cgit v1.2.3