NEW - bug 317798: [[Discovery][DNS-SD] Create/register IDiscoveryAdvertiser container/service

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

4 files changed, 12 insertions, 12 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/Activator.java b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/Activator.java
index 520634eff..c1ff3f997 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/Activator.java
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/Activator.java
@@ -55,7 +55,8 @@ public class Activator implements BundleActivator {
 					DnsSdTestHelper.ECF_DISCOVERY_DNSSD, null);
 			Dictionary properties = new Hashtable();
 			properties.put(IDnsSdDiscoveryConstants.CA_SEARCH_PATH, new String[]{DnsSdTestHelper.DOMAIN});
-			properties.put(IDnsSdDiscoveryConstants.CA_RESOLVER, "8.8.8.8");
+			properties.put(IDnsSdDiscoveryConstants.CA_RESOLVER, DnsSdTestHelper.DNS_RESOLVER);
+			properties.put(IDnsSdDiscoveryConstants.CA_TSIG_KEY, DnsSdTestHelper.TSIG_KEY);
 			config.update(properties);
 
 			filter = "(" + Constants.SERVICE_PID + "=" + config.getPid() + ")";
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 5bf923fc3..aa981d0f7 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
@@ -27,13 +27,13 @@ public class DnsSdDiscoveryServiceTest extends DiscoveryServiceTest {
 		this(DnsSdTestHelper.ECF_DISCOVERY_DNSSD, DnsSdTestHelper.DOMAIN, DnsSdTestHelper.SCHEME, DnsSdTestHelper.PROTO);
 	}
 
-	public DnsSdDiscoveryServiceTest(String string, String scopes,
-			String service, String protocol) {
+	public DnsSdDiscoveryServiceTest(String aContainer, String aDomain,
+			String aService, String aProtocol) {
 		super(DnsSdTestHelper.ECF_DISCOVERY_DNSSD);
 		setNamingAuthority(DnsSdTestHelper.NAMING_AUTH);
-		setScope(scopes);
-		setServices(new String[]{service});
-		setProtocol(protocol);
+		setScope(aDomain);
+		setServices(new String[]{aService});
+		setProtocol(aProtocol);
 		setComparator(new DnsSdDiscoveryComparator());
 		eventsToExpect = 7;
 	}
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
index 66a0905c9..f8cb2ead7 100644
--- 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
@@ -15,12 +15,6 @@ import org.eclipse.ecf.discovery.IDiscoveryLocator;
 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()
 	 */
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdTestHelper.java b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdTestHelper.java
index 4691e60e8..4dedbd54c 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdTestHelper.java
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.dnssd/src/org/eclipse/ecf/tests/provider/dnssd/DnsSdTestHelper.java
@@ -29,6 +29,10 @@ public class DnsSdTestHelper {
 	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 static final String DNS_RESOLVER = "8.8.8.8";
+	public static final String DNS_SERVER = "188.40.102.175";
+	public static final String TSIG_KEY = "EdoBE6i8YeIiFKiKEGC9LaI4X+C44Rdd6Nwh7ZvBi6tCpszvkartLoPjVYKoJ4RdY4hnFV3zAKp1d1t2MToxUQ==";
+	public static final String REG_DOMAIN = "dnssd2.ecf-project.org";
 
 	public static IServiceInfo createServiceInfo(Namespace namespace) {
 		final Properties props = new Properties();
@@ -42,4 +46,5 @@ public class DnsSdTestHelper {
 
 		return new ServiceInfo(uri, DOMAIN_A_RECORD, serviceTypeID, 10, 0, serviceProperties);
 	}
+
 }