Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authormkuppe2008-04-30 09:15:26 -0400
committermkuppe2008-04-30 09:15:26 -0400
commitfdaca474d9c3a29be96a85da8a8a1e9cca4218a0 (patch)
tree555ec5ecafcc798a9404ff8234882914edfcfc84 /tests
parentf0b2fc5d47a4c18e3f5a38a577675b6d130af071 (diff)
downloadorg.eclipse.ecf-fdaca474d9c3a29be96a85da8a8a1e9cca4218a0.tar.gz
org.eclipse.ecf-fdaca474d9c3a29be96a85da8a8a1e9cca4218a0.tar.xz
org.eclipse.ecf-fdaca474d9c3a29be96a85da8a8a1e9cca4218a0.zip
FIXED - bug 228882: [Discovery][slp][provider] SLP not getting service properties
https://bugs.eclipse.org/bugs/show_bug.cgi?id=228882
Diffstat (limited to 'tests')
-rwxr-xr-xtests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryTest.java6
-rwxr-xr-xtests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/ServiceInfoComparator.java2
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryTest.java b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryTest.java
index 2fc93175c..469872158 100755
--- a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/DiscoveryTest.java
@@ -81,7 +81,11 @@ public abstract class DiscoveryTest extends AbstractDiscoveryTest {
serviceID = (IServiceID) IDFactory.getDefault().createID(discoveryContainer.getServicesNamespace(), new Object[] {DiscoveryTestHelper.SERVICE_TYPE, DiscoveryTestHelper.getHost()});
assertNotNull(serviceID);
final ServiceProperties serviceProperties = new ServiceProperties(props);
- serviceProperties.setPropertyString("serviceProperties", "serviceProperties");
+ serviceProperties.setPropertyString(DiscoveryTest.class.getName() + "servicePropertiesString", "serviceProperties");
+ serviceProperties.setProperty(DiscoveryTest.class.getName() + "servicePropertiesIntegerMax", new Integer(Integer.MIN_VALUE));
+ serviceProperties.setProperty(DiscoveryTest.class.getName() + "servicePropertiesIntegerMin", new Integer(Integer.MAX_VALUE));
+ serviceProperties.setProperty(DiscoveryTest.class.getName() + "servicePropertiesBoolean", new Boolean(false));
+ serviceProperties.setPropertyBytes(DiscoveryTest.class.getName() + "servicePropertiesByte", new byte[]{'a', 'b', 'c', 'd'});
serviceInfo = new ServiceInfo(uri, serviceID, 0, 0, serviceProperties);
assertNotNull(serviceInfo);
diff --git a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/ServiceInfoComparator.java b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/ServiceInfoComparator.java
index 5047201a9..7bc49b4ec 100755
--- a/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/ServiceInfoComparator.java
+++ b/tests/bundles/org.eclipse.ecf.tests.discovery/src/org/eclipse/ecf/tests/discovery/ServiceInfoComparator.java
@@ -23,7 +23,7 @@ import org.eclipse.ecf.discovery.IServiceProperties;
public class ServiceInfoComparator implements Comparator {
private boolean compareServiceProperties(IServiceProperties p1, IServiceProperties p2) {
- if (p1.asProperties().size() != p2.asProperties().size())
+ if (p1.size() != p2.size())
return false;
for (final Enumeration e = p1.getPropertyNames(); e.hasMoreElements();) {
final String key = (String) e.nextElement();

Back to the top