aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuhong Yin2012-09-04 10:11:23 (EDT)
committerMichael Fiedler2012-09-09 13:59:24 (EDT)
commit764f6cfaa3f092677cbe973e489389b897abe57a (patch)
tree714b190fcd56fd83a1e59e22841786f6b755be4d
parent6dc222be42c460b94dbfecae8de8c3e745966ce3 (diff)
downloadorg.eclipse.lyo.testsuite-764f6cfaa3f092677cbe973e489389b897abe57a.zip
org.eclipse.lyo.testsuite-764f6cfaa3f092677cbe973e489389b897abe57a.tar.gz
org.eclipse.lyo.testsuite-764f6cfaa3f092677cbe973e489389b897abe57a.tar.bz2
Bug 386787 - lyo test suite should not expect etag or last-modified ifrefs/changes/94/7594/2
the response body for POST is empty Change-Id: Ieccbc88434de2bfccc5300a5bd194e3eb98784c6
-rw-r--r--org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-json-template.json2
-rw-r--r--org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-setupv1.properties12
-rw-r--r--org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-setupv2.properties32
-rw-r--r--org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-update.xml2
4 files changed, 33 insertions, 15 deletions
diff --git a/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-json-template.json b/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-json-template.json
index 01d17d7..75dc90c 100644
--- a/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-json-template.json
+++ b/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-json-template.json
@@ -1,5 +1,5 @@
{
- "dc:type":"http:\/\/quagmire.rtp.raleigh.ibm.com\/cqweb\/oslc\/repo\/7.0.0\/db\/SAMPL\/record-type\/16777224",
+ "dc:type":"https:\/\/quagmire.rtp.raleigh.ibm.com\/cqweb\/oslc\/repo\/7.0.0\/db\/SAMPL\/record-type\/16777224",
"dc:title":"hello world",
"Severity":"3-Average"
}
diff --git a/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-setupv1.properties b/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-setupv1.properties
index 8dd0de2..a658036 100644
--- a/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-setupv1.properties
+++ b/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-setupv1.properties
@@ -31,7 +31,7 @@ testVersions=http://open-services.net/xmlns/cm/1.0/
#The query parameter that should be used to test equality
queryEqualityProperty=Headline
#The parameter value used with the parameter to test equality (record with this value should exist in the system)
-queryEqualityValue=hello world
+queryEqualityValue=templatedDefect
#The query parameter that should be used to test equality
queryComparisonProperty=Submit_Date
#The parameter value used with the parameter to test comparisons (should split the results into two non-empty sets)
@@ -53,13 +53,13 @@ updateTemplateJsonFile=config/cq/cq-json-update.json
##OAUTH PROPERTIES##
#The URL corresponding to issuing request tokens
-OAuthRequestTokenUrl=http://quagmire.rtp.raleigh.ibm.com/cqweb/oauth-request-token/7.0.0
+OAuthRequestTokenUrl=https://quagmire.rtp.raleigh.ibm.com/cqweb/oauth-request-token/7.0.0
#The URL corresponding to OAuth user authorization
-OAuthAuthorizationUrl=http://quagmire.rtp.raleigh.ibm.com/cqweb/oauth-authorization/7.0.0
+OAuthAuthorizationUrl=https://quagmire.rtp.raleigh.ibm.com/cqweb/oauth-authorization/7.0.0
#Parameters to be POSTed to the authorization URL along with the acquired request token
OAuthAuthorizationParameters=id=admin&password=&oauth_callback=none&Authorize=Continue
#The URL corresponding to issuing access tokens
-OAuthAccessTokenUrl=http://quagmire.rtp.raleigh.ibm.com/cqweb/oauth-access-token/7.0.0
+OAuthAccessTokenUrl=https://quagmire.rtp.raleigh.ibm.com/cqweb/oauth-access-token/7.0.0
#The consumer token and secret used to make the OAuth accesses
-OAuthConsumerToken=205c029fb1764a5a8055cd78d179066e
-OAuthConsumerSecret=secret \ No newline at end of file
+OAuthConsumerToken=oslctest
+OAuthConsumerSecret=oslctest \ No newline at end of file
diff --git a/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-setupv2.properties b/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-setupv2.properties
index de6296a..299b9af 100644
--- a/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-setupv2.properties
+++ b/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-setupv2.properties
@@ -15,7 +15,8 @@
###############################################################################
##GENERAL PROPERTIES##
#The location of the top level ServiceProviderCatalog or Service Description Document
-baseUri=https://quagmire.rtp.raleigh.ibm.com/cqweb/oslc/repo/7.0.0
+#baseUri=https://quagmire.rtp.raleigh.ibm.com/cqweb/oslc/repo/7.0.0
+baseUri=https://unagi.rtp.raleigh.ibm.com/cqweb/oslc/repo/7.0.0
#Implementation name (for identification purposes)
implName=CQ
#The authentication style (currently supports only BASIC, not FORM)
@@ -24,9 +25,23 @@ authMethod=BASIC
userId=admin
pw=
# Values: http://open-services.net/xmlns/cm/1.0/ | http://open-services.net/ns/cm# | both
-testVersions=http://open-services.net/ns/cm#
-
+testVersions=http://open-services.net/ns/cm#
+
version1Properties=config/cq/cq-setupv1.properties
+
+# Specify a simple query to run
+# If not specified, the test will read the capability document and pick the first query to use
+useThisQuery=https://unagi.rtp.raleigh.ibm.com/cqweb/oslc/repo/7.0.0/db/SAMPL/simpleQuery/16777224
+
+# Specify a change request resource to test against
+# When this parameter has value, the "useThisServiceProvider" and "runOnlyOnce" will be ineffective
+useThisChangeRequest=https://unagi.rtp.raleigh.ibm.com/cqweb/oslc/repo/7.0.0/db/SAMPL/record/16777219-33554462
+
+# Specify a service provider to use if there are multiple
+useThisServiceProvider=
+# Determine if tests should follow all possible links: Service Catalogs, Service Providers, Query Capabilities, etc.
+# Default is runOnlyOnce=true, which will either use the 1st entry it encounters or use the services labeled as the defaults.
+runOnlyOnce=true
##CHANGE REQUEST TEST PROPERTIES##
#The where clause used to find records in the change request tests
@@ -35,14 +50,17 @@ version1Properties=config/cq/cq-setupv1.properties
##QUERY PROPERTIES##
#The query parameter that should be used to test equality
queryEqualityProperty=dcterms:identifier
-#The parameter value used with the parameter to test equality (record with this value should exist in the system)
-queryEqualityValue=33554433
+#The parameter value used with the parameter to test equality (record with this value should exist in the system)
+queryEqualityValue=33554462
#The query parameter that should be used to test equality
queryComparisonProperty=dcterms:identifier
#The parameter value used with the parameter to test comparisons (should split the results into two non-empty sets)
-queryComparisonValue=1
+queryComparisonValue=33554435
#Additional non-OSLC parameters that need to be included to run queries
-queryAdditionalParameters=
+queryAdditionalParameters=
+
+#Whether Full Text Search capability is enabled
+fullTextSearch=false
#A value to test full text search against (should return a non-empty record list)
fullTextSearchTerm=bug
diff --git a/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-update.xml b/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-update.xml
index a894598..6dbf7f6 100644
--- a/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-update.xml
+++ b/org.eclipse.lyo.testsuite.server/assessment/cm/config/cq/cq-update.xml
@@ -14,6 +14,6 @@
Steve Speicher - initial API and implementation
-->
-<oslc_cm:ChangeRequest xmlns:cq="http://www.ibm.com/xmlns/prod/rational/clearquest/1.0/" xmlns:oslc_cm="http://open-services.net/xmlns/cm/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/terms/" rdf:about="http://quagmire.rtp.raleigh.ibm.com/cqweb/oslc/repo/7.0.0/db/SAMPL/record/16777224-33554439">
+<oslc_cm:ChangeRequest xmlns:cq="http://www.ibm.com/xmlns/prod/rational/clearquest/1.0/" xmlns:oslc_cm="http://open-services.net/xmlns/cm/1.0/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/terms/" rdf:about="https://quagmire.rtp.raleigh.ibm.com/cqweb/oslc/repo/7.0.0/db/SAMPL/record/16777224-33554439">
<dc:title>updatedHeadline</dc:title>
</oslc_cm:ChangeRequest>