wam 2002/08/01 00:31:38
Modified: testsuite/testsuite/junit/xmltestcases/DASL/functional/select/XPATH
2_singleXPathDifferentXPath.xml
Log:
do not use // at the begin of an xpath query
Revision Changes Path
1.2 +56 -78
jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/XPATH/2_singleXPathDifferentXPath.xml
Index: 2_singleXPathDifferentXPath.xml
===================================================================
RCS file:
/home/cvs/jakarta-slide/testsuite/testsuite/junit/xmltestcases/DASL/functional/select/XPATH/2_singleXPathDifferentXPath.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 2_singleXPathDifferentXPath.xml 22 Jul 2002 13:12:10 -0000 1.1
+++ 2_singleXPathDifferentXPath.xml 1 Aug 2002 07:31:38 -0000 1.2
@@ -1,56 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE test SYSTEM "../../../../../Tprocessor.dtd">
-
<test>
- <specification>
-
- <abstract> Search for properties specified by an XPath query.
+ <specification>
+ <abstract> Search for properties specified by an XPath query.
Only one XPath query is defined.
</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 Search is performed to find the properties defined by the XPath.
3) The resource is deleted.
</description>
-
- <expectedResult>XPath evaluated correctly and requested properties
returned.</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 ="globalVariableServerName">SEARCH
/%globalVariableServerName% HTTP/1.1</command>
- <body
varUsage="globalVariableServerName,globalVariableCollection"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ <expectedResult>XPath evaluated correctly and requested properties
returned.</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="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 name="XPathTest">//ValidXML3</xsv:xpath>
+
<xsv:xpath name="XPathTest">/ValidXML//ValidXML3</xsv:xpath>
</D:prop>
</D:select>
<D:from>
@@ -60,22 +47,20 @@
</D:from>
</D:basicsearch>
</searchrequest>
- ]]>
- </body>
- </request>
-
- <response>
- <command>HTTP/1.0 207 Multi-Status</command>
- <body
varUsage="globalVariableCollection,globalVariableServerName,testresourcecontentlength"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
+ ]]></body>
+ </request>
+ <response>
+ <command>HTTP/1.0 207 Multi-Status</command>
+ <body
varUsage="globalVariableCollection,globalVariableServerName,testresourcecontentlength"><![CDATA[<?xml
version="1.0" encoding="UTF-8"?>
<D:multistatus xmlns:D="DAV:">
<D:response>
<D:href>/%globalVariableServerName%/%globalVariableCollection%/test.xml</D:href>
<D:propstat>
<D:prop>
<xsv:XPathTest
xmlns:xsv="http://namespaces.softwareag.com/tamino/webdav";>
- <xql:xql
xmlns:xql="http://metalab.unc.edu/xql/";>//ValidXML3/ValidXML3Nested</xql:xql>
+ <xql:xql
xmlns:xql="http://metalab.unc.edu/xql/";>/ValidXML//ValidXML3</xql:xql>
<xql:result xmlns:xql="http://metalab.unc.edu/xql/";>
-
<ValidXML3 xmlns:ino="http://namespaces.softwareag.com/tamino/response2";
ino:id="*"><ValidXML3Nested>This</ValidXML3Nested></ValidXML3>
+
<ValidXML3 xmlns:ino="http://namespaces.softwareag.com/tamino/response2";
ino:id="*"><ValidXML3Nested>Is</ValidXML3Nested></ValidXML3>
</xql:result>
</xsv:XPathTest>
</D:prop>
@@ -83,32 +68,25 @@
</D:propstat>
</D:response>
</D:multistatus>
- ]]>
- </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>
- </cleanup>
-
-</test>
\ No newline at end of file
+ ]]></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>
+ </cleanup>
+</test>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
