You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by wa...@apache.org on 2002/08/01 11:28:13 UTC
cvs commit: jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/XPATH 37_singleXPathSingleSelectRefNameNonExistentWithFilter.xml 36_singleXPathSingleSelectRefNameWithFilter.xml
wam 2002/08/01 02:28:13
Modified: testsuite/testsuite/junit/xmltestcases/DASL/functional/select/XPATH
37_singleXPathSingleSelectRefNameNonExistentWithFilter.xml
36_singleXPathSingleSelectRefNameWithFilter.xml
Log:
bugfix: xpath must be defined in SELECT and may be referenced in WHERE
Revision Changes Path
1.2 +87 -121 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/XPATH/37_singleXPathSingleSelectRefNameNonExistentWithFilter.xml
Index: 37_singleXPathSingleSelectRefNameNonExistentWithFilter.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/XPATH/37_singleXPathSingleSelectRefNameNonExistentWithFilter.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 37_singleXPathSingleSelectRefNameNonExistentWithFilter.xml 22 Jul 2002 13:12:10 -0000 1.1
+++ 37_singleXPathSingleSelectRefNameNonExistentWithFilter.xml 1 Aug 2002 09:28:13 -0000 1.2
@@ -1,82 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
<test>
- <specification>
-
- <abstract> Search for properties specified by an XPath query where another XPath exists.
+ <specification>
+ <abstract> Search for properties specified by an XPath query where another XPath exists.
Only one XPath query is defined. The 'refname' is used within the Select elements and defined within
the Where elements. The XPath in the Where elements contains a filter. However, the Xpath does not exist.
</abstract>
-
- <pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
-
- <description>
+ <pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
+ <description>
1) A resource is Put on to the Server.
2) A second resource is put to the server. This has a different attribute to the first.
3) A Search is performed to find the properties defined by the XPath.
4) The resource is deleted.
</description>
-
- <expectedResult></expectedResult>
-
- </specification>
-
-
- <step>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
-
- <body fileReference="../../../../contentDirectory/XPath.xm1">
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Mon, 12 Mar 2001 17:21:35 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
- <step>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test2.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
-
- <body fileReference="../../../../contentDirectory/XPath2.xm1">
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Mon, 12 Mar 2001 17:21:35 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
-
-
-
- <step>
- <request>
- <command varUsage ="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
- <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ <expectedResult/>
+ </specification>
+ <step>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../../contentDirectory/XPath.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Mon, 12 Mar 2001 17:21:35 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test2.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../../contentDirectory/XPath2.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Mon, 12 Mar 2001 17:21:35 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
+ <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<searchrequest xmlns:D="DAV:" xmlns:xsv="http://namespaces.softwareag.com/tamino/webdav">
<D:basicsearch>
<D:select>
<D:prop>
- <xsv:xpath refname="XPathTest"/>
+ <xsv:xpath name="XPathTest">ValidXML[@name = "valid"]/ValidXML2/nonexistent</xsv:xpath>
</D:prop>
</D:select>
<D:from>
@@ -85,63 +64,50 @@
</D:scope>
</D:from>
<D:where>
- <xsv:xpath name="XPathTest">ValidXML[@name = "valid"]/ValidXML2/nonexistent</xsv:xpath>
+ <xsv:xpath refname="XPathTest"/>
</D:where>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[
- ]]>
- </body>
- </response>
- </step>
-
-
- <cleanup>
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
-
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Wed, 14 Mar 2001 14:47:37 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test2.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
-
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Wed, 14 Mar 2001 14:47:37 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
- </cleanup>
-
-</test>
\ No newline at end of file
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[
+ ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Wed, 14 Mar 2001 14:47:37 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test2.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Wed, 14 Mar 2001 14:47:37 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
+</test>
1.2 +87 -121 jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/XPATH/36_singleXPathSingleSelectRefNameWithFilter.xml
Index: 36_singleXPathSingleSelectRefNameWithFilter.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/XPATH/36_singleXPathSingleSelectRefNameWithFilter.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 36_singleXPathSingleSelectRefNameWithFilter.xml 22 Jul 2002 13:12:10 -0000 1.1
+++ 36_singleXPathSingleSelectRefNameWithFilter.xml 1 Aug 2002 09:28:13 -0000 1.2
@@ -1,82 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
<test>
- <specification>
-
- <abstract> Search for properties specified by an XPath query where another XPath exists.
+ <specification>
+ <abstract> Search for properties specified by an XPath query where another XPath exists.
Only one XPath query is defined. The 'refname' is used within the Select elements and defined within
the Where elements. The XPath in the Where elements contains a filter.
</abstract>
-
- <pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
-
- <description>
+ <pre-Requisite>A collection has been created and defined in tprocessor.cmd.</pre-Requisite>
+ <description>
1) A resource is Put on to the Server.
2) A second resource is put to the server. This has a different attribute to the first.
3) A Search is performed to find the properties defined by the XPath.
4) The resource is deleted.
</description>
-
- <expectedResult></expectedResult>
-
- </specification>
-
-
- <step>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
-
- <body fileReference="../../../../contentDirectory/XPath.xm1">
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Mon, 12 Mar 2001 17:21:35 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
- <step>
- <request>
- <command varUsage ="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test2.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
-
- <body fileReference="../../../../contentDirectory/XPath2.xm1">
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 201 Created</command>
- <header>Date: Mon, 12 Mar 2001 17:21:35 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
-
-
-
- <step>
- <request>
- <command varUsage ="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
- <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ <expectedResult/>
+ </specification>
+ <step>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../../contentDirectory/XPath.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Mon, 12 Mar 2001 17:21:35 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="userNumber,globalVariableCollection,globalVariableServerName">PUT /%globalVariableServerName%/%globalVariableCollection%/test2.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ <body fileReference="../../../../contentDirectory/XPath2.xm1"/>
+ </request>
+ <response>
+ <command>HTTP/1.0 201 Created</command>
+ <header>Date: Mon, 12 Mar 2001 17:21:35 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableServerName">SEARCH /%globalVariableServerName% HTTP/1.1</command>
+ <body varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<searchrequest xmlns:D="DAV:" xmlns:xsv="http://namespaces.softwareag.com/tamino/webdav">
<D:basicsearch>
<D:select>
<D:prop>
- <xsv:xpath refname="XPathTest"/>
+ <xsv:xpath name="XPathTest">ValidXML[@name = "valid"]/ValidXML2</xsv:xpath>
</D:prop>
</D:select>
<D:from>
@@ -85,63 +64,50 @@
</D:scope>
</D:from>
<D:where>
- <xsv:xpath name="XPathTest">ValidXML[@name = "valid"]/ValidXML2</xsv:xpath>
+ <xsv:xpath refname="XPathTest"/>
</D:where>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[
- ]]>
- </body>
- </response>
- </step>
-
-
- <cleanup>
-
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
-
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Wed, 14 Mar 2001 14:47:37 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
- <step>
- <request>
- <command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test2.xml HTTP/1.1</command>
- <header>Accept-Language: en-us</header>
- <header>Destroy: NoUndelete</header>
- <header>Translate: f</header>
- <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
- <header>Connection: Keep-Alive</header>
- </request>
-
- <response>
- <command>HTTP/1.0 204 No Content</command>
- <header>Date: Wed, 14 Mar 2001 14:47:37 GMT+01:00</header>
- <header>Content-Language: en</header>
- <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
- </response>
- </step>
-
-
- </cleanup>
-
-</test>
\ No newline at end of file
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body varUsage="globalVariableCollection,globalVariableServerName"><![CDATA[
+ ]]></body>
+ </response>
+ </step>
+ <cleanup>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Wed, 14 Mar 2001 14:47:37 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ <step>
+ <request>
+ <command varUsage="globalVariableCollection,globalVariableServerName"> DELETE /%globalVariableServerName%/%globalVariableCollection%/test2.xml HTTP/1.1</command>
+ <header>Accept-Language: en-us</header>
+ <header>Destroy: NoUndelete</header>
+ <header>Translate: f</header>
+ <header>User-Agent: Microsoft Data Access Internet Publishing Provider DAV</header>
+ <header>Connection: Keep-Alive</header>
+ </request>
+ <response>
+ <command>HTTP/1.0 204 No Content</command>
+ <header>Date: Wed, 14 Mar 2001 14:47:37 GMT+01:00</header>
+ <header>Content-Language: en</header>
+ <header>Servlet-Engine: Tomcat Web Server/3.2 beta 4 (JSP 1.1; Servlet 2.2; Java 1.3.0; Windows NT 4.0 x86; java.vendor=Sun Microsystems Inc.)</header>
+ </response>
+ </step>
+ </cleanup>
+</test>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>