Author: kn
Date: Tue Sep 18 17:36:14 2007
New Revision: 6190

Log:
- Updated cadaver test cases for updated property storage
- Use plain XML files for body content

Added:
    trunk/Webdav/tests/clients/cadaver/propfind.body.xml
      - copied, changed from r6182, 
trunk/Webdav/tests/clients/cadaver/propfind.body.php
    trunk/Webdav/tests/clients/cadaver/propfind_extended.body.xml
      - copied, changed from r6182, 
trunk/Webdav/tests/clients/cadaver/propfind_extended.body.php
Removed:
    trunk/Webdav/tests/clients/cadaver/propfind.body.php
    trunk/Webdav/tests/clients/cadaver/propfind_extended.body.php
Modified:
    trunk/Webdav/tests/client_test.php
    trunk/Webdav/tests/clients/cadaver/propfind.result.txt
    trunk/Webdav/tests/clients/cadaver/propfind_extended.result.txt

Modified: trunk/Webdav/tests/client_test.php
==============================================================================
--- trunk/Webdav/tests/client_test.php [iso-8859-1] (original)
+++ trunk/Webdav/tests/client_test.php [iso-8859-1] Tue Sep 18 17:36:14 2007
@@ -62,9 +62,9 @@
         }
 
         // Optionally set a body.
-        if ( file_exists( ($bodyFile = $this->currentTestSet . '.body.php' ) ) 
)
+        if ( file_exists( ($bodyFile = $this->currentTestSet . '.body.xml' ) ) 
)
         {
-            $GLOBALS['EZC_WEBDAV_TRANSPORT_TEST_BODY'] = require $bodyFile;
+            $GLOBALS['EZC_WEBDAV_TRANSPORT_TEST_BODY'] = file_get_contents( 
$bodyFile );
         }
         else
         {

Copied: trunk/Webdav/tests/clients/cadaver/propfind.body.xml (from r6182, 
trunk/Webdav/tests/clients/cadaver/propfind.body.php)
==============================================================================
--- trunk/Webdav/tests/clients/cadaver/propfind.body.php [iso-8859-1] (original)
+++ trunk/Webdav/tests/clients/cadaver/propfind.body.xml [iso-8859-1] Tue Sep 
18 17:36:14 2007
@@ -1,6 +1,3 @@
-<?php
-
-return <<<EOT
 <?xml version="1.0" encoding="utf-8"?>
 <propfind xmlns="DAV:"><prop>
 <getcontentlength xmlns="DAV:"/>
@@ -10,6 +7,3 @@
 <checked-in xmlns="DAV:"/>
 <checked-out xmlns="DAV:"/>
 </prop></propfind>
-EOT;
-
-?>

Modified: trunk/Webdav/tests/clients/cadaver/propfind.result.txt
==============================================================================
Binary files - no diff available.

Copied: trunk/Webdav/tests/clients/cadaver/propfind_extended.body.xml (from 
r6182, trunk/Webdav/tests/clients/cadaver/propfind_extended.body.php)
==============================================================================
--- trunk/Webdav/tests/clients/cadaver/propfind_extended.body.php [iso-8859-1] 
(original)
+++ trunk/Webdav/tests/clients/cadaver/propfind_extended.body.xml [iso-8859-1] 
Tue Sep 18 17:36:14 2007
@@ -1,6 +1,3 @@
-<?php
-
-return <<<EOT
 <?xml version="1.0" encoding="utf-8"?>
 <propfind xmlns="DAV:"><prop>
 <getcontentlength xmlns="DAV:"/>
@@ -18,6 +15,3 @@
 <source xmlns="DAV:" />
 <supportedlock xmlns="DAV:" />
 </prop></propfind>
-EOT;
-
-?>

Modified: trunk/Webdav/tests/clients/cadaver/propfind_extended.result.txt
==============================================================================
Binary files - no diff available.


-- 
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components

Reply via email to