From bb0f0e32ed02c82cbfab65c22dd0eded9cf12e96 Mon Sep 17 00:00:00 2001 From: zYne Date: Thu, 14 Jun 2007 21:01:57 +0000 Subject: [PATCH] added doc blocks --- tests/Ticket330TestCase.php | 9 +++-- tests/TreeStructureTestCase.php | 69 +++++++++++++++++++++++++------- tests/UnitTestCase.php | 70 ++++++++++++++++++++++++--------- 3 files changed, 112 insertions(+), 36 deletions(-) diff --git a/tests/Ticket330TestCase.php b/tests/Ticket330TestCase.php index af1e48cdd..aabae93c4 100644 --- a/tests/Ticket330TestCase.php +++ b/tests/Ticket330TestCase.php @@ -51,10 +51,13 @@ class Doctrine_Ticket330_TestCase extends Doctrine_UnitTestCase { public function prepareData() { } - public function prepareTables() - { } - + { + $this->tables[] = 'stNode'; + $this->tables[] = 'stNodeDetail'; + parent::prepareTables(); + } + public function testUnnecessaryQueries() { diff --git a/tests/TreeStructureTestCase.php b/tests/TreeStructureTestCase.php index b1c2fdd45..c571e9b3c 100644 --- a/tests/TreeStructureTestCase.php +++ b/tests/TreeStructureTestCase.php @@ -1,22 +1,48 @@ hasColumn('name', 'string'); - $this->hasColumn('parent_id', 'integer'); - } - public function setUp() - { - $this->hasOne('TreeLeaf as Parent', 'TreeLeaf.parent_id'); - $this->hasMany('TreeLeaf as Children', 'TreeLeaf.parent_id'); - } -} +/* + * $Id$ + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This software consists of voluntary contributions made by many individuals + * and is licensed under the LGPL. For more information, see + * . + */ +/** + * Doctrine_TreeStructure_TestCase + * + * @package Doctrine + * @author Konsta Vesterinen + * @license http://www.opensource.org/licenses/lgpl-license.php LGPL + * @category Object Relational Mapping + * @link www.phpdoctrine.com + * @since 1.0 + * @version $Revision$ + */ class Doctrine_TreeStructure_TestCase extends Doctrine_UnitTestCase { - public function prepareTables() { } /* we don't need the standard tables here */ - public function prepareData() { } /* we don't need the standard data here */ + public function prepareTables() + { + // we don't need the standard tables here + $this->tables = array('TreeLeaf'); + parent::prepareTables(); + } + + public function prepareData() + { + + } public function testSelfReferentialRelationship() { @@ -100,3 +126,16 @@ class Doctrine_TreeStructure_TestCase extends Doctrine_UnitTestCase } } +class TreeLeaf extends Doctrine_Record +{ + public function setTableDefinition() + { + $this->hasColumn('name', 'string'); + $this->hasColumn('parent_id', 'integer'); + } + public function setUp() + { + $this->hasOne('TreeLeaf as Parent', 'TreeLeaf.parent_id'); + $this->hasMany('TreeLeaf as Children', 'TreeLeaf.parent_id'); + } +} diff --git a/tests/UnitTestCase.php b/tests/UnitTestCase.php index 2c9a89e59..d60513446 100644 --- a/tests/UnitTestCase.php +++ b/tests/UnitTestCase.php @@ -1,4 +1,35 @@ . + */ + +/** + * Doctrine_UnitTestCase + * + * @package Doctrine + * @author Konsta Vesterinen + * @license http://www.opensource.org/licenses/lgpl-license.php LGPL + * @category Object Relational Mapping + * @link www.phpdoctrine.com + * @since 1.0 + * @version $Revision$ + */ class Doctrine_UnitTestCase extends UnitTestCase { protected $manager; protected $connection; @@ -32,23 +63,23 @@ class Doctrine_UnitTestCase extends UnitTestCase { $this->manager->setAttribute(Doctrine::ATTR_EXPORT, Doctrine::EXPORT_ALL); $this->tables = array_merge($this->tables, - array("entity", - "entityReference", - "email", - "phonenumber", - "groupuser", - "album", - "song", - "element", - "error", - "description", - "address", - "account", - "task", - "resource", - "assignment", - "resourceType", - "resourceReference") + array('entity', + 'entityReference', + 'email', + 'phonenumber', + 'groupuser', + 'album', + 'song', + 'element', + 'error', + 'description', + 'address', + 'account', + 'task', + 'resource', + 'assignment', + 'resourceType', + 'resourceReference') ); @@ -140,12 +171,15 @@ class Doctrine_UnitTestCase extends UnitTestCase { } } + $this->conn->export->exportClasses($this->tables); + /** foreach($this->tables as $name) { $name = ucwords($name); $table = $this->connection->getTable($name); - $table->clear(); + $table->clear(); } + */ $this->objTable = $this->connection->getTable('User'); }