summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuhong Yin2012-04-24 02:20:20 (EDT)
committer Michael Fiedler2012-04-25 14:59:41 (EDT)
commit2340528a572753060c3714847cc716131c91056e (patch)
tree27599562f478f80bda0e1da56cf1c1e2f612bd9d
parent6d2e4e2a90d02ed76c8c30ce20095b58871f3455 (diff)
downloadorg.eclipse.lyo.testsuite-2340528a572753060c3714847cc716131c91056e.zip
org.eclipse.lyo.testsuite-2340528a572753060c3714847cc716131c91056e.tar.gz
org.eclipse.lyo.testsuite-2340528a572753060c3714847cc716131c91056e.tar.bz2
Bug 377193 - create test cases to support json for queries
-rw-r--r--org.eclipse.lyo.testsuite.server/compliance/cm/jira-compliance-test.xml1
-rw-r--r--org.eclipse.lyo.testsuite.server/compliance/cm/oslc-spec-mapping/oslc-cm-v2.xml9
-rw-r--r--org.eclipse.lyo.testsuite.server/compliance/cm/oslc4j-cm-compliance-test.xml1
-rw-r--r--org.eclipse.lyo.testsuite.server/compliance/cm/reportstyle/junit-noframes.xsl6
-rw-r--r--org.eclipse.lyo.testsuite.server/compliance/cm/rio-cm-compliance-test.xml1
-rw-r--r--org.eclipse.lyo.testsuite.server/compliance/cm/rtc-compliance-test.xml3
6 files changed, 17 insertions, 4 deletions
diff --git a/org.eclipse.lyo.testsuite.server/compliance/cm/jira-compliance-test.xml b/org.eclipse.lyo.testsuite.server/compliance/cm/jira-compliance-test.xml
index bf67c07..4fd57b3 100644
--- a/org.eclipse.lyo.testsuite.server/compliance/cm/jira-compliance-test.xml
+++ b/org.eclipse.lyo.testsuite.server/compliance/cm/jira-compliance-test.xml
@@ -116,6 +116,7 @@
<test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryRdfXmlTests" todir="${junit.output.dir}"/>
<test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryXmlTests" todir="${junit.output.dir}"/>
<test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryAtomTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryJsonTests" todir="${junit.output.dir}"/>
<jvmarg line="-Dprops=../../config/jira/jira.properties"/>
<classpath refid="provider-test.classpath"/>
diff --git a/org.eclipse.lyo.testsuite.server/compliance/cm/oslc-spec-mapping/oslc-cm-v2.xml b/org.eclipse.lyo.testsuite.server/compliance/cm/oslc-spec-mapping/oslc-cm-v2.xml
index 47ca01f..a2d2d9d 100644
--- a/org.eclipse.lyo.testsuite.server/compliance/cm/oslc-spec-mapping/oslc-cm-v2.xml
+++ b/org.eclipse.lyo.testsuite.server/compliance/cm/oslc-spec-mapping/oslc-cm-v2.xml
@@ -178,5 +178,14 @@
<testcase level="MUST">validCompoundQueryContainsExpectedResource</testcase>
<testcase level="MUST">fullTextSearchContainsExpectedResults</testcase>
</testclass>
+
+ <testclass package="org.eclipse.lyo.testsuite.oslcv2" name="SimplifiedQueryJsonTests">
+ <testcase level="MUST">validEqualsQueryContainsExpectedResource</testcase>
+ <testcase level="MUST">validNotEqualQueryContainsExpectedResource</testcase>
+ <testcase level="MUST">validLessThanQueryContainsExpectedResources</testcase>
+ <testcase level="MUST">validGreaterThanQueryContainsExpectedDefects</testcase>
+ <testcase level="MUST">validCompoundQueryContainsExpectedResource</testcase>
+ <testcase level="MUST">fullTextSearchContainsExpectedResults</testcase>
+ </testclass>
</provider-test> \ No newline at end of file
diff --git a/org.eclipse.lyo.testsuite.server/compliance/cm/oslc4j-cm-compliance-test.xml b/org.eclipse.lyo.testsuite.server/compliance/cm/oslc4j-cm-compliance-test.xml
index a46ee71..577ba01 100644
--- a/org.eclipse.lyo.testsuite.server/compliance/cm/oslc4j-cm-compliance-test.xml
+++ b/org.eclipse.lyo.testsuite.server/compliance/cm/oslc4j-cm-compliance-test.xml
@@ -129,6 +129,7 @@
<test name="org.eclipse.lyo.testsuite.oslcv2.cm.ChangeRequestRdfXmlTests" todir="${junit.output.dir}"/>
<test name="org.eclipse.lyo.testsuite.oslcv2.cm.ChangeRequestJsonTests" todir="${junit.output.dir}"/>
<test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryAtomTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryJsonTests" todir="${junit.output.dir}"/>
<jvmarg line="-Dprops=../../config/oslc4j-cm/oslc4j-cm-setup.properties"/>
<classpath refid="run.org.eclipse.lyo.testsuite.server.classpath"/>
diff --git a/org.eclipse.lyo.testsuite.server/compliance/cm/reportstyle/junit-noframes.xsl b/org.eclipse.lyo.testsuite.server/compliance/cm/reportstyle/junit-noframes.xsl
index 526362a..18ebd07 100644
--- a/org.eclipse.lyo.testsuite.server/compliance/cm/reportstyle/junit-noframes.xsl
+++ b/org.eclipse.lyo.testsuite.server/compliance/cm/reportstyle/junit-noframes.xsl
@@ -394,9 +394,9 @@
<h2>OSLC compliance</h2>
- <xsl:variable name="mustCount" select="'179'"/>
- <xsl:variable name="junitMustCount" select="'131'"/>
- <xsl:variable name="junitUniqueReqMustCount" select="'118'"/>
+ <xsl:variable name="mustCount" select="'185'"/>
+ <xsl:variable name="junitMustCount" select="'137'"/>
+ <xsl:variable name="junitUniqueReqMustCount" select="'124'"/>
<xsl:variable name="testsuiteMustCount" select="count($spec//testcase[@level='MUST'])" />
<xsl:variable name="passedMustCount" select="count(/testsuites/testsuite/testcase[@compliance='passedMust'])"/>
<xsl:variable name="failedMustCount" select="count(/testsuites/testsuite/testcase[@compliance='failedMust'])"/>
diff --git a/org.eclipse.lyo.testsuite.server/compliance/cm/rio-cm-compliance-test.xml b/org.eclipse.lyo.testsuite.server/compliance/cm/rio-cm-compliance-test.xml
index f24d1fb..b614324 100644
--- a/org.eclipse.lyo.testsuite.server/compliance/cm/rio-cm-compliance-test.xml
+++ b/org.eclipse.lyo.testsuite.server/compliance/cm/rio-cm-compliance-test.xml
@@ -128,6 +128,7 @@
<test name="org.eclipse.lyo.testsuite.oslcv2.CreationAndUpdateRdfXmlTests" todir="${junit.output.dir}"/>
<test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryRdfXmlTests" todir="${junit.output.dir}"/>
<test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryAtomTests" todir="${junit.output.dir}"/>
+ <test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryJsonTests" todir="${junit.output.dir}"/>
<jvmarg line="-Dprops=../../config/rio-cm/rio-cm-setup.properties"/>
<classpath refid="run.org.eclipse.lyo.testsuite.server.classpath"/>
diff --git a/org.eclipse.lyo.testsuite.server/compliance/cm/rtc-compliance-test.xml b/org.eclipse.lyo.testsuite.server/compliance/cm/rtc-compliance-test.xml
index 4da837e..2f3c5ab 100644
--- a/org.eclipse.lyo.testsuite.server/compliance/cm/rtc-compliance-test.xml
+++ b/org.eclipse.lyo.testsuite.server/compliance/cm/rtc-compliance-test.xml
@@ -125,7 +125,8 @@
<test name="org.eclipse.lyo.testsuite.oslcv2.CreationAndUpdateRdfXmlTests" todir="${junit.output.dir}"/>
<test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryRdfXmlTests" todir="${junit.output.dir}"/>
<test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryAtomTests" todir="${junit.output.dir}"/>
-
+ <test name="org.eclipse.lyo.testsuite.oslcv2.SimplifiedQueryJsonTests" todir="${junit.output.dir}"/>
+
<test name="org.eclipse.lyo.testsuite.oslcv2.cm.ChangeRequestXmlTests" todir="${junit.output.dir}"/>
<test name="org.eclipse.lyo.testsuite.oslcv2.cm.ChangeRequestRdfXmlTests" todir="${junit.output.dir}"/>
<test name="org.eclipse.lyo.testsuite.oslcv2.cm.ChangeRequestJsonTests" todir="${junit.output.dir}"/>