forked from modxcms/xpdo
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[#10183] Fix cache entry removal on xPDOObject::remove()
- Loading branch information
Showing
5 changed files
with
186 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| <?php | ||
| /** | ||
| * Copyright 2010-2013 by MODX, LLC. | ||
| * | ||
| * This file is part of xPDO. | ||
| * | ||
| * xPDO is free software; you can redistribute it and/or modify it under the | ||
| * terms of the GNU General Public License as published by the Free Software | ||
| * Foundation; either version 2 of the License, or (at your option) any later | ||
| * version. | ||
| * | ||
| * xPDO is distributed in the hope that it will be useful, but WITHOUT ANY | ||
| * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR | ||
| * A PARTICULAR PURPOSE. See the GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along with | ||
| * xPDO; if not, write to the Free Software Foundation, Inc., 59 Temple Place, | ||
| * Suite 330, Boston, MA 02111-1307 USA | ||
| * | ||
| * @package xpdo-test | ||
| */ | ||
| /** | ||
| * Tests related to basic xPDOObject methods | ||
| * | ||
| * @package xpdo-test | ||
| * @subpackage xpdo | ||
| */ | ||
| class xPDOCacheDbTest extends xPDOTestCase { | ||
| /** | ||
| * Setup dummy data for each test. | ||
| */ | ||
| public function setUp() { | ||
| parent::setUp(); | ||
| try { | ||
| /* ensure we have clear data and identity sequences */ | ||
| $this->xpdo->getManager(); | ||
|
|
||
| $this->xpdo->manager->createObjectContainer('Phone'); | ||
| $this->xpdo->manager->createObjectContainer('Person'); | ||
| $this->xpdo->manager->createObjectContainer('PersonPhone'); | ||
| $this->xpdo->manager->createObjectContainer('BloodType'); | ||
|
|
||
| $bloodTypes = array('A+','A-','B+','B-','AB+','AB-','O+','O-'); | ||
| foreach ($bloodTypes as $bloodType) { | ||
| $bt = $this->xpdo->newObject('BloodType'); | ||
| $bt->set('type',$bloodType); | ||
| $bt->set('description',''); | ||
| if (!$bt->save()) { | ||
| $this->xpdo->log(xPDO::LOG_LEVEL_FATAL,'Could not add blood type: '.$bloodType); | ||
| } | ||
| } | ||
|
|
||
| $bloodTypeABPlus = $this->xpdo->getObject('BloodType','AB+'); | ||
| if (empty($bloodTypeABPlus)) $this->xpdo->log(xPDO::LOG_LEVEL_FATAL,'Could not load blood type.'); | ||
|
|
||
| /* add some people */ | ||
| $person= $this->xpdo->newObject('Person'); | ||
| $person->set('first_name', 'Johnathon'); | ||
| $person->set('last_name', 'Doe'); | ||
| $person->set('middle_name', 'Harry'); | ||
| $person->set('dob', '1950-03-14'); | ||
| $person->set('gender', 'M'); | ||
| $person->set('password', 'ohb0ybuddy'); | ||
| $person->set('username', 'john.doe@gmail.com'); | ||
| $person->set('security_level', 3); | ||
| $person->set('blood_type',$bloodTypeABPlus->get('type')); | ||
| $person->save(); | ||
|
|
||
| $phone = $this->xpdo->newObject('Phone'); | ||
| $phone->fromArray(array( | ||
| 'type' => 'work', | ||
| 'number' => '555-111-1111', | ||
| )); | ||
| $phone->save(); | ||
|
|
||
| $personPhone = $this->xpdo->newObject('PersonPhone'); | ||
| $personPhone->fromArray(array( | ||
| 'person' => 1, | ||
| 'phone' => 1, | ||
| 'is_primary' => true, | ||
| ),'',true,true); | ||
| $personPhone->save(); | ||
|
|
||
| $person= $this->xpdo->newObject('Person'); | ||
| $person->set('first_name', 'Jane'); | ||
| $person->set('last_name', 'Heartstead'); | ||
| $person->set('middle_name', 'Cecilia'); | ||
| $person->set('dob', '1978-10-23'); | ||
| $person->set('gender', 'F'); | ||
| $person->set('password', 'n0w4yimdoingthat'); | ||
| $person->set('username', 'jane.heartstead@yahoo.com'); | ||
| $person->set('security_level',1); | ||
| $person->set('blood_type',$bloodTypeABPlus->get('type')); | ||
| $person->save(); | ||
|
|
||
| $phone = $this->xpdo->newObject('Phone'); | ||
| $phone->fromArray(array( | ||
| 'type' => 'work', | ||
| 'number' => '555-222-2222', | ||
| )); | ||
| $phone->save(); | ||
|
|
||
| $personPhone = $this->xpdo->newObject('PersonPhone'); | ||
| $personPhone->fromArray(array( | ||
| 'person' => 2, | ||
| 'phone' => 2, | ||
| 'is_primary' => true, | ||
| ),'',true,true); | ||
| $personPhone->save(); | ||
|
|
||
| $phone = $this->xpdo->newObject('Phone'); | ||
| $phone->fromArray(array( | ||
| 'type' => 'home', | ||
| 'number' => '555-555-5555', | ||
| )); | ||
| $phone->save(); | ||
|
|
||
| $personPhone = $this->xpdo->newObject('PersonPhone'); | ||
| $personPhone->fromArray(array( | ||
| 'person' => 2, | ||
| 'phone' => 3, | ||
| 'is_primary' => false, | ||
| ),'',true,true); | ||
| $personPhone->save(); | ||
| } catch (Exception $e) { | ||
| $this->xpdo->log(xPDO::LOG_LEVEL_ERROR, $e->getMessage(), '', __METHOD__, __FILE__, __LINE__); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Remove dummy data prior to each test. | ||
| */ | ||
| public function tearDown() { | ||
| try { | ||
| $this->xpdo->manager->removeObjectContainer('Phone'); | ||
| $this->xpdo->manager->removeObjectContainer('Person'); | ||
| $this->xpdo->manager->removeObjectContainer('PersonPhone'); | ||
| $this->xpdo->manager->removeObjectContainer('BloodType'); | ||
| } catch (Exception $e) { | ||
| $this->xpdo->log(xPDO::LOG_LEVEL_ERROR, $e->getMessage(), '', __METHOD__, __FILE__, __LINE__); | ||
| } | ||
| parent::tearDown(); | ||
| } | ||
|
|
||
| /** | ||
| * Ensure cache entries for class do not remain when removing an object. | ||
| */ | ||
| public function testRemoveObject() { | ||
| $this->xpdo->setOption(xPDO::OPT_CACHE_DB, true); | ||
|
|
||
| $people= $this->xpdo->getCollection('Person'); | ||
|
|
||
| /** @var Person $person */ | ||
| $person= $this->xpdo->getObject('Person', 1); | ||
| $person->remove(); | ||
|
|
||
| $people= $this->xpdo->getCollection('Person'); | ||
| $count= count($people); | ||
|
|
||
| $this->assertEquals(0, $this->xpdo->getCount('Person', 1), "Object still exists after remove"); | ||
| $this->assertEquals(1, $count, "Object still exists in cache after removal"); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters