Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrelves2010-01-13 13:47:34 -0500
committerrelves2010-01-13 13:47:34 -0500
commit3e13040fd37f746159f29d1c15cff4d7f0464687 (patch)
tree35810a3058b5f8902c5052b9c49947339edc6fda /org.eclipse.mylyn.oslc.tests
parent84a4262f7cc706e0c5fa0718fba638617fa30e90 (diff)
downloadorg.eclipse.mylyn.tasks-3e13040fd37f746159f29d1c15cff4d7f0464687.tar.gz
org.eclipse.mylyn.tasks-3e13040fd37f746159f29d1c15cff4d7f0464687.tar.xz
org.eclipse.mylyn.tasks-3e13040fd37f746159f29d1c15cff4d7f0464687.zip
NEW - bug 299531: update service discovery to use rdf:about from ServiceProviderCatalog
https://bugs.eclipse.org/bugs/show_bug.cgi?id=299531
Diffstat (limited to 'org.eclipse.mylyn.oslc.tests')
-rw-r--r--org.eclipse.mylyn.oslc.tests/src/org/eclipse/mylyn/oslc/cm/tests/ServiceDiscoveryTest.java4
-rw-r--r--org.eclipse.mylyn.oslc.tests/xml/service-provider-catalog.xml10
2 files changed, 11 insertions, 3 deletions
diff --git a/org.eclipse.mylyn.oslc.tests/src/org/eclipse/mylyn/oslc/cm/tests/ServiceDiscoveryTest.java b/org.eclipse.mylyn.oslc.tests/src/org/eclipse/mylyn/oslc/cm/tests/ServiceDiscoveryTest.java
index ff2ce4c0a..7b58767eb 100644
--- a/org.eclipse.mylyn.oslc.tests/src/org/eclipse/mylyn/oslc/cm/tests/ServiceDiscoveryTest.java
+++ b/org.eclipse.mylyn.oslc.tests/src/org/eclipse/mylyn/oslc/cm/tests/ServiceDiscoveryTest.java
@@ -97,8 +97,10 @@ public class ServiceDiscoveryTest extends TestCase {
FileInputStream inStream = new FileInputStream(file);
ArrayList<OslcServiceProvider> list = new ArrayList<OslcServiceProvider>();
client.parseServices(inStream, list, new NullProgressMonitor());
- assertEquals(1, list.size());
+ assertEquals(2, list.size());
OslcServiceProvider desc = list.get(0);
+ assertEquals("http://somewhere/catalog", desc.getUrl());
+ desc = list.get(1);
assertEquals("http://mylyn.eclipse.org/oslc/cqrest/repo/7.0.0/db/SAMPL", desc.getUrl());
}
diff --git a/org.eclipse.mylyn.oslc.tests/xml/service-provider-catalog.xml b/org.eclipse.mylyn.oslc.tests/xml/service-provider-catalog.xml
index f725f39f3..df6aad5fb 100644
--- a/org.eclipse.mylyn.oslc.tests/xml/service-provider-catalog.xml
+++ b/org.eclipse.mylyn.oslc.tests/xml/service-provider-catalog.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ServiceProviderCatalog xmlns="http://open-services.net/xmlns/discovery/1.0/" xmlns:dc="http://purl.org/dc/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" rdf:about="http://mylyn.eclipse.org/oslc/cqrest/repo/7.0.0/db/">
-<dc:title>Database</dc:title>
+<ServiceProviderCatalog xmlns="http://open-services.net/xmlns/discovery/1.0/" xmlns:dc="http://purl.org/dc/terms/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" rdf:about="http://demo.tasktop.com/oslc/cqrest/">
+<dc:title>Repository</dc:title>
+<entry>
+<ServiceProviderCatalog rdf:about="http://somewhere/catalog">
+<dc:title>ALM</dc:title>
+<details rdf:resource="http://somewhere/webaccess/"/>
+</ServiceProviderCatalog>
+</entry>
<entry>
<ServiceProvider>
<dc:title>SAMPL</dc:title>

Back to the top