aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuhong Yin2012-02-13 12:35:52 (EST)
committerMichael Fiedler2012-02-14 12:35:24 (EST)
commit00111e895c1f78475c028b6c1b069b504f0fdd52 (patch)
treeb3b11c901325ce50a894a1c79fbdb56583f1deb5
parentf38533ae0d2c8bdc3fbe4ccc3160e2c05bbb1648 (diff)
downloadorg.eclipse.lyo.testsuite-00111e895c1f78475c028b6c1b069b504f0fdd52.zip
org.eclipse.lyo.testsuite-00111e895c1f78475c028b6c1b069b504f0fdd52.tar.gz
org.eclipse.lyo.testsuite-00111e895c1f78475c028b6c1b069b504f0fdd52.tar.bz2
Bug 370444 - Rename contentTypeIsCMServiceDescription method and change
the folder structure for compliance tool
-rw-r--r--org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderRdfXmlTests.java13
-rw-r--r--org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderXmlTests.java14
2 files changed, 1 insertions, 26 deletions
diff --git a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderRdfXmlTests.java b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderRdfXmlTests.java
index a7a6ce4..083848c 100644
--- a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderRdfXmlTests.java
+++ b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderRdfXmlTests.java
@@ -201,19 +201,6 @@ public class ServiceProviderRdfXmlTests extends TestsBase {
Property service = fRdfModel.createProperty(OSLCConstants.SERVICE_PROP);
List<?> lst = fServiceProvider.listProperties(service).toList();
assertTrue(lst.size() >= 1);
- }
-
- @Test
- public void invalidOslcPropertiesGivesConflict() throws IOException
- {
- String paramterUrl = OSLCUtils.addParameterToURL(currentUrl, "oslc.properties", "dcterms:identifier=\"non-exist\"");
- HttpResponse resp = OSLCUtils.getResponseFromUrl(setupBaseUrl, paramterUrl, basicCreds,
- fContentType, headers);
-
- String respType = (resp.getEntity().getContentType() == null) ? "" : resp.getEntity().getContentType().getValue();
- EntityUtils.consume(resp.getEntity());
- assertTrue("Expected 409 but received "+resp.getStatusLine()+",Content-type='invalid/content-type' but received "+respType, resp.getStatusLine().getStatusCode() == 409);
-
}
/* TODO: Complete ServiceProvider RDF/XML test validation
diff --git a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderXmlTests.java b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderXmlTests.java
index 48e5514..55f8408 100644
--- a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderXmlTests.java
+++ b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/server/oslcv2tests/ServiceProviderXmlTests.java
@@ -524,17 +524,5 @@ public class ServiceProviderXmlTests extends TestsBase {
assertTrue(numHintHeight <= 1);
}
}
-
- @Test
- public void invalidOslcPropertiesGivesConflict() throws IOException
- {
- String paramterUrl = OSLCUtils.addParameterToURL(currentUrl, "oslc.properties", "dcterms:identifier=\"non-exist\"");
- HttpResponse resp = OSLCUtils.getResponseFromUrl(setupBaseUrl, paramterUrl, basicCreds,
- fContentType, headers);
-
- String respType = (resp.getEntity().getContentType() == null) ? "" : resp.getEntity().getContentType().getValue();
- EntityUtils.consume(resp.getEntity());
- assertTrue("Expected 409 but received "+resp.getStatusLine()+",Content-type='invalid/content-type' but received "+respType, resp.getStatusLine().getStatusCode() == 409);
-
- }
+
}