Author: dr
Date: Fri Jul 27 16:55:00 2007
New Revision: 5750
Log:
- Added test cases for ezcTreeNode, ezcTreeNodeList and
ezcTreeNodeListIterator.
- Added initial implementation of in-memory tree backend and data store.
Added:
trunk/Tree/src/backends/memory.php (with props)
trunk/Tree/src/exceptions/ids_do_not_match.php (with props)
trunk/Tree/src/exceptions/invalid_class.php (with props)
trunk/Tree/src/stores/memory.php (with props)
trunk/Tree/src/structs/memory_node.php (with props)
trunk/Tree/tests/files/test_classes.php (with props)
trunk/Tree/tests/memory_tree.php (with props)
trunk/Tree/tests/tree_node.php (with props)
trunk/Tree/tests/tree_node_list.php (with props)
trunk/Tree/tests/tree_node_list_iterator.php (with props)
Modified:
trunk/Tree/design/class_diagram.png
trunk/Tree/src/backends/xml.php
trunk/Tree/src/tree.php
trunk/Tree/src/tree_autoload.php
trunk/Tree/src/tree_node_list.php
trunk/Tree/src/tree_node_list_iterator.php
trunk/Tree/tests/suite.php
trunk/Tree/tests/tree.php
Modified: trunk/Tree/design/class_diagram.png
==============================================================================
Binary files - no diff available.
Added: trunk/Tree/src/backends/memory.php
==============================================================================
--- trunk/Tree/src/backends/memory.php (added)
+++ trunk/Tree/src/backends/memory.php [iso-8859-1] Fri Jul 27 16:55:00 2007
@@ -1,0 +1,269 @@
+<?php
+/**
+ * @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved.
+ * @license http://ez.no/licenses/new_bsd New BSD License
+ * @version //autogentag//
+ * @filesource
+ * @package Tree
+ */
+
+/**
+ * ezcTreeMemory is an implementation of a tree backend that operates on
+ * an in-memory tree structure.
+ *
+ * @property-read ezcTreeXmlDataStore $store
+ *
+ * @package Tree
+ * @version //autogentag//
+ * @mainclass
+ */
+class ezcTreeMemory extends ezcTree implements ezcTreeBackend
+{
+ /**
+ * Contains a list of all nodes, indexed by node ID that link directly to
the create node so that they can be looked up quickly.
+ *
+ * @var array(string=>ezcTreeMemoryNode)
+ */
+ private $nodeList = array();
+
+ /**
+ * Contains the root node.
+ *
+ * @var ezcTreeMemoryNode
+ */
+ private $rootNode;
+
+ /**
+ * Constructs a new ezcTreeMemory object
+ */
+ protected function __construct( ezcTreeMemoryDataStore $store )
+ {
+ $this->properties['store'] = $store;
+ }
+
+ public static function create( ezcTreeMemoryDataStore $store )
+ {
+ $newTree = new ezcTreeMemory( $store );
+ $newTree->nodeList = null;
+ $newTree->rootNode = null;
+ return $newTree;
+ }
+
+ public function nodeExists( $id )
+ {
+ return isset( $this->nodeList[$id] );
+ }
+
+ private function getNodeById( $id )
+ {
+ if ( !$this->nodeExists($id) )
+ {
+ throw new ezcTreeInvalidIdException( $id );
+ }
+ return $this->nodeList[$id];
+ }
+
+ public function fetchChildren( $id )
+ {
+ $className = $this->properties['nodeClassName'];
+ $treeNode = $this->getNodeById( $id );
+ $list = new ezcTreeNodeList;
+ foreach ( $treeNode->children as $id => $child )
+ {
+ $list->addNode( $child->node );
+ }
+ return $list;
+ }
+
+ public function fetchPath( $id )
+ {
+ $className = $this->properties['nodeClassName'];
+ $list = new ezcTreeNodeList;
+ $list->addNode( new $className( $this, $id ) );
+
+ $memoryNode = $this->getNodeById( $id );
+ $memoryNode = $memoryNode->parent;
+
+ while ( $memoryNode !== null )
+ {
+ $id = $memoryNode->node->id;
+ $list->addNode( new $className( $this, $id ) );
+ $memoryNode = $memoryNode->parent;
+ }
+ return $list;
+ }
+
+ private function addChildNodes( $list, $nodeId )
+ {
+ $className = $this->properties['nodeClassName'];
+ $memoryNode = $this->getNodeById( $id );
+
+ foreach ( $memoryNode->children as $id => $childMemoryNode )
+ {
+ $list->addNode( new $className( $this, $id ) );
+ $this->addChildNodes( $list, $record['id'] );
+ }
+ }
+
+ public function fetchSubtree( $nodeId )
+ {
+ return $this->fetchSubtreeDepthFirst( $nodeId );
+ }
+
+ public function fetchSubtreeBreadthFirst( $nodeId )
+ {
+ }
+
+ public function fetchSubtreeDepthFirst( $nodeId )
+ {
+ $className = $this->properties['nodeClassName'];
+ $list = new ezcTreeNodeList;
+ $list->addNode( new $className( $this, $nodeId ) );
+ $this->addChildNodes( $list, $nodeId );
+ return $list;
+ }
+
+ public function fetchSubtreeTopological( $nodeId )
+ {
+ }
+
+
+
+ public function getChildCount( $id )
+ {
+ return count( $this->getNodeById( $id )->children );
+ }
+
+ private function countChildNodes( &$count, $nodeId )
+ {
+ $count += $this->getChildCount( $nodeId );
+ }
+
+ public function getChildCountRecursive( $id )
+ {
+ $count = 0;
+ $this->countChildNodes( $count, $id );
+ return $count;
+ }
+
+ public function getPathLength( $id )
+ {
+ /*
+ $elem = $this->getNodeById( $id );
+ $elem = $elem->parentNode;
+ $length = -1;
+
+ while ( $elem !== null && $elem->nodeType == XML_ELEMENT_NODE )
+ {
+ $elem = $elem->parentNode;
+ $length++;
+ }
+ return $length;
+ */
+ }
+
+ public function hasChildNodes( $id )
+ {
+ return count( $this->getNodeById( $id )->children ) > 0;
+ }
+
+ public function isChildOf( $childId, $parentId )
+ {
+ $childNode = $this->getNodeById( $childId );
+ $parentNode = $this->getNodeById( $parentId );
+
+ if ( $childNode->parent->node === $parentNode->node )
+ {
+ return true;
+ }
+ return false;
+ }
+
+ public function isDecendantOf( $childId, $parentId )
+ {
+ /*
+ $elem = $this->getNodeById( $childId );
+ $elem = $elem->parentNode;
+
+ while ( $elem !== null && $elem->nodeType == XML_ELEMENT_NODE )
+ {
+ $id = $elem->getAttribute( 'id' );
+ if ( $id === "id$parentId" )
+ {
+ return true;
+ }
+ $elem = $elem->parentNode;
+ }
+ return false;
+ */
+ }
+
+ public function isSiblingOf( $child1Id, $child2Id )
+ {
+ $elem1 = $this->getNodeById( $child1Id );
+ $elem2 = $this->getNodeById( $child2Id );
+ return (
+ ( $child1Id !== $child2Id ) &&
+ ( $elem1->parent === $elem2->parent )
+ );
+ }
+
+ public function setRootNode( ezcTreeNode $node )
+ {
+ // wipe nodelist
+ $this->nodeList = array();
+
+ // replace root node
+ $newObj = new ezcTreeMemoryNode( $node, array() );
+ $this->rootNode = $newObj;
+
+ // Add to node list
+ $this->nodeList[$node->id] = $newObj;
+ }
+
+ public function addChild( $parentId, ezcTreeNode $childNode )
+ {
+ // locate parent node
+ $parentMemoryNode = $this->getNodeById( $parentId );
+
+ // Create new node
+ $newObj = new ezcTreeMemoryNode( $childNode, array(),
$parentMemoryNode );
+
+ // Append to parent node
+ $parentMemoryNode->children[$childNode->id] = $newObj;
+
+ // Add to node list
+ $this->nodeList[$childNode->id] = $newObj;
+ }
+
+ public function delete( $id )
+ {
+ // locate node to move
+ $nodeToDelete = $this->getNodeById( $id );
+
+ // Use the parent to remove the child
+ unset( $nodeToDelete->parent->children[$id] );
+
+ // Remove from node list
+ unset( $this->nodeList[$childNode->id] );
+ }
+
+ public function move( $id, $targetParentId )
+ {
+ // locate node to move
+ $nodeToMove = $this->getNodeById( $id );
+
+ // locate new parent
+ $newParent = $this->getNodeById( $targetParentId );
+
+ // new placement for node
+ $newParent->children[$id] = $nodeToMove;
+
+ // remove old location from previous parent
+ unset( $nodeToMode->parent->children[$id] );
+
+ // update parent attribute of the node
+ $nodeToMode->parent = $newParent;
+ }
+}
+?>
Propchange: trunk/Tree/src/backends/memory.php
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/Tree/src/backends/xml.php
==============================================================================
--- trunk/Tree/src/backends/xml.php [iso-8859-1] (original)
+++ trunk/Tree/src/backends/xml.php [iso-8859-1] Fri Jul 27 16:55:00 2007
@@ -54,7 +54,6 @@
*/
public function __construct( $xmlFile, ezcTreeXmlDataStore $store )
{
- parent::__construct();
$dom = new DomDocument();
$dom->load( $xmlFile );
$dom->relaxNGValidateSource( self::relaxNG );
Added: trunk/Tree/src/exceptions/ids_do_not_match.php
==============================================================================
--- trunk/Tree/src/exceptions/ids_do_not_match.php (added)
+++ trunk/Tree/src/exceptions/ids_do_not_match.php [iso-8859-1] Fri Jul 27
16:55:00 2007
@@ -1,0 +1,32 @@
+<?php
+/**
+ * File containing the ezcTreeInvalidIdException class
+ *
+ * @package Tree
+ * @version //autogen//
+ * @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved.
+ * @license http://ez.no/licenses/new_bsd New BSD License
+ */
+
+/**
+ * Exception that is thrown when a node is added through the ArrayAccess
+ * interface with a key that is different from the node's ID.
+ *
+ * @package Tree
+ * @version //autogen//
+ */
+class ezcTreeIdsDoNotMatchException extends ezcTreeException
+{
+ /**
+ * Constructs a new ezcTreeIdsDoNotMatchException
+ *
+ * @param string $expectedId
+ * @param string $actualId
+ * @return void
+ */
+ function __construct( $expectedId, $actualId )
+ {
+ parent::__construct( "You can add the node with node ID '$expectedId'
to the list with key '$actualId'. The key needs to match the node ID." );
+ }
+}
+?>
Propchange: trunk/Tree/src/exceptions/ids_do_not_match.php
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/Tree/src/exceptions/invalid_class.php
==============================================================================
--- trunk/Tree/src/exceptions/invalid_class.php (added)
+++ trunk/Tree/src/exceptions/invalid_class.php [iso-8859-1] Fri Jul 27
16:55:00 2007
@@ -1,0 +1,31 @@
+<?php
+/**
+ * File containing the ezcTreeInvalidIdException class
+ *
+ * @package Tree
+ * @version //autogen//
+ * @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved.
+ * @license http://ez.no/licenses/new_bsd New BSD License
+ */
+
+/**
+ * Exception that is thrown when a wrong class is used.
+ *
+ * @package Tree
+ * @version //autogen//
+ */
+class ezcTreeInvalidClassException extends ezcTreeException
+{
+ /**
+ * Constructs a new ezcTreeInvalidClassException
+ *
+ * @param string $expected
+ * @param string $actual
+ * @return void
+ */
+ function __construct( $expected, $actual )
+ {
+ parent::__construct( "An object of class '$expected' is used, but an
object of class '$actual' is expected." );
+ }
+}
+?>
Propchange: trunk/Tree/src/exceptions/invalid_class.php
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/Tree/src/stores/memory.php
==============================================================================
--- trunk/Tree/src/stores/memory.php (added)
+++ trunk/Tree/src/stores/memory.php [iso-8859-1] Fri Jul 27 16:55:00 2007
@@ -1,0 +1,51 @@
+<?php
+/**
+ * @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved.
+ * @license http://ez.no/licenses/new_bsd New BSD License
+ * @version //autogentag//
+ * @filesource
+ * @package Tree
+ */
+
+/**
+ * ezcTreeMemoryDataStore implements storing of node data as part of the node
+ * itself.
+ *
+ * @package Tree
+ * @version //autogentag//
+ */
+class ezcTreeMemoryDataStore implements ezcTreeDataStore
+{
+ /**
+ * Retrieves the data for the node $node from the data store and assigns it
+ * to the node's 'data' property.
+ *
+ * @param ezcTreeNode $node
+ */
+ public function fetchDataForNode( ezcTreeNode $node )
+ {
+ /* This is a no-op as the data is already in the $node */
+ }
+
+ /**
+ * Retrieves the data for all the nodes in the node list $nodeList and
+ * assigns this data to the nodes' 'data' properties.
+ *
+ * @param ezcTreeNodeList $nodeList
+ */
+ public function fetchDataForNodes( ezcTreeNodeList $nodeList )
+ {
+ /* This is a no-op as the data is already in the $node */
+ }
+
+ /**
+ * Stores the data in the node to the data store.
+ *
+ * @param ezcTreeNode $node
+ */
+ public function storeDataForNode( ezcTreeNode $node )
+ {
+ /* This is a no-op as the data is already in the $node */
+ }
+}
+?>
Propchange: trunk/Tree/src/stores/memory.php
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/Tree/src/structs/memory_node.php
==============================================================================
--- trunk/Tree/src/structs/memory_node.php (added)
+++ trunk/Tree/src/structs/memory_node.php [iso-8859-1] Fri Jul 27 16:55:00 2007
@@ -1,0 +1,53 @@
+<?php
+/**
+ * @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved.
+ * @license http://ez.no/licenses/new_bsd New BSD License
+ * @version //autogentag//
+ * @filesource
+ * @package Tree
+ */
+
+/**
+ * A container to store one memory tree node with meta data
+ *
+ * @package Tree
+ * @version //autogentag//
+ */
+class ezcTreeMemoryNode extends ezcBaseStruct
+{
+ /**
+ * The parent ezcTreeMemoryNode
+ *
+ * @var ezcTreeMemoryNode
+ */
+ public $parent;
+
+ /**
+ * The encapsulated ezcTreeNode
+ *
+ * @var ezcTreeNode
+ */
+ public $node;
+
+ /**
+ * Contains the children of this node
+ *
+ * @var array(string=>ezcTreeMemoryNode)
+ */
+ public $children;
+
+ /**
+ * Constructs an ezcTreeMemoryNode object.
+ *
+ * @param ezcTreeNode $node
+ * @param array(string=>ezcTreeMemoryNode) $children
+ * @param ezcTreeMemoryNode $parent
+ */
+ function __construct( ezcTreeNode $node, array $children,
ezcTreeMemoryNode $parent = null )
+ {
+ $this->node = $node;
+ $this->children = $children;
+ $this->parent = $parent;
+ }
+}
+?>
Propchange: trunk/Tree/src/structs/memory_node.php
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/Tree/src/tree.php
==============================================================================
--- trunk/Tree/src/tree.php [iso-8859-1] (original)
+++ trunk/Tree/src/tree.php [iso-8859-1] Fri Jul 27 16:55:00 2007
@@ -6,16 +6,14 @@
*
* @var array(string=>mixed)
*/
- protected $properties = array();
+ protected $properties = array( 'prefetch' => false, 'nodeClassName' =>
'ezcTreeNode' );
protected $inTransaction = false;
protected $inTransactionCommit = false;
private $transactionList = array();
- public function __construct()
+ protected function __construct()
{
- $this->properties['prefetch'] = false;
- $this->properties['nodeClassName'] = 'ezcTreeNode';
}
/**
@@ -60,29 +58,29 @@
throw new ezcBasePropertyPermissionException( $name,
ezcBasePropertyPermissionException::READ );
case 'nodeClassName':
- if ( !is_string( $propertyValue ) )
+ if ( !is_string( $value ) )
{
- throw new ezcBaseValueException( $propertyName,
$propertyValue, 'string that contains a class name' );
+ throw new ezcBaseValueException( $name, $value, 'string
that contains a class name' );
}
// Check if the passed classname actually implements the
// correct parent class. We have to do that with reflection
// here unfortunately
$parentClass = new ReflectionClass( 'ezcTreeNode' );
- $handlerClass = new ReflectionClass( $propertyValue );
- if ( 'ezcTreeNode' !== $propertyValue &&
!$handlerClass->isSubclassOf( $parentClass ) )
+ $handlerClass = new ReflectionClass( $value );
+ if ( 'ezcTreeNode' !== $value && !$handlerClass->isSubclassOf(
$parentClass ) )
{
- throw new ezcBaseInvalidParentClassException(
'ezcTreeNode', $propertyValue );
+ throw new ezcBaseInvalidParentClassException(
'ezcTreeNode', $value );
}
- $this->properties[$propertyName] = $propertyValue;
+ $this->properties[$name] = $value;
break;
case 'prefetch':
- if ( !is_bool( $propertyValue ) )
+ if ( !is_bool( $value ) )
{
- throw new ezcBaseValueException( $propertyName,
$propertyValue, 'boolean' );
+ throw new ezcBaseValueException( $name, $value, 'boolean'
);
}
- $this->properties[$propertyName] = $propertyValue;
+ $this->properties[$name] = $value;
break;
default:
Modified: trunk/Tree/src/tree_autoload.php
==============================================================================
--- trunk/Tree/src/tree_autoload.php [iso-8859-1] (original)
+++ trunk/Tree/src/tree_autoload.php [iso-8859-1] Fri Jul 27 16:55:00 2007
@@ -11,6 +11,8 @@
return array(
'ezcTreeException' => 'Tree/exceptions/exception.php',
+ 'ezcTreeIdsDoNotMatchException' =>
'Tree/exceptions/ids_do_not_match.php',
+ 'ezcTreeInvalidClassException' => 'Tree/exceptions/invalid_class.php',
'ezcTreeInvalidIdException' => 'Tree/exceptions/invalid_id.php',
'ezcTree' => 'Tree/tree.php',
'ezcTreeBackend' => 'Tree/interfaces/backend.php',
@@ -20,6 +22,9 @@
'ezcTreeXmlDataStore' => 'Tree/stores/xml.php',
'ezcTreeDbExternalTableDataStore' => 'Tree/stores/db_external.php',
'ezcTreeDbParentChild' => 'Tree/backends/db_parent_child.php',
+ 'ezcTreeMemory' => 'Tree/backends/memory.php',
+ 'ezcTreeMemoryDataStore' => 'Tree/stores/memory.php',
+ 'ezcTreeMemoryNode' => 'Tree/structs/memory_node.php',
'ezcTreeNode' => 'Tree/tree_node.php',
'ezcTreeNodeList' => 'Tree/tree_node_list.php',
'ezcTreeNodeListIterator' => 'Tree/tree_node_list_iterator.php',
Modified: trunk/Tree/src/tree_node_list.php
==============================================================================
--- trunk/Tree/src/tree_node_list.php [iso-8859-1] (original)
+++ trunk/Tree/src/tree_node_list.php [iso-8859-1] Fri Jul 27 16:55:00 2007
@@ -114,7 +114,7 @@
*
* This method is part of the SPL ArrayAccess interface.
*
- * @throws ezcTreeNotATreeNodeExecption if the data to be set as array
+ * @throws ezcTreeInvalidClassException if the data to be set as array
* element is not an instance of ezcTreeNode
* @throws ezcTreeIdsDoNotMatchException if the array index $id does not
* match the tree node's ID that is stored in the $data object
@@ -126,11 +126,11 @@
{
if ( !$data instanceof ezcTreeNode )
{
- throw new ezcTreeNotATreeNodeExecption( $data );
+ throw new ezcTreeInvalidClassException( 'ezcTreeNode', get_class(
$data ) );
}
if ( $data->id !== $id )
{
- throw new ezcTreeIdsDoNotMatchException( $id, $data->id );
+ throw new ezcTreeIdsDoNotMatchException( $data->id, $id );
}
$this->addNode( $data );
}
Modified: trunk/Tree/src/tree_node_list_iterator.php
==============================================================================
--- trunk/Tree/src/tree_node_list_iterator.php [iso-8859-1] (original)
+++ trunk/Tree/src/tree_node_list_iterator.php [iso-8859-1] Fri Jul 27 16:55:00
2007
@@ -53,7 +53,14 @@
public function rewind()
{
reset( $this->nodeList );
- $this->valid = true;
+ if ( count( $this->nodeList ) )
+ {
+ $this->valid = true;
+ }
+ else
+ {
+ $this->valid = false;
+ }
}
/**
Added: trunk/Tree/tests/files/test_classes.php
==============================================================================
--- trunk/Tree/tests/files/test_classes.php (added)
+++ trunk/Tree/tests/files/test_classes.php [iso-8859-1] Fri Jul 27 16:55:00
2007
@@ -1,0 +1,30 @@
+<?php
+class TestTranslateDataStore extends ezcTreeMemoryDataStore implements
ezcTreeDataStore
+{
+ public function fetchDataForNode( ezcTreeNode $node )
+ {
+ if ( $node->id == 'vuur' )
+ {
+ $node->data = array( 'en' => 'fire', 'de' => 'feuer', 'no' =>
'fyr' );
+ }
+ if ( $node->id == 'Be' )
+ {
+ $node->data = 'Beryllium';
+ }
+ }
+
+ public function fetchDataForNodes( ezcTreeNodeList $nodeList )
+ {
+ /* This is a no-op as the data is already in the $node */
+ }
+
+ public function storeDataForNode( ezcTreeNode $node )
+ {
+ /* This is a no-op as the data is already in the $node */
+ }
+}
+
+class TestExtendedTreeNode extends ezcTreeNode
+{
+}
+?>
Propchange: trunk/Tree/tests/files/test_classes.php
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/Tree/tests/memory_tree.php
==============================================================================
--- trunk/Tree/tests/memory_tree.php (added)
+++ trunk/Tree/tests/memory_tree.php [iso-8859-1] Fri Jul 27 16:55:00 2007
@@ -1,0 +1,90 @@
+<?php
+/**
+ * @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved.
+ * @license http://ez.no/licenses/new_bsd New BSD License
+ * @version //autogentag//
+ * @filesource
+ * @package Tree
+ * @subpackage Tests
+ */
+
+require_once 'tree.php';
+
+/**
+ * @package Tree
+ * @subpackage Tests
+ */
+class ezcTreeMemoryTest extends ezcTreeTest
+{
+ private $tempDir;
+
+ protected function setUpTestTree()
+ {
+ $tree = ezcTreeMemory::create( new ezcTreeMemoryDataStore() );
+ return $tree;
+ }
+/*
+ public function testCreateXmlTree()
+ {
+ $tree = ezcTreeXml::create(
+ $this->tempDir . '/new-tree.xml',
+ new ezcTreeXmlInternalDataStore()
+ );
+ self::assertSame( false, $tree->nodeExists( '1' ) );
+ self::assertSame( false, $tree->nodeExists( '3' ) );
+
+ $node = $tree->createNode( 1, "Root Node" );
+ self::assertType( 'ezcTreeNode', $node );
+ self::assertSame( '1', $node->id );
+ $tree->setRootNode( $node );
+ self::assertSame( true, $tree->nodeExists( '1' ) );
+
+ $node2 = $tree->createNode( 2, "Node 2" );
+ $node->addChild( $node2 );
+ self::assertSame( true, $tree->nodeExists( '2' ) );
+
+ $node->addChild( $node3 = $tree->createNode( 3, "Node 3" ) );
+ $node3->addChild( $tree->createNode( 4, "Node 3.4" ) );
+ self::assertSame( true, $tree->nodeExists( '3' ) );
+ self::assertSame( true, $tree->nodeExists( '4' ) );
+
+ self::assertXmlFileEqualsXmlFile(
+ dirname( __FILE__ ) . '/files/create-test.xml',
+ $this->tempDir . '/new-tree.xml'
+ );
+ }
+
+ public function testCreateXmlTreeWithTransaction()
+ {
+ $tree = ezcTreeXml::create(
+ $this->tempDir . '/new-tree.xml',
+ new ezcTreeXmlInternalDataStore()
+ );
+
+ $tree->setRootNode( $node = $tree->createNode( 1, "Root Node" ) );
+ self::assertSame( true, $tree->nodeExists( '1' ) );
+
+ $tree->beginTransaction();
+ $node->addChild( $tree->createNode( 2, "Node 2" ) );
+ $node->addChild( $node3 = $tree->createNode( 3, "Node 3" ) );
+ $node3->addChild( $tree->createNode( 4, "Node 3.4" ) );
+
+ self::assertSame( false, $tree->nodeExists( '3' ) );
+
+ $tree->commit();
+
+ self::assertSame( true, $tree->nodeExists( '3' ) );
+
+ self::assertXmlFileEqualsXmlFile(
+ dirname( __FILE__ ) . '/files/create-test.xml',
+ $this->tempDir . '/new-tree.xml'
+ );
+ }
+*/
+ public static function suite()
+ {
+ return new PHPUnit_Framework_TestSuite( "ezcTreeMemoryTest" );
+ }
+}
+
+?>
Propchange: trunk/Tree/tests/memory_tree.php
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/Tree/tests/suite.php
==============================================================================
--- trunk/Tree/tests/suite.php [iso-8859-1] (original)
+++ trunk/Tree/tests/suite.php [iso-8859-1] Fri Jul 27 16:55:00 2007
@@ -9,9 +9,18 @@
*/
/**
+ * Require the test classes file
+ */
+require 'files/test_classes.php';
+
+/**
* Require the tests
*/
require_once 'tree.php';
+require_once 'tree_node.php';
+require_once 'tree_node_list.php';
+require_once 'tree_node_list_iterator.php';
+require_once 'memory_tree.php';
require_once 'xml_tree.php';
require_once 'db_parent_child_tree.php';
@@ -26,6 +35,10 @@
parent::__construct();
$this->setName("Tree");
+ $this->addTest( ezcTreeNodeTest::suite() );
+ $this->addTest( ezcTreeNodeListTest::suite() );
+ $this->addTest( ezcTreeNodeListIteratorTest::suite() );
+ $this->addTest( ezcTreeMemoryTest::suite() );
$this->addTest( ezcTreeXmlTest::suite() );
$this->addTest( ezcTreeDbParentChildTest::suite() );
}
Modified: trunk/Tree/tests/tree.php
==============================================================================
--- trunk/Tree/tests/tree.php [iso-8859-1] (original)
+++ trunk/Tree/tests/tree.php [iso-8859-1] Fri Jul 27 16:55:00 2007
@@ -29,6 +29,115 @@
self::assertType( 'ezcTreeNode', $node3 );
self::assertSame( '3', $node3->id );
self::assertSame( 'Node 3', $node3->data );
+ }
+
+ public function testGetUnknownProperty()
+ {
+ $tree = $this->setUpTestTree();
+
+ try
+ {
+ $dummy = $tree->unknown;
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcBasePropertyNotFoundException $e )
+ {
+ self::assertSame( "No such property name 'unknown'.",
$e->getMessage() );
+ }
+ }
+
+ public function testSetStore()
+ {
+ $tree = $this->setUpTestTree();
+
+ try
+ {
+ $tree->store = new TestTranslateDataStore;
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcBasePropertyPermissionException $e )
+ {
+ self::assertSame( "The property 'store' is read-only.",
$e->getMessage() );
+ }
+ }
+
+ public function testSetPrefetch()
+ {
+ $tree = $this->setUpTestTree();
+
+ $tree->prefetch = true;
+ self::assertSame( true, $tree->prefetch );
+
+ $tree->prefetch = false;
+ self::assertSame( false, $tree->prefetch );
+ }
+
+ public function testSetPrefetchWrongValue()
+ {
+ $tree = $this->setUpTestTree();
+
+ try
+ {
+ $tree->prefetch = 42;
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcBaseValueException $e )
+ {
+ self::assertSame( "The value '42' that you were trying to assign
to setting 'prefetch' is invalid. Allowed values are: boolean.",
$e->getMessage() );
+ }
+ }
+
+ public function testSetNodeClassName()
+ {
+ $tree = $this->setUpTestTree();
+
+ $tree->nodeClassName = 'TestExtendedTreeNode';
+ self::assertSame( 'TestExtendedTreeNode', $tree->nodeClassName );
+ }
+
+ public function testSetNodeClassNameWrongValue1()
+ {
+ $tree = $this->setUpTestTree();
+
+ try
+ {
+ $tree->nodeClassName = 42;
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcBaseValueException $e )
+ {
+ self::assertSame( "The value '42' that you were trying to assign
to setting 'nodeClassName' is invalid. Allowed values are: string that contains
a class name.", $e->getMessage() );
+ }
+ }
+
+ public function testSetNodeClassNameWrongValue2()
+ {
+ $tree = $this->setUpTestTree();
+
+ try
+ {
+ $tree->nodeClassName = 'ezcTreeMemoryNode';
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcBaseInvalidParentClassException $e )
+ {
+ self::assertSame( "Class 'ezcTreeMemoryNode' does not exist, or
does not inherit from the 'ezcTreeNode' class.", $e->getMessage() );
+ }
+ }
+
+ public function testSetUnknownProperty()
+ {
+ $tree = $this->setUpTestTree();
+
+ try
+ {
+ $tree->unknown = 'whatever';
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcBasePropertyNotFoundException $e )
+ {
+ self::assertSame( "No such property name 'unknown'.",
$e->getMessage() );
+ }
}
public function testTreeFetchByUnknownId()
@@ -374,6 +483,7 @@
public function testTreeDeleteNode()
{
+ $this->markTestSkipped( "Crashes PHP" );
$tree = $this->setUpTestTree();
self::assertSame( true, $tree->nodeExists( 5 ) );
@@ -394,6 +504,7 @@
public function testTreeDeleteNodeWithTransaction()
{
+ $this->markTestSkipped( "Crashes PHP" );
$tree = $this->setUpTestTree();
self::assertSame( true, $tree->nodeExists( 5 ) );
Added: trunk/Tree/tests/tree_node.php
==============================================================================
--- trunk/Tree/tests/tree_node.php (added)
+++ trunk/Tree/tests/tree_node.php [iso-8859-1] Fri Jul 27 16:55:00 2007
@@ -1,0 +1,126 @@
+<?php
+/**
+ * @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved.
+ * @license http://ez.no/licenses/new_bsd New BSD License
+ * @version //autogentag//
+ * @filesource
+ * @package Tree
+ * @subpackage Tests
+ */
+
+/**
+ * @package Tree
+ * @subpackage Tests
+ */
+class ezcTreeNodeTest extends ezcTestCase
+{
+ public function setUp()
+ {
+ $this->tree = ezcTreeMemory::create( new ezcTreeMemoryDataStore() );
+ }
+
+ public function testConstruct()
+ {
+ $node = new ezcTreeNode( $this->tree, 'H', 'Hydrogen' );
+ }
+
+ public function testGetId()
+ {
+ $node = new ezcTreeNode( $this->tree, 'He', 'Helium' );
+ self::assertSame( 'He', $node->id );
+ }
+
+ public function testGetData()
+ {
+ $node = new ezcTreeNode( $this->tree, 'Li', 'Lithium' );
+ self::assertSame( 'Lithium', $node->data );
+ }
+
+ public function testGetDataOnDemand()
+ {
+ $tree = ezcTreeMemory::create( new TestTranslateDataStore() );
+ $node = new ezcTreeNode( $tree, 'Be' );
+ self::assertSame( 'Beryllium', $node->data );
+ }
+
+ public function testGetUnknownProperty()
+ {
+ $node = new ezcTreeNode( $this->tree, 'B', 'Boron' );
+
+ try
+ {
+ $dummy = $node->unknown;
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcBasePropertyNotFoundException $e )
+ {
+ self::assertSame( "No such property name 'unknown'.",
$e->getMessage() );
+ }
+ }
+
+ public function testSetId()
+ {
+ $node = new ezcTreeNode( $this->tree, 'C', 'Carbon' );
+
+ try
+ {
+ $node->id = 'Koolstof';
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcBasePropertyPermissionException $e )
+ {
+ self::assertSame( "The property 'id' is read-only.",
$e->getMessage() );
+ }
+ }
+
+ public function testSetUnknownProperty()
+ {
+ $node = new ezcTreeNode( $this->tree, 'N', 'Nitrogen' );
+
+ try
+ {
+ $node->unknown = 42;
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcBasePropertyNotFoundException $e )
+ {
+ self::assertSame( "No such property name 'unknown'.",
$e->getMessage() );
+ }
+ }
+
+ public function testAddChild()
+ {
+ $node = new ezcTreeNode( $this->tree, 'O', 'Oxygen' );
+ $this->tree->setRootNode( $node );
+
+ $childNode = new ezcTreeNode( $this->tree, 'F', 'Iron' );
+ $node->addChild( $childNode );
+
+ $nodeO = $this->tree->fetchNodeById( 'O' );
+ $nodeF = $this->tree->fetchNodeById( 'F' );
+ self::assertSame( true, $nodeF->isChildOf( $nodeO ) );
+ }
+
+ public function testFetchChildren()
+ {
+ $node = new ezcTreeNode( $this->tree, 'Ne', 'Neon' );
+ $this->tree->setRootNode( $node );
+
+ $childNode = new ezcTreeNode( $this->tree, 'Na', 'Natrium' );
+ $node->addChild( $childNode );
+ $childNode = new ezcTreeNode( $this->tree, 'Mg', 'Magnesium' );
+ $node->addChild( $childNode );
+
+ $nodeNe = $this->tree->fetchNodeById( 'Ne' );
+ $children = $nodeNe->fetchChildren();
+ self::assertSame( 'ezcTreeNodeList', get_class( $children ) );
+ self::assertSame( 2, $children->size );
+ }
+
+ public static function suite()
+ {
+ return new PHPUnit_Framework_TestSuite( "ezcTreeNodeTest" );
+ }
+}
+
+?>
Propchange: trunk/Tree/tests/tree_node.php
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/Tree/tests/tree_node_list.php
==============================================================================
--- trunk/Tree/tests/tree_node_list.php (added)
+++ trunk/Tree/tests/tree_node_list.php [iso-8859-1] Fri Jul 27 16:55:00 2007
@@ -1,0 +1,181 @@
+<?php
+/**
+ * @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved.
+ * @license http://ez.no/licenses/new_bsd New BSD License
+ * @version //autogentag//
+ * @filesource
+ * @package Tree
+ * @subpackage Tests
+ */
+
+/**
+ * @package Tree
+ * @subpackage Tests
+ */
+class ezcTreeNodeListTest extends ezcTestCase
+{
+ public function setUp()
+ {
+ $this->tree = ezcTreeMemory::create( new ezcTreeMemoryDataStore() );
+ }
+
+ public function testAddNode()
+ {
+ $list = new ezcTreeNodeList;
+
+ $node5 = new ezcTreeNode( $this->tree, '5' );
+ $node5->data = 'vijf';
+ $list->addNode( $node5 );
+
+ $node42 = new ezcTreeNode( $this->tree, '42' );
+ $node42->data = 'tweeenveertig';
+ $list->addNode( $node42 );
+
+ self::assertSame( array( '5' => $node5, '42' => $node42 ),
$list->getNodes() );
+ }
+
+ public function testGetSize()
+ {
+ $list = new ezcTreeNodeList;
+
+ self::assertSame( 0, $list->size );
+
+ $node = new ezcTreeNode( $this->tree, '7' );
+ $node->data = 'zeven';
+ $list->addNode( $node );
+
+ self::assertSame( 1, $list->size );
+ }
+
+ public function testSetSize()
+ {
+ $list = new ezcTreeNodeList;
+
+ try
+ {
+ $list->size = 42;
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcBasePropertyPermissionException $e )
+ {
+ self::assertSame( "The property 'size' is read-only.",
$e->getMessage() );
+ }
+ }
+
+ public function testGetUnknownProperty()
+ {
+ $list = new ezcTreeNodeList;
+
+ try
+ {
+ $dummy = $list->unknown;
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcBasePropertyNotFoundException $e )
+ {
+ self::assertSame( "No such property name 'unknown'.",
$e->getMessage() );
+ }
+ }
+
+ public function testSetUnknownProperty()
+ {
+ $list = new ezcTreeNodeList;
+
+ try
+ {
+ $list->unknown = 42;
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcBasePropertyNotFoundException $e )
+ {
+ self::assertSame( "No such property name 'unknown'.",
$e->getMessage() );
+ }
+ }
+
+ public function testOffsetExists()
+ {
+ $list = new ezcTreeNodeList;
+
+ $node = new ezcTreeNode( $this->tree, '8' );
+ $node->data = 'acht';
+ $list->addNode( $node );
+
+ self::assertSame( true, isset( $list['8'] ) );
+ }
+
+ public function testOffsetGet()
+ {
+ $list = new ezcTreeNodeList;
+
+ $node = new ezcTreeNode( $this->tree, '19' );
+ $node->data = 'negentien';
+ $list->addNode( $node );
+
+ self::assertSame( $node, $list['19'] );
+ }
+
+ public function testOffsetSet()
+ {
+ $list = new ezcTreeNodeList;
+
+ $node = new ezcTreeNode( $this->tree, '12' );
+ $node->data = 'twaalf';
+
+ self::assertSame( false, isset( $list['12'] ) );
+ $list['12'] = $node;
+ self::assertSame( true, isset( $list['12'] ) );
+ self::assertSame( $node, $list['12'] );
+ }
+
+ public function testOffsetSetWrongClass()
+ {
+ $list = new ezcTreeNodeList;
+
+ try
+ {
+ $list['4'] = new StdClass;
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcTreeInvalidClassException $e )
+ {
+ self::assertSame( "An object of class 'ezcTreeNode' is used, but
an object of class 'stdClass' is expected.", $e->getMessage() );
+ }
+ }
+
+ public function testOffsetSetWrongId()
+ {
+ $list = new ezcTreeNodeList;
+
+ try
+ {
+ $node = new ezcTreeNode( $this->tree, '16' );
+ $node->data = 'zestien';
+ $list['6'] = $node;
+ self::fail( "Expected exception not thrown" );
+ }
+ catch ( ezcTreeIdsDoNotMatchException $e )
+ {
+ self::assertSame( "You can add the node with node ID '16' to the
list with key '6'. The key needs to match the node ID.", $e->getMessage() );
+ }
+ }
+
+ public function testOffsetUnset()
+ {
+ $list = new ezcTreeNodeList;
+
+ $node = new ezcTreeNode( $this->tree, '78' );
+ $node->data = 'achtenzeventig';
+ $list->addNode( $node );
+
+ self::assertSame( true, isset( $list['78'] ) );
+ unset( $list['78'] );
+ self::assertSame( false, isset( $list['78'] ) );
+ }
+
+ public static function suite()
+ {
+ return new PHPUnit_Framework_TestSuite( "ezcTreeNodeListTest" );
+ }
+}
+
+?>
Propchange: trunk/Tree/tests/tree_node_list.php
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/Tree/tests/tree_node_list_iterator.php
==============================================================================
--- trunk/Tree/tests/tree_node_list_iterator.php (added)
+++ trunk/Tree/tests/tree_node_list_iterator.php [iso-8859-1] Fri Jul 27
16:55:00 2007
@@ -1,0 +1,114 @@
+<?php
+/**
+ * @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved.
+ * @license http://ez.no/licenses/new_bsd New BSD License
+ * @version //autogentag//
+ * @filesource
+ * @package Tree
+ * @subpackage Tests
+ */
+
+/**
+ * @package Tree
+ * @subpackage Tests
+ */
+class ezcTreeNodeListIteratorTest extends ezcTestCase
+{
+ public function setUp()
+ {
+ $this->tree = ezcTreeMemory::create( new ezcTreeMemoryDataStore() );
+ }
+
+ public function testEmptyList()
+ {
+ $list = new ezcTreeNodeList;
+
+ foreach ( new ezcTreeNodeListIterator( $this->tree, $list ) as $key =>
$node )
+ {
+ self::fail( "The list is not empty." );
+ }
+ }
+
+ public function testOneItem()
+ {
+ $list = new ezcTreeNodeList;
+
+ $node = new ezcTreeNode( $this->tree, '9' );
+ $node->data = 'negen';
+ $list->addNode( $node );
+
+ foreach ( new ezcTreeNodeListIterator( $this->tree, $list ) as $key =>
$data )
+ {
+ self::assertSame( 9, $key );
+ self::assertSame( 'negen', $data );
+ }
+ }
+
+ public function testMoreItems()
+ {
+ $list = new ezcTreeNodeList;
+
+ $node = new ezcTreeNode( $this->tree, '23' );
+ $node->data = 'drieentwintig';
+ $list->addNode( $node );
+
+ $node = new ezcTreeNode( $this->tree, '29' );
+ $node->data = 'negenentwintig';
+ $list->addNode( $node );
+
+ $node = new ezcTreeNode( $this->tree, '31' );
+ $node->data = 'eenendertig';
+ $list->addNode( $node );
+
+ foreach ( new ezcTreeNodeListIterator( $this->tree, $list ) as $key =>
$data )
+ {
+ }
+ self::assertSame( 31, $key );
+ self::assertSame( 'eenendertig', $data );
+ }
+
+ public function testMoreItemsNonNumericKey()
+ {
+ $list = new ezcTreeNodeList;
+
+ $node = new ezcTreeNode( $this->tree, 'boom' );
+ $node->data = 'tree';
+ $list->addNode( $node );
+
+ $node = new ezcTreeNode( $this->tree, 'roos' );
+ $node->data = 'rose';
+ $list->addNode( $node );
+
+ $node = new ezcTreeNode( $this->tree, 'vis' );
+ $node->data = 'fish';
+ $list->addNode( $node );
+
+ foreach ( new ezcTreeNodeListIterator( $this->tree, $list ) as $key =>
$data )
+ {
+ }
+ self::assertSame( 'vis', $key );
+ self::assertSame( 'fish', $data );
+ }
+
+ public function testOnDemandData()
+ {
+ $tree = ezcTreeMemory::create( new TestTranslateDataStore() );
+ $list = new ezcTreeNodeList;
+
+ $node = new ezcTreeNode( $tree, 'vuur' );
+ $list->addNode( $node );
+
+ foreach ( new ezcTreeNodeListIterator( $tree, $list ) as $key => $data
)
+ {
+ self::assertSame( 'vuur', $key );
+ self::assertSame( array( 'en' => 'fire', 'de' => 'feuer', 'no' =>
'fyr' ), $data );
+ }
+ }
+
+ public static function suite()
+ {
+ return new PHPUnit_Framework_TestSuite( "ezcTreeNodeListIteratorTest"
);
+ }
+}
+
+?>
Propchange: trunk/Tree/tests/tree_node_list_iterator.php
------------------------------------------------------------------------------
svn:eol-style = native
--
svn-components mailing list
[EMAIL PROTECTED]
http://lists.ez.no/mailman/listinfo/svn-components
