aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuhong Yin2012-09-04 10:07:22 (EDT)
committerMichael Fiedler2012-09-09 13:59:25 (EDT)
commitcc66eeb8fe93f0ea6b2ea31032e526736d199a8c (patch)
tree42de7dc50d5d6377b49d152236a299b6eb60930d
parent3a6ecfe8bae86be53368cef345ed8322988e1204 (diff)
downloadorg.eclipse.lyo.testsuite-cc66eeb8fe93f0ea6b2ea31032e526736d199a8c.zip
org.eclipse.lyo.testsuite-cc66eeb8fe93f0ea6b2ea31032e526736d199a8c.tar.gz
org.eclipse.lyo.testsuite-cc66eeb8fe93f0ea6b2ea31032e526736d199a8c.tar.bz2
Bug 386787 - lyo test suite should not expect etag or last-modified ifrefs/changes/89/7589/2
the response body for POST is empty Change-Id: Ieb48df84559dad997386aae2cd5d22373801d556
-rw-r--r--org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/cm/ChangeRequestJsonTests.java11
1 files changed, 9 insertions, 2 deletions
diff --git a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/cm/ChangeRequestJsonTests.java b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/cm/ChangeRequestJsonTests.java
index 14b41f7..35ee807 100644
--- a/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/cm/ChangeRequestJsonTests.java
+++ b/org.eclipse.lyo.testsuite.server/src/main/java/org/eclipse/lyo/testsuite/oslcv2/cm/ChangeRequestJsonTests.java
@@ -61,6 +61,14 @@ public class ChangeRequestJsonTests extends CoreResourceJsonTests {
public static Collection<Object[]> getAllDescriptionUrls()
throws IOException, NullPointerException, XPathException, ParserConfigurationException, SAXException, JSONException
{
+ ArrayList<String> results = new ArrayList<String>();
+
+ String useThisCR = setupProps.getProperty("useThisChangeRequest");
+ if ( useThisCR != null ) {
+ results.add(useThisCR);
+ return toCollection(results);
+ }
+
//Checks the ServiceProviderCatalog at the specified baseUrl of the REST service in order to grab all urls
//to other ServiceProvidersCatalogs contained within it, recursively, in order to find the URLs of all
//query factories of the REST service.
@@ -79,8 +87,7 @@ public class ChangeRequestJsonTests extends CoreResourceJsonTests {
String additionalParameters = setupProps.getProperty("queryAdditionalParameters");
String query = (additionalParameters.length() == 0) ? "?" : "?" + additionalParameters + "&";
query = query + "oslc.where=" + URLEncoder.encode(where, "UTF-8") + "&oslc.pageSize=1";
-
- ArrayList<String> results = new ArrayList<String>();
+
for (String queryBaseUri : capabilityURLsUsingJson) {
String queryUrl = OSLCUtils.addQueryStringToURL(queryBaseUri, query);