diff options
Diffstat (limited to 'tests/bundles')
2 files changed, 12 insertions, 5 deletions
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.jslp/src/org/eclipse/ecf/tests/provider/jslp/JSLPTestComparator.java b/tests/bundles/org.eclipse.ecf.tests.provider.jslp/src/org/eclipse/ecf/tests/provider/jslp/JSLPTestComparator.java index a92e2848e..96e3fc18f 100755 --- a/tests/bundles/org.eclipse.ecf.tests.provider.jslp/src/org/eclipse/ecf/tests/provider/jslp/JSLPTestComparator.java +++ b/tests/bundles/org.eclipse.ecf.tests.provider.jslp/src/org/eclipse/ecf/tests/provider/jslp/JSLPTestComparator.java @@ -39,11 +39,9 @@ public class JSLPTestComparator implements Comparator { IServiceTypeID firstTypeID = firstID.getServiceTypeID(); IServiceTypeID secondTypeID = secondID.getServiceTypeID(); - //TODO-mkuppe No prio, weight and protocol atm in the JSLP testcase boolean protocolsSame = Arrays.equals(firstTypeID.getProtocols(), secondTypeID.getProtocols()); boolean weightSame = first.getWeight() == second.getWeight(); boolean prioSame = first.getPriority() == second.getPriority(); - String firstName = firstID.getName(); String secondName = secondID.getName(); boolean nameSame = firstName.equals(secondName); @@ -61,7 +59,7 @@ public class JSLPTestComparator implements Comparator { boolean locationSame = firstLocation.equals(secondLocation); boolean scopesSame = Arrays.equals(firstTypeID.getScopes(), secondTypeID.getScopes()); boolean propertySame = first.getServiceProperties().equals(second.getServiceProperties()); - boolean result = nameSame && namespaceSame && serviceSame && naSame && locationSame && scopesSame && propertySame; + boolean result = protocolsSame && weightSame && prioSame && nameSame && namespaceSame && serviceSame && naSame && locationSame && scopesSame && propertySame; if(result == true) { return 0; } diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.jslp/src/org/eclipse/ecf/tests/provider/jslp/identity/JSLPServiceIDTest.java b/tests/bundles/org.eclipse.ecf.tests.provider.jslp/src/org/eclipse/ecf/tests/provider/jslp/identity/JSLPServiceIDTest.java index 59839a8b9..91da21a10 100755 --- a/tests/bundles/org.eclipse.ecf.tests.provider.jslp/src/org/eclipse/ecf/tests/provider/jslp/identity/JSLPServiceIDTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.provider.jslp/src/org/eclipse/ecf/tests/provider/jslp/identity/JSLPServiceIDTest.java @@ -28,6 +28,9 @@ import ch.ethz.iks.slp.ServiceURL; public class JSLPServiceIDTest extends ServiceIDTest { + private static final int WEIGHT = 43; + private static final int PRIORITY = 42; + private static final String ASERVICENAME = "aServicename"; private static final String IANA = "iana"; public JSLPServiceIDTest() { @@ -79,8 +82,11 @@ public class JSLPServiceIDTest extends ServiceIDTest { final String internalRep = "service:foo.eclipse:bar"; final ServiceURL sUrl = new ServiceURL(internalRep + "://localhost:1234/a/path/to/something", ServiceURL.LIFETIME_PERMANENT); - final IServiceInfo serviceInfo = new JSLPServiceInfo(new ServiceURLAdapter(sUrl), -1, -1, new ServicePropertiesAdapter(new ArrayList())); + final IServiceInfo serviceInfo = new JSLPServiceInfo(new ServiceURLAdapter(sUrl, "aServiceNameString"), PRIORITY, WEIGHT, new ServicePropertiesAdapter(new ArrayList())); + assertEquals(serviceInfo.getPriority(), PRIORITY); + assertEquals(serviceInfo.getWeight(), WEIGHT); final IServiceID sid = serviceInfo.getServiceID(); + assertEquals(sid.getServiceName(), ASERVICENAME); final IServiceTypeID stid = sid.getServiceTypeID(); String internal = stid.getInternal(); @@ -102,8 +108,11 @@ public class JSLPServiceIDTest extends ServiceIDTest { final String internalRep = "service:service:foo.eclipse:bar"; final ServiceURL sUrl = new ServiceURL(internalRep + "://localhost:1234/a/path/to/something", ServiceURL.LIFETIME_PERMANENT); - final IServiceInfo serviceInfo = new JSLPServiceInfo(new ServiceURLAdapter(sUrl), -1, -1, new ServicePropertiesAdapter(new ArrayList())); + final IServiceInfo serviceInfo = new JSLPServiceInfo(new ServiceURLAdapter(sUrl, ASERVICENAME), PRIORITY, WEIGHT, new ServicePropertiesAdapter(new ArrayList())); + assertEquals(serviceInfo.getPriority(), PRIORITY); + assertEquals(serviceInfo.getWeight(), WEIGHT); final IServiceID sid = serviceInfo.getServiceID(); + assertEquals(sid.getServiceName(), ASERVICENAME); final IServiceTypeID stid = sid.getServiceTypeID(); assertEquals(internalRep, stid.getInternal()); |