Author: kn
Date: Wed Oct 17 15:10:05 2007
New Revision: 6492
Log:
- Use constructor parameter instead of option for faking live properties
# Refactored test cases accordingly
Modified:
trunk/Webdav/src/backends/memory.php
trunk/Webdav/src/options/backend_memory_options.php
trunk/Webdav/tests/backend_memory_test.php
trunk/Webdav/tests/client_test_continuous_setup.php
Modified: trunk/Webdav/src/backends/memory.php
==============================================================================
--- trunk/Webdav/src/backends/memory.php [iso-8859-1] (original)
+++ trunk/Webdav/src/backends/memory.php [iso-8859-1] Wed Oct 17 15:10:05 2007
@@ -77,14 +77,29 @@
protected $props = array();
/**
+ * Indicates wheather to fake live properties.
+ *
+ * @var bool
+ */
+ protected $fakeLiveProperties;
+
+ /**
* Construct backend from a given path.
*
* @param string $path
* @return void
*/
- public function __construct()
+ public function __construct( $fakeLiveProperties = true )
{
$this->options = new ezcWebdavMemoryBackendOptions();
+
+ $this->fakeLiveProperties = $fakeLiveProperties;
+
+ // Initialize properties for root
+ if ( $fakeLiveProperties )
+ {
+ $this->props['/'] = $this->initializeProperties( '/', true );
+ }
}
/**
@@ -150,7 +165,7 @@
*/
protected function initializeProperties( $name, $isCollection = false )
{
- if ( $this->options->fakeLiveProperties )
+ if ( $this->fakeLiveProperties )
{
$propertyStorage = new ezcWebdavBasicPropertyStorage();
Modified: trunk/Webdav/src/options/backend_memory_options.php
==============================================================================
--- trunk/Webdav/src/options/backend_memory_options.php [iso-8859-1] (original)
+++ trunk/Webdav/src/options/backend_memory_options.php [iso-8859-1] Wed Oct 17
15:10:05 2007
@@ -12,10 +12,6 @@
/**
* Class containing the options for the memory backend.
*
- * @property bool $fakeLiveProperties
- * Indicates weather memory backend should try to fake live
- * properties instead of just returning null if a property not has
- * been set.
* @property string $failForRegexp
* Let operation fail for all ressource paths mathing this regular
* expression. The exact handling of this option depends on the
@@ -54,7 +50,6 @@
*/
public function __construct( array $options = array() )
{
- $this->properties['fakeLiveProperties'] = false;
$this->properties['failForRegexp'] = null;
$this->properties['failingOperations'] = 0;
@@ -76,15 +71,6 @@
{
switch ( $name )
{
- case 'fakeLiveProperties':
- if ( !is_bool( $value ) )
- {
- throw new ezcBaseValueException( $name, $value, 'bool' );
- }
-
- $this->properties[$name] = $value;
- break;
-
case 'failForRegexp':
if ( !is_string( $value ) )
{
Modified: trunk/Webdav/tests/backend_memory_test.php
==============================================================================
--- trunk/Webdav/tests/backend_memory_test.php [iso-8859-1] (original)
+++ trunk/Webdav/tests/backend_memory_test.php [iso-8859-1] Wed Oct 17 15:10:05
2007
@@ -29,7 +29,7 @@
public function testEmptyMemoryServerCreation()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$content = $this->readAttribute( $backend, 'content' );
$this->assertEquals(
@@ -56,7 +56,7 @@
public function testFileListMemoryServerCreation()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'blubb' => 'Somme blubb blubbs.',
@@ -90,7 +90,7 @@
public function testCollectionMemoryServerCreation()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -128,8 +128,7 @@
public function testFakedLiveProperties()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
) );
@@ -165,17 +164,15 @@
$props = $this->readAttribute( $backend, 'props' );
$this->assertEquals(
- array(
- '/foo' => $propertyStorage,
- ),
- $props,
+ $propertyStorage,
+ $props['/foo'],
'Expected filled property array.'
);
}
public function testMemoryBackendOptionsInMemoryBackend()
{
- $server = new ezcWebdavMemoryBackend();
+ $server = new ezcWebdavMemoryBackend( false );
$this->assertEquals(
$server->options,
@@ -184,8 +181,8 @@
);
$this->assertSame(
- false,
- $server->options->fakeLiveProperties,
+ 0,
+ $server->options->failingOperations,
'Expected successfull access on option.'
);
@@ -204,22 +201,22 @@
public function testMemoryBackendOptionsSetInMemoryBackend()
{
- $server = new ezcWebdavMemoryBackend();
+ $server = new ezcWebdavMemoryBackend( false );
$options = new ezcWebdavMemoryBackendOptions();
- $options->fakeLiveProperties = true;
+ $options->failingOperations = 1;
$this->assertSame(
- false,
- $server->options->fakeLiveProperties,
+ 0,
+ $server->options->failingOperations,
'Wrong initial value before changed option class.'
);
$server->options = $options;
$this->assertSame(
- true,
- $server->options->fakeLiveProperties,
+ 1,
+ $server->options->failingOperations,
'Expected modified value, because of changed option class.'
);
@@ -237,8 +234,7 @@
public function testSettingProperty()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
) );
@@ -282,18 +278,15 @@
$props = $this->readAttribute( $backend, 'props' );
$this->assertEquals(
- array(
- '/foo' => $propertyStorage,
- ),
- $props,
+ $propertyStorage,
+ $props['/foo'],
'Expected filled property array.'
);
}
public function testSettingPropertyOnUnknownRessource()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
) );
@@ -309,7 +302,7 @@
public function testResourceHead()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -336,7 +329,7 @@
public function testCollectionHead()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -363,7 +356,7 @@
public function testResourceHeadError()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -389,7 +382,7 @@
public function testResourceGet()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -416,7 +409,7 @@
public function testResourceGetError()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -442,8 +435,7 @@
public function testResourceGetWithProperties()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -501,7 +493,7 @@
public function testCollectionGet()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -538,7 +530,7 @@
public function testResourceDeepGet()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -570,7 +562,7 @@
public function testResourceCopy()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -595,7 +587,7 @@
public function testResourceCopyError()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -621,7 +613,7 @@
public function testResourceCopyF()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -647,7 +639,7 @@
public function testResourceCopyOverwrite()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -672,7 +664,7 @@
public function testResourceCopyOverwriteFailed()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -699,7 +691,7 @@
public function testResourceCopyDestinationNotExisting()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -725,7 +717,7 @@
public function testResourceCopySourceEqualsDest()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -751,7 +743,7 @@
public function testResourceCopyDepthZero()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'bar' => array(
'_1' => 'contents',
@@ -795,7 +787,7 @@
public function testResourceCopyDepthInfinity()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'bar' => array(
'_1' => 'contents',
@@ -844,7 +836,7 @@
public function testResourceCopyDepthInfinityErrors()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'bar' => array(
'_1' => 'contents',
@@ -914,7 +906,7 @@
public function testResourceMove()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -939,7 +931,7 @@
public function testResourceMoveError()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -965,7 +957,7 @@
public function testResourceMoveF()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -991,7 +983,7 @@
public function testResourceMoveOverwrite()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1016,7 +1008,7 @@
public function testResourceMoveOverwriteFailed()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1043,7 +1035,7 @@
public function testResourceMoveDestinationNotExisting()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1069,7 +1061,7 @@
public function testResourceMoveSourceEqualsDest()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1095,7 +1087,7 @@
public function testResourceMoveDepthInfinity()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'bar' => array(
'_1' => 'contents',
@@ -1137,7 +1129,7 @@
public function testResourceMoveDepthInfinityErrors()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'bar' => array(
'_1' => 'contents',
@@ -1207,7 +1199,7 @@
public function testResourceDelete()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1246,7 +1238,7 @@
public function testCollectionDelete()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1282,7 +1274,7 @@
public function testResourceDeleteError404()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1308,7 +1300,7 @@
public function testResourceDeleteCausedError()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1357,7 +1349,7 @@
public function testMakeCollectionOnExistingCollection()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1383,7 +1375,7 @@
public function testMakeCollectionOnExistingRessource()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1409,7 +1401,7 @@
public function testMakeCollectionMissingParent()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1435,7 +1427,7 @@
public function testMakeCollectionInRessource()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1461,7 +1453,7 @@
public function testMakeCollectionWithRequestBody()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1487,7 +1479,7 @@
public function testMakeCollection()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1530,7 +1522,7 @@
public function testPutOnExistingCollection()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1558,7 +1550,7 @@
public function testPutMissingParent()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1586,7 +1578,7 @@
public function testPutInRessource()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1614,7 +1606,7 @@
public function testPut()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1659,7 +1651,7 @@
public function testPutOnExistingRessource()
{
- $backend = new ezcWebdavMemoryBackend();
+ $backend = new ezcWebdavMemoryBackend( false );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1702,8 +1694,7 @@
public function testPropFindOnResource()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1765,8 +1756,7 @@
public function testPropFindOnCollection()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1855,8 +1845,7 @@
public function testPropFindNamesOnResource()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1917,8 +1906,7 @@
public function testPropFindNamesOnCollection()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -1987,8 +1975,7 @@
public function testPropFindNamesOnCollectionDepthZero()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -2055,8 +2042,7 @@
public function testPropFindNamesOnCollectionDepthOne()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -2139,8 +2125,7 @@
public function testPropFindNamesOnCollectionDepthInfinite()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -2239,8 +2224,7 @@
public function testPropFindAllPropsOnResource()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -2303,8 +2287,7 @@
public function testPropFindAllPropsOnCollection()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -2403,8 +2386,7 @@
public function testPropPatchAddProperty()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -2465,8 +2447,7 @@
public function testPropPatchAddPropertyFail()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->options->failingOperations =
ezcWebdavMemoryBackendOptions::REQUEST_PROPPATCH;
$backend->addContents( array(
'foo' => 'bar',
@@ -2558,8 +2539,7 @@
public function testPropPatchRemoveProperty()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -2649,8 +2629,7 @@
public function testPropPatchFailOnRemoveProperty()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -2775,8 +2754,7 @@
public function testPropPatchCombinedSetDelete()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -2876,8 +2854,7 @@
public function testPropPatchCombinedSetDeleteFail()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
@@ -2962,8 +2939,7 @@
public function testPropPatchCombinedSetDeleteValidationError()
{
- $backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
+ $backend = new ezcWebdavMemoryBackend( true );
$backend->addContents( array(
'foo' => 'bar',
'bar' => array(
Modified: trunk/Webdav/tests/client_test_continuous_setup.php
==============================================================================
--- trunk/Webdav/tests/client_test_continuous_setup.php [iso-8859-1] (original)
+++ trunk/Webdav/tests/client_test_continuous_setup.php [iso-8859-1] Wed Oct 17
15:10:05 2007
@@ -26,7 +26,6 @@
protected static function setupBackend()
{
$backend = new ezcWebdavMemoryBackend();
- $backend->options->fakeLiveProperties = true;
$backend->addContents(
array(
'test_collection' => array(
--
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components
