NEW - bug 316106: [Discovery][DNS-SD] Add API to configure DNS resolver

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

2 files changed, 53 insertions, 9 deletions

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 8d8e7be61..2e43d82cc 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
@@ -25,19 +25,28 @@ import org.eclipse.ecf.discovery.identity.ServiceIDFactory;
 import org.eclipse.ecf.provider.dnssd.DnsSdNamespace;
 import org.eclipse.ecf.tests.discovery.DiscoveryServiceTest;
 
+/**
+ * In order for this unit test to succeed, the system search path has to include "dns-sd.ecf-project.org".
+ */
 public class DnsSdDiscoveryServiceTest extends DiscoveryServiceTest {
 
-	protected static final String ECF_DISCOVERY_DNSSD = "ecf.discovery.dnssd";
-	protected static final String DOMAIN = "dns-sd.ecf-project.org";
+	public static final String PORT = "80";
+	public static final String PATH = "/";
+	public static final String DOMAIN_A_RECORD = "www.ecf-project.org";
+	public static final String NAMING_AUTH = "iana";
+	public static final String PROTO = "tcp";
+	public static final String SCHEME = "http";
+	public static final String ECF_DISCOVERY_DNSSD = "ecf.discovery.dnssd";
+	public static final String DOMAIN = "dns-sd.ecf-project.org";
 	
 	public DnsSdDiscoveryServiceTest() {
-		this(ECF_DISCOVERY_DNSSD, DOMAIN, "http", "tcp");
+		this(ECF_DISCOVERY_DNSSD, DOMAIN, SCHEME, PROTO);
 	}
 
 	public DnsSdDiscoveryServiceTest(String string, String scopes,
 			String service, String protocol) {
 		super(ECF_DISCOVERY_DNSSD);
-		setNamingAuthority("iana");
+		setNamingAuthority(NAMING_AUTH);
 		setScope(scopes);
 		setServices(new String[]{service});
 		setProtocol(protocol);
@@ -52,17 +61,17 @@ public class DnsSdDiscoveryServiceTest extends DiscoveryServiceTest {
 		super.setUp();
 		
 		final Properties props = new Properties();
-		final URI uri = URI.create("http://www.ecf-project.org:80/");
+		final URI uri = URI.create(SCHEME + "://" + DOMAIN_A_RECORD + ":" + PORT + PATH);
 	
 		Namespace namespace = discoveryLocator.getServicesNamespace();
-		IServiceTypeID serviceTypeID = ServiceIDFactory.getDefault().createServiceTypeID(namespace, new String[]{"http"}, new String[]{DOMAIN}, new String[]{"tcp"}, "iana");
+		IServiceTypeID serviceTypeID = ServiceIDFactory.getDefault().createServiceTypeID(namespace, new String[]{SCHEME}, new String[]{DOMAIN}, new String[]{PROTO}, NAMING_AUTH);
 		assertNotNull(serviceTypeID);
 		
 		final ServiceProperties serviceProperties = new ServiceProperties(props);
-		serviceProperties.setPropertyString("path", "/");
-		serviceProperties.setPropertyString("dns-sd.ptcl", "http");
+		serviceProperties.setPropertyString("path", PATH);
+		serviceProperties.setPropertyString("dns-sd.ptcl", SCHEME);
 
-		serviceInfo = new ServiceInfo(uri, "www.ecf-project.org", serviceTypeID, 10, 0, serviceProperties);
+		serviceInfo = new ServiceInfo(uri, DOMAIN_A_RECORD, serviceTypeID, 10, 0, serviceProperties);
 		assertNotNull(serviceInfo);
 	}
 
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryServiceTestWithParamsSet.java b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryServiceTestWithParamsSet.java
new file mode 100644
index 000000000..985e19722
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdDiscoveryServiceTestWithParamsSet.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Markus Alexander Kuppe.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Markus Alexander Kuppe (ecf-dev_eclipse.org <at> lemmster <dot> de) - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.ecf.tests.provider.dnssd;
+
+import org.eclipse.ecf.discovery.IDiscoveryLocator;
+import org.eclipse.ecf.provider.dnssd.DnsSdDisocoveryLocator;
+
+public class DnsSdDiscoveryServiceTestWithParamsSet extends
+		DnsSdDiscoveryServiceTest {
+
+	public static final String RESOLVER = "ns1.ecf-project.org";
+
+	public DnsSdDiscoveryServiceTestWithParamsSet() {
+		super();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ecf.tests.discovery.DiscoveryServiceTest#getDiscoveryLocator()
+	 */
+	protected IDiscoveryLocator getDiscoveryLocator() {
+		DnsSdDisocoveryLocator locator = (DnsSdDisocoveryLocator) super.getDiscoveryLocator();
+		locator.setSearchPath(new String[]{DOMAIN});
+		locator.setResolver(RESOLVER);
+		return locator;
+	}
+
+}