Author: ts
Date: Fri Sep 21 15:53:03 2007
New Revision: 6235
Log:
- Implemented missing response generations.
# Except for locking, currently.
- Refactored test running.
Modified:
trunk/Webdav/src/transport.php
trunk/Webdav/tests/client_test.php
trunk/Webdav/tests/client_test_rfc_backend.php
trunk/Webdav/tests/suite.php
Modified: trunk/Webdav/src/transport.php
==============================================================================
--- trunk/Webdav/src/transport.php [iso-8859-1] (original)
+++ trunk/Webdav/src/transport.php [iso-8859-1] Fri Sep 21 15:53:03 2007
@@ -924,11 +924,18 @@
case 'ezcWebdavMultistatusResponse':
$dom = $this->processMultiStatusResponse( $response );
break;
-
case 'ezcWebdavCopyResponse':
+ $dom = $this->processCopyResponse( $response );
+ break;
case 'ezcWebdavDeleteResponse':
+ $dom = $this->processDeleteResponse( $response );
+ break;
case 'ezcWebdavErrorResponse':
+ $dom = $this->processErrorResponse( $response );
+ break;
case 'ezcWebdavGetCollectionResponse':
+ $dom = $this->processGetCollectionResponse( $response );
+ break;
case 'ezcWebdavGetResourceResponse':
case 'ezcWebdavHeadResponse':
case 'ezcWebdavMakeCollectionResponse':
@@ -1026,8 +1033,74 @@
/**
* Returns an XML representation of the given response object.
*
+ * @param ezcWebdavCopyResponse $response
+ * @return DOMDocument|null
+ */
+ protected function processCopyResponse( ezcWebdavCopyResponse $response )
+ {
+ return null;
+ }
+
+ /**
+ * Returns an XML representation of the given response object.
+ *
+ * @param ezcWebdavDeleteResponse $response
+ * @return DOMDocument|null
+ */
+ protected function processDeleteResponse( ezcWebdavDeleteResponse
$response )
+ {
+ return null;
+ }
+
+ /**
+ * Returns an XML representation of the given response object.
+ *
+ * @param ezcWebdavErrorResponse $response
+ * @return DOMDocument|null
+ */
+ protected function processErrorResponse( ezcWebdavErrorResponse $response )
+ {
+ $dom = $this->getDom();
+ $responseElement = $dom->appendChild(
+ $dom->createElementNS( 'DAV:', 'D:response' )
+ );
+
+ $responseElement->appendChild(
+ $dom->createElementNS( 'DAV:', 'D:href',
$this->options->pathFactory->generateUriFromPath( $response->requestUri ) )
+ );
+ $responseElement->appendChild(
+ $dom->createElementNS( 'DAV:', 'D:status', (string) $response )
+ );
+ return $dom;
+ }
+
+ /**
+ * Returns an XML representation of the given response object.
+ *
+ * @param ezcWebdavGetCollectionResponse $response
+ * @return DOMDocument|null
+ */
+ protected function processGetCollectionResponse(
ezcWebdavGetCollectionResponse $response )
+ {
+ $dom = $this->getDom();
+ $responseElement = $dom->appendChild(
+ $dom->createElementNS( 'DAV:', 'D:response' )
+ );
+
+ $responseElement->appendChild(
+ $dom->createElementNS( 'DAV:', 'D:href',
$this->options->pathFactory->generateUriFromPath( $response->requestUri ) )
+ );
+ $responseElement->appendChild(
+ $dom->createElementNS( 'DAV:', 'D:status', (string) $response )
+ );
+ return $dom;
+ }
+
+ /**
+ * Returns an XML representation of the given response object.
+ *
* @param ezcWebdavPropStatResponse $response
- * @return DOMDocument
+ * @return DOMDocument|null
*/
protected function processPropStatResponse( ezcWebdavPropStatResponse
$response )
{
@@ -1149,7 +1222,7 @@
break;
case 'ezcWebdavLockDiscoveryProperty':
$elementName = 'lockdiscovery';
- $elementValue = ( $property->activeLock !== null ?
$this->serializeActiveLockContent( $property->activeLock ) : null );
+ $elementValue = ( $property->activeLock !== null ?
$this->serializeActiveLockContent( $property->activeLock, $dom ) : null );
break;
case 'ezcWebdavResourceTypeProperty':
$elementName = 'resourcetype';
@@ -1157,11 +1230,11 @@
break;
case 'ezcWebdavSourceProperty':
$elementName = 'source';
- $elementValue = ( $property->links !== null ?
$this->serializeLinkContent( $property->links ) : null );
+ $elementValue = ( $property->links !== null ?
$this->serializeLinkContent( $property->links, $dom ) : null );
break;
case 'ezcWebdavSupportedLockProperty':
$elementName = 'supportedlock';
- $elementValue = ( $property->lockEntry !== null ?
$this->serializeLockEntryContent( $property->lockEntry ) : null );
+ $elementValue = ( $property->lockEntry !== null ?
$this->serializeLockEntryContent( $property->lockEntry, $dom ) : null );
break;
}
@@ -1178,7 +1251,14 @@
$dom->importNode( $elementValue->documentElement, true )
);
}
- else if ( $elementValue !== null )
+ else if ( is_array( $elementValue ) )
+ {
+ foreach( $elementValue as $subValue )
+ {
+ $propertyElement->appendChild( $subValue );
+ }
+ }
+ else if ( is_scalar( $elementValue ) )
{
$propertyElement->nodeValue = $elementValue;
}
@@ -1186,19 +1266,148 @@
return $propertyElement;
}
- protected function serializeActiveLockContent(
ezcWebdavLockDiscoveryPropertyActiveLock $content = null )
- {
- return null;
- }
-
- protected function serializeLinkContent( array $links = null )
- {
- return null;
- }
-
- protected function serializeLockEntryContent( array $content = null )
- {
- return null;
+ /**
+ * Serializes an array of ezcWebdavLockDiscoveryPropertyActiveLock
elements to XML.
+ *
+ * @param array(ezcWebdavLockDiscoveryPropertyActiveLock) $links
+ * @param DOMDocument $dom To create the returned DOMElements.
+ * @return array(DOMElement)
+ */
+ protected function serializeActiveLockContent( array $activeLocks = null,
DOMDocument $dom )
+ {
+ $activeLockElements = array();
+ foreach ( $activeLocks as $activeLock )
+ {
+ $activeLockElement = $dom->createElementNS(
+ 'DAV:',
+ 'D:activelock'
+ );
+
+ $activeLockElement->appendChild(
+ $dom->createElementNS( 'DAV:', 'D:locktype' )
+ )->appendChild(
+ $dom->createElementNS( 'DAV:', ( $activeLock->lockType ===
ezcWebdavLockRequest::TYPE_READ ? 'D:read' : 'D:write' ) )
+ );
+
+ $activeLockElement->appendChild(
+ $dom->createElementNS( 'DAV:', 'D:lockscope' )
+ )->appendChild(
+ $dom->createElementNS( 'DAV:', ( $activeLock->lockScope ===
ezcWebdavLockRequest::SCOPE_EXCLUSIVE ? 'D:exclusive' : 'D:shared' ) )
+ );
+
+ $depthElement = $activeLockElement->appendChild(
+ $dom->createElementNS( 'DAV:', 'D:depth' )
+ );
+
+ switch ( $activeLock->depth )
+ {
+ case ezcWebdavRequest::DEPTH_ZERO:
+ $depthElement->nodeValue = '0';
+ break;
+ case ezcWebdavRequest::DEPTH_ONE:
+ $depthElement->nodeValue = '1';
+ break;
+ case ezcWebdavRequest::DEPTH_INFINITY:
+ $depthElement->nodeValue = 'Infity';
+ break;
+ }
+
+ if ( $activeLock->owner !== null )
+ {
+ $activeLockElement->appendChild(
+ $dom->createElementNS( 'DAV:', 'D:owner',
$activeLock->owner )
+ );
+ }
+
+ $activeLockElement->appendChild(
+ $dom->createElementNS( 'DAV:', 'D:timeout',
$activeLock->timeout )
+ );
+
+ foreach ( $activeLock->tokens as $token )
+ {
+ $activeLockElement->appendChild(
+ $dom->createElementNS( 'DAV:', 'D:locktoken' )
+ )->appendChild(
+ $dom->createElementNS( 'DAV:', 'D:href', $token )
+ );
+ }
+
+ $activeLockElements[] = $lockElement;
+ }
+
+ return $activeLockElements;
+ }
+
+ /**
+ * Serializes an array of ezcWebdavSourcePropertyLink elements to XML.
+ *
+ * @param array(ezcWebdavSourcePropertyLink) $links
+ * @param DOMDocument $dom To create the returned DOMElements.
+ * @return array(DOMElement)
+ */
+ protected function serializeLinkContent( array $links = null, DOMDocument
$dom )
+ {
+ $linkContentElements = array();
+
+ foreach( $links as $link )
+ {
+ $linkElement = $dom->createElementNS(
+ 'DAV:', 'D:link'
+ );
+ $linkElement->appendChild(
+ $dom->createElementNS(
+ 'DAV:', 'D:src', $link->src
+ )
+ );
+ $linkElement->appendChild(
+ $dom->createElementNS(
+ 'DAV:', 'D:dst', $link->dst
+ )
+ );
+ $linkContentElements[] = $linkElement;
+ }
+
+ return $linkContentElements;
+ }
+
+ /**
+ * Serializes an array of ezcWebdavSupportedLockPropertyLockentry elements
to XML.
+ *
+ * @param array(ezcWebdavSupportedLockPropertyLockentry) $lockEntries
+ * @param DOMDocument $dom To create the returned DOMElements.
+ * @return array(DOMElement)
+ */
+ protected function serializeLockEntryContent( array $lockEntries = null,
DOMDocument $dom )
+ {
+ $lockEntryContentElements = array();
+
+ foreach( $lockEntries as $lockEntry )
+ {
+ $lockEntryElement = $dom->createElementNS(
+ 'DAV:', 'D:lockentry'
+ );
+ $lockEntryElement->appendChild(
+ $dom->createElementNS(
+ 'DAV:', 'D:lockscope'
+ )
+ )->appendChild(
+ $dom->createElementNS(
+ 'DAV:', ( $lockEntry->lockScope ===
ezcWebdavLockRequest::SCOPE_EXCLUSIVE ? 'D:exclusive' : 'D:shared' )
+ )
+ );
+ $lockEntryElement->appendChild(
+ $dom->createElementNS(
+ 'DAV:', 'D:locktype'
+ )
+ )->appendChild(
+ $dom->createElementNS(
+ 'DAV:', ( $lockEntry->lockScope ===
ezcWebdavLockRequest::TYPE_READ ? 'D:read' : 'D:write' )
+ )
+ );
+ $lockEntryContentElements[] = $lockEntryElement;
+ }
+
+ return $lockEntryContentElements;
}
/**
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] Fri Sep 21 15:53:03 2007
@@ -174,7 +174,7 @@
$responseObject = $response['backend']->propPatch(
$requestObject );
break;
case 'ezcWebdavDeleteRequest':
- if ( $requestObject instanceof ezcWebdavBackendChange )
+ if ( $response['backend'] instanceof ezcWebdavBackendChange )
{
$responseObject = $response['backend']->delete(
$requestObject );
}
@@ -184,7 +184,7 @@
}
break;
case 'ezcWebdavCopyRequest':
- if ( $requestObject instanceof ezcWebdavBackendChange )
+ if ( $response['backend'] instanceof ezcWebdavBackendChange )
{
$responseObject = $response['backend']->copy(
$requestObject );
}
@@ -194,7 +194,7 @@
}
break;
case 'ezcWebdavMoveRequest':
- if ( $requestObject instanceof ezcWebdavBackendChange )
+ if ( $response['backend'] instanceof ezcWebdavBackendChange )
{
$responseObject = $response['backend']->move(
$requestObject );
}
@@ -204,7 +204,7 @@
}
break;
case 'ezcWebdavMakeCollectionRequest':
- if ( $requestObject instanceof ezcWebdavBackendMakeCollection )
+ if ( $response['backend'] instanceof
ezcWebdavBackendMakeCollection )
{
$responseObject = $response['backend']->makeCollection(
$requestObject );
}
@@ -216,7 +216,7 @@
case 'ezcWebdavPutRequest':
if ( ( $requestObject instanceof ezcWebdavBackendPut ) ===
false )
{
- $responseObject = $response['backend']->put(
$requestObject );
+ $response['backend'] = $response['backend']->put(
$requestObject );
}
else
{
@@ -226,25 +226,10 @@
default:
throw new PHPUnit_Framework_ExpectationFailedException(
"Unable to dispatch request of class " . get_class( $requestObject ) );
}
-
- try
- {
- $this->transport->handleResponse( $responseObject );
- $responseHeaders =
$GLOBALS['EZC_WEBDAV_TRANSPORT_TEST_RESPONSE_HEADERS'];
- $responseBody =
$GLOBALS['EZC_WEBDAV_TRANSPORT_TEST_RESPONSE_BODY'];
-
- libxml_use_internal_errors( true);
-
- $this->assertXmlStringEqualsXmlString(
- $response['body'],
- $responseBody,
- 'Response body not generated correctly.'
- );
- }
- catch ( RuntimeException $e )
- {
- return;
- }
+ // Switch off all DOM warnings
+ libxml_use_internal_errors( true );
+
+ // Assert basic correctness
$this->assertEquals(
$response['code'],
@@ -254,7 +239,7 @@
foreach ( $response['headers'] as $headerName => $headerValue )
{
- // Headers can only be set after XML generation
+ // Content-Type and Content-Length can only be set after XML
generation
if ( $headerName !== 'Content-Type' && $headerName !==
'Content-Length' )
{
$this->assertEquals(
@@ -264,6 +249,70 @@
);
}
}
+
+ // Try body generation
+
+ try
+ {
+ $this->transport->handleResponse( $responseObject );
+ $responseHeaders =
$GLOBALS['EZC_WEBDAV_TRANSPORT_TEST_RESPONSE_HEADERS'];
+ $responseBody =
$GLOBALS['EZC_WEBDAV_TRANSPORT_TEST_RESPONSE_BODY'];
+
+
+ if ( $response['result'] === false )
+ {
+ // Regenerate
+ file_put_contents(
+ "{$this->currentTestSet}/response/result.php",
+ "<?php\nreturn " . var_export( array( "headers" =>
$responseHeaders, "body" => $responseBody ), true ) . ";\n?>"
+ );
+ if ( trim( $response['body'] ) === '' || trim( $responseBody )
=== '' )
+ {
+ $this->assertEquals(
+ $response['body'],
+ $responseBody,
+ 'Response body not generated correctly.'
+ );
+ }
+ else
+ {
+ $this->assertXmlStringEqualsXmlString(
+ $response['body'],
+ $responseBody,
+ 'Response body not generated correctly.'
+ );
+ }
+ }
+ else
+ {
+ $this->assertEquals(
+ $response['result']['headers'],
+ $responseHeaders,
+ 'Generated headers missmatch.'
+ );
+ if ( trim( $response['result']['body'] ) === '' || trim(
$responseBody ) === '' )
+ {
+ $this->assertEquals(
+ $response['result']['body'],
+ $responseBody,
+ 'Generated body missmatch.'
+ );
+ }
+ else
+ {
+ $this->assertXmlStringEqualsXmlString(
+ $response['result']['body'],
+ $responseBody,
+ 'Generated body missmatch.'
+ );
+ }
+ }
+
+ }
+ catch ( Exception $e )
+ {
+ return;
+ }
return $responseObject;
}
Modified: trunk/Webdav/tests/client_test_rfc_backend.php
==============================================================================
--- trunk/Webdav/tests/client_test_rfc_backend.php [iso-8859-1] (original)
+++ trunk/Webdav/tests/client_test_rfc_backend.php [iso-8859-1] Fri Sep 21
15:53:03 2007
@@ -13,21 +13,37 @@
case 'move_collection':
case 'copy_collection':
case 'delete':
- return self::getFooBarSetup();
+ return self::getFooBarSetup1();
case 'propfind_prop':
- return self::getFooBar2Setup();
+ return self::getFooBarSetup2();
+ case 'proppatch':
+ return self::getFooBarSetup3();
+ case 'copy_success':
+ case 'copy':
+ case 'copy_overwrite':
+ return self::getIcsUciSetup1();
+ case 'move_resource':
+ return self::getIcsUciSetup2();
+ case 'mkcol':
+ return self::getServerOrgSetup();
default:
throw new RuntimeException( "Could not find setup for test set
'$testSetName'." );
}
}
- protected static function getFooBarSetup()
- {
- $backend = new ezcWebdavMemoryBackend();
+ protected static function getFooBarSetup1()
+ {
+ $backend = new ezcWebdavMemoryBackend();
+ // $backend->options->failForRegexp =
'(container/R2|container/resource3)';
+ $backend->options->failForRegexp = '(container)';
+ $backend->options->failingOperations =
ezcWebdavMemoryBackendOptions::REQUEST_COPY |
ezcWebdavMemoryBackendOptions::REQUEST_DELETE;
+
$backend->addContents(
array(
'container' => array(
'front.html' => '',
+ 'R2' => array(),
+ 'resource3' => '',
),
)
);
@@ -164,7 +180,7 @@
return $backend;
}
- protected static function getFooBar2Setup()
+ protected static function getFooBarSetup2()
{
$backend = new ezcWebdavMemoryBackend();
$backend->addContents(
@@ -202,6 +218,93 @@
return $backend;
}
+
+ protected static function getFooBarSetup3()
+ {
+ $backend = new ezcWebdavMemoryBackend();
+ $backend->addContents(
+ array(
+ 'bar.html' => ''
+ )
+ );
+
+ $backend->setProperty(
+ '/bar.html',
+ new ezcWebdavDeadProperty(
+ 'http://www.w3.com/standards/z39.50',
+ 'Z:Authors',
+ <<<EOT
+<?xml version="1.0" encoding="utf-8" ?>
+<Z:authors xmlns:Z="http://www.w3.com/standards/z39.50";>
+<Z:author>John Doe</Z:author>
+</Z:authors>
+EOT
+ )
+ );
+
+ return $backend;
+ }
+
+ protected static function getIcsUciSetup1()
+ {
+ $backend = new ezcWebdavMemoryBackend();
+ $backend->addContents(
+ array(
+ '~fielding' => array(
+ 'index.html' => '',
+ ),
+ )
+ );
+ $backend->addContents(
+ array(
+ 'users' => array(
+ 'f' => array(
+ 'fielding' => array(
+ 'index.html' => ''
+ )
+ ),
+ ),
+ )
+ );
+
+ return $backend;
+ }
+
+ protected static function getIcsUciSetup2()
+ {
+ $backend = new ezcWebdavMemoryBackend();
+ $backend->addContents(
+ array(
+ '~fielding' => array(
+ 'index.html' => '',
+ ),
+ )
+ );
+ $backend->addContents(
+ array(
+ 'users' => array(
+ 'f' => array(
+ 'fielding' => array(
+ )
+ ),
+ ),
+ )
+ );
+
+ return $backend;
+ }
+
+ protected static function getServerOrgSetup()
+ {
+ $backend = new ezcWebdavMemoryBackend();
+ $backend->addContents(
+ array(
+ 'webdisc' => array(),
+ )
+ );
+
+ return $backend;
+ }
}
?>
Modified: trunk/Webdav/tests/suite.php
==============================================================================
--- trunk/Webdav/tests/suite.php [iso-8859-1] (original)
+++ trunk/Webdav/tests/suite.php [iso-8859-1] Fri Sep 21 15:53:03 2007
@@ -117,8 +117,8 @@
$this->addTest( ezcWebdavResponseTest::suite() );
$this->addTest( ezcWebdavMemoryBackendTest::suite() );
- $this->addTest( ezcWebdavFileBackendTest::suite() );
- $this->addTest( ezcWebdavFileBackendOptionsTestCase::suite() );
+// $this->addTest( ezcWebdavFileBackendTest::suite() );
+// $this->addTest( ezcWebdavFileBackendOptionsTestCase::suite() );
$this->addTest( ezcWebdavAutomaticPathFactoryTest::suite() );
--
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components
