Bug 370444 - Rename contentTypeIsCMServiceDescription method and change

the folder structure for compliance tool

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);
-
-	}

+

 }