RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 06:46:03 +03:00
Code Issues Projects Releases Wiki Activity

added tests for Collection. also fixed a bug with serialization in collections. added copyright header to the two new testfiles

Browse Source
This commit is contained in:
meus 2008-02-15 00:57:34 +00:00
parent 081ef099d4
commit f5b0b6bfec
5 changed files with 170 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Doctrine/Collection.php
View File

@ -184,7 +184,7 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
unset($vars['expanded']);
unset($vars['generator']);
$vars['_table'] = $vars['_table']->getComponentName();
$vars['_mapper'] = $vars['_mapper']->getComponentName();
return serialize($vars);
}
@ -195,6 +195,8 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
*
* Part of the implementation of the Serializable interface.
*
* @param string $serialized The serialized data
*
* @return void
*/
public function unserialize($serialized)
@ -241,7 +243,7 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
*/
public function getKeyColumn()
{
return $this->column;
return $this->keyColumn;
}
/**
@ -515,6 +517,7 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
return true;
}
// why is this not checked when the keyColumn is set?
if (isset($this->keyColumn)) {
$value = $record->get($this->keyColumn);
if ($value === null) {

31
tests/Orm/Component/AccessTest.php
View File

@ -1,4 +1,35 @@
<?php
/*
* $Id: Doctrine.php 3754 2008-02-13 10:53:07Z romanb $
*
* 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
* <http://www.phpdoctrine.org>.
*/
/**
* Doctrine
* the base class of Doctrine framework
*
* @package Doctrine
* @author Bjarte Stien Karlsen <doctrine@bjartek.org>
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.phpdoctrine.com
* @since 1.0
* @version $Revision: 3754 $
*/
require_once 'lib/DoctrineTestInit.php';
class Orm_Component_AccessTest extends Doctrine_OrmTestCase

2
tests/Orm/Component/AllTests.php
View File

@ -8,6 +8,7 @@ require_once 'lib/DoctrineTestInit.php';
// Tests
require_once 'Orm/Component/TestTest.php';
require_once 'Orm/Component/AccessTest.php';
require_once 'Orm/Component/CollectionTest.php';
class Orm_Component_AllTests
{
@ -22,6 +23,7 @@ class Orm_Component_AllTests
// $suite->addTestSuite('Orm_Component_TestTest');
$suite->addTestSuite('Orm_Component_AccessTest');
$suite->addTestSuite('Orm_Component_CollectionTest');
return $suite;
}

130
tests/Orm/Component/CollectionTest.php Normal file
View File

@ -0,0 +1,130 @@
<?php /* vim: set et sw=4 ts=4: */
/*
* $Id: Doctrine.php 3754 2008-02-13 10:53:07Z romanb $
*
* 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
* <http://www.phpdoctrine.org>.
*/
/**
* Doctrine
* the base class of Doctrine framework
*
* @package Doctrine
* @author Bjarte Stien Karlsen <doctrine@bjartek.org>
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.phpdoctrine.com
* @since 1.0
* @version $Revision: 3754 $
*/
require_once 'lib/DoctrineTestInit.php';
class Orm_Component_CollectionTest extends Doctrine_OrmTestCase
{
private $coll;
public function setUp()
{
parent::setUp();
$this->coll = new Doctrine_Collection('ForumUser');
//we create a CmsUser with username as key column and add a user to it
$cmsColl = new Doctrine_Collection('CmsUser', 'username');
$user = new CmsUser();
$user->username ='test';
$cmsColl[] = $user;
$this->cmsColl = $cmsColl;
$this->cmsUser = $user;
}
/**
* @test
*/
public function shouldHaveBlankAsDefaultKeyColumn()
{
$this->assertEquals('', $this->coll->getKeyColumn());
}
/**
* @test
*/
public function shouldUseSpecifiedKeyColumn()
{
$coll = new Doctrine_Collection('ForumUser', 'id');
$this->assertEquals('id', $coll->getKeyColumn());
}
/**
* This test is currently failing. I do not understand why it should be
* possible to set this to something that is not valid.
*
* @test
* @expectedException Doctrine_Exception
*/
public function shouldThrowExceptionIfNonValidFieldSetAsKey()
{
$coll = new Doctrine_Collection('ForumUser', 'rat');
}
/**
* @test
*/
public function shouldSerializeEmptyCollection()
{
$serializedFormCollection='C:19:"Doctrine_Collection":158:{a:7:{s:4:"data";a:0:{}s:7:"_mapper";s:9:"ForumUser";s:9:"_snapshot";a:0:{}s:14:"referenceField";N;s:9:"keyColumn";N;s:8:"_locator";N;s:10:"_resources";a:0:{}}}';
$this->assertEquals($serializedFormCollection, serialize($this->coll));
}
/**
* @test
*/
public function shouldUnserializeEmptyCollectionIntoObject()
{
$serializedFormCollection='C:19:"Doctrine_Collection":158:{a:7:{s:4:"data";a:0:{}s:7:"_mapper";s:9:"ForumUser";s:9:"_snapshot";a:0:{}s:14:"referenceField";N;s:9:"keyColumn";N;s:8:"_locator";N;s:10:"_resources";a:0:{}}}';
$coll = unserialize($serializedFormCollection);
$this->assertEquals(Doctrine_Collection, get_class($coll));
}
/**
* @test
*/
public function shouldSetKeyColumnWhenAddingNewRowAsArray()
{
$this->assertTrue(isset($this->cmsColl['test']));
$this->assertEquals($this->cmsUser, $this->cmsColl['test']);
}
/**
* @test
*/
public function shouldSerializeAndUnserializeCollectionWithData()
{
$serialized = serialize($this->cmsColl);
$coll = unserialize($serialized);
$this->assertEquals('username', $coll->getKeyColumn());
$this->assertTrue(isset($coll['test']));
$user = $coll['test'];
$this->assertTrue($user instanceOf CmsUser);
$this->assertEquals('test', $user['username']);
}
}

4
tests/models/cms/CmsUser.php
View File

@ -5,6 +5,6 @@ class CmsUser extends Doctrine_Record
{
$class->setColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
$class->setColumn('username', 'string', 255);
$class->setColumn('username', 'string', 255);
$class->setColumn('name', 'string', 255);
}
}
}