[limb-svn] r6703 - 3.x/trunk/limb/active_record/tests/cases
svn at limb-project.com
svn at limb-project.com
Fri Jan 18 14:29:17 MSK 2008
Author: serega
Date: 2008-01-18 14:29:17 +0300 (Fri, 18 Jan 2008)
New Revision: 6703
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6703
Modified:
3.x/trunk/limb/active_record/tests/cases/lmbARAttributesLazyLoadingTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbARAutoTimesTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbARDirtyTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbAREventHandlersTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbARImportTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbARManyToManyCollectionTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbAROneToManyCollectionTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbAROneToOneRelationsTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbARQueryTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbARRecordSetDecoratorTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbARRecordSetJoinDecoratorTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbARSubclassingTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbARTestingObjectMother.class.php
3.x/trunk/limb/active_record/tests/cases/lmbARTransactionTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbARValidationTest.class.php
3.x/trunk/limb/active_record/tests/cases/lmbARValueObjectTest.class.php
Log:
-- a bit refactored tests for ACTIVE_RECORD package
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARAttributesLazyLoadingTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARAttributesLazyLoadingTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARAttributesLazyLoadingTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -13,28 +13,10 @@
protected $_lazy_attributes = array('annotation', 'content');
}
-class lmbARAttributesLazyLoadingTest extends UnitTestCase
+class lmbARAttributesLazyLoadingTest extends lmbARBaseTestCase
{
- var $conn = null;
- var $db = null;
-
- function setUp()
- {
- $this->conn = lmbToolkit :: instance()->getDefaultDbConnection();
- $this->db = new lmbSimpleDb($this->conn);
- $this->_cleanUp();
- }
-
- function tearDown()
- {
- $this->_cleanUp();
- }
-
- function _cleanUp()
- {
- $this->db->delete('test_one_table_object');
- }
-
+ protected $tables_to_cleanup = array('test_one_table_object');
+
function testLazyFind()
{
$object = $this->_createActiveRecord($annotation = 'Some annotation', $content = 'Some content');
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARAutoTimesTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARAutoTimesTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARAutoTimesTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -12,32 +12,10 @@
protected $_db_table_name = 'test_auto_times_object';
}
-class lmbARAutoTimesTest extends UnitTestCase
+class lmbARAutoTimesTest extends lmbARBaseTestCase
{
- var $conn;
- var $db;
-
- function setUp()
- {
- $toolkit = lmbToolkit :: save();
- $this->conn = $toolkit->getDefaultDbConnection();
- $this->db = new lmbSimpleDb($this->conn);
-
- $this->_cleanUp();
- }
-
- function tearDown()
- {
- $this->_cleanUp();
-
- lmbToolkit :: restore();
- }
-
- function _cleanUp()
- {
- $this->db->delete('test_auto_times_object');
- }
-
+ protected $tables_to_cleanup = array('test_auto_times_object');
+
function testSetTimesAutomaticallyOnCreate()
{
$time = time();
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARDirtyTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARDirtyTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARDirtyTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -6,39 +6,12 @@
* @copyright Copyright © 2004-2007 BIT(http://bit-creative.com)
* @license LGPL http://www.gnu.org/copyleft/lesser.html
*/
-require_once(dirname(__FILE__) . '/lmbActiveRecordTest.class.php');
-require_once(dirname(__FILE__) . '/lmbAROneToManyRelationsTest.class.php');
require_once(dirname(__FILE__) . '/lmbARValueObjectTest.class.php');
-require_once(dirname(__FILE__) . '/lmbAROneToOneRelationsTest.class.php');
-class lmbARDirtyTest extends UnitTestCase
+class lmbARDirtyTest extends lmbARBaseTestCase
{
- var $conn = null;
- var $db = null;
-
- function setUp()
- {
- $toolkit = lmbToolkit :: save();
- $this->conn = $toolkit->getDefaultDbConnection();
- $this->db = new lmbSimpleDb($this->conn);
-
- $this->_cleanUp();
- }
-
- function tearDown()
- {
- $this->_cleanUp();
- lmbToolkit :: restore();
- }
-
- function _cleanUp()
- {
- lmbActiveRecord :: delete('TestOneTableObject');
- lmbActiveRecord :: delete('LessonForTest');
- lmbActiveRecord :: delete('CourseForTest');
- lmbActiveRecord :: delete('LectureForTest');
- }
-
+ protected $tables_to_cleanup = array('lecture_for_test', 'course_for_test', 'test_one_table_object', 'lesson_for_test');
+
function testJustFoundObjectIsNotDirty()
{
$object = new TestOneTableObject();
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbAREventHandlersTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbAREventHandlersTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbAREventHandlersTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -106,32 +106,10 @@
}
}
-class lmbAREventHandlersTest extends UnitTestCase
+class lmbAREventHandlersTest extends lmbARBaseTestCase
{
- var $conn = null;
- var $db = null;
+ protected $tables_to_cleanup = array('test_one_table_object');
- function setUp()
- {
- $toolkit = lmbToolkit :: save();
- $this->conn = $toolkit->getDefaultDbConnection();
- $this->db = new lmbSimpleDb($this->conn);
-
- $this->_cleanUp();
- }
-
- function tearDown()
- {
- $this->_cleanUp();
-
- lmbToolkit :: restore();
- }
-
- function _cleanUp()
- {
- $this->db->delete('test_one_table_object');
- }
-
function testSaveNewRecord()
{
$object = new TestOneTableObject();
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARImportTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARImportTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARImportTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -25,33 +25,12 @@
}
}
-class lmbARImportTest extends UnitTestCase
+class lmbARImportTest extends lmbARBaseTestCase
{
- protected $db;
-
- function setUp()
- {
- $this->db = new lmbSimpleDb(lmbToolkit :: instance()->getDefaultDbConnection());
- $this->_dbCleanUp();
- }
-
- function tearDown()
- {
- $this->_dbCleanUp();
- }
-
- function _dbCleanUp()
- {
- lmbActiveRecord :: delete('TestOneTableObject');
- lmbActiveRecord :: delete('CourseForTest');
- lmbActiveRecord :: delete('LectureForTest');
- lmbActiveRecord :: delete('GroupForTest');
- lmbActiveRecord :: delete('UserForTest');
- lmbActiveRecord :: delete('LessonForTest');
- lmbActiveRecord :: delete('PersonForTest');
- lmbActiveRecord :: delete('SocialSecurityForTest');
- }
-
+ protected $tables_to_cleanup = array('lecture_for_test', 'course_for_test', 'test_one_table_object',
+ 'user_for_test', 'group_for_test', 'user2group_for_test',
+ 'person_for_test', 'social_security_for_test');
+
function testImportingObjectCallsItsExportMethod()
{
$object = new TestOneTableObject();
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARManyToManyCollectionTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARManyToManyCollectionTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARManyToManyCollectionTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -32,29 +32,10 @@
'class' => 'GroupForTest'));
}
-class lmbARManyToManyCollectionTest extends UnitTestCase
+class lmbARManyToManyCollectionTest extends lmbARBaseTestCase
{
- protected $db;
+ protected $tables_to_cleanup = array('group_for_test', 'user_for_test', 'user2group_for_test', 'extended_user2group_for_test');
- function setUp()
- {
- $this->db = new lmbSimpleDb(lmbToolkit :: instance()->getDefaultDbConnection());
- $this->_dbCleanUp();
- }
-
- function tearDown()
- {
- $this->_dbCleanUp();
- }
-
- function _dbCleanUp()
- {
- $this->db->delete('group_for_test');
- $this->db->delete('user_for_test');
- $this->db->delete('user2group_for_test');
- $this->db->delete('extended_user2group_for_test');
- }
-
function testAddToWithExistingOwner()
{
$user = $this->_createUserAndSave();
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbAROneToManyCollectionTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbAROneToManyCollectionTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbAROneToManyCollectionTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -71,24 +71,10 @@
protected $_default_sort_params = array('id' => 'DESC');
}
-class lmbAROneToManyCollectionTest extends UnitTestCase
+class lmbAROneToManyCollectionTest extends lmbARBaseTestCase
{
- function setUp()
- {
- $this->_dbCleanUp();
- }
-
- function tearDown()
- {
- $this->_dbCleanUp();
- }
-
- function _dbCleanUp()
- {
- lmbActiveRecord :: delete('CourseForTest');
- lmbActiveRecord :: delete('LectureForTest');
- }
-
+ protected $tables_to_cleanup = array('lecture_for_test', 'course_for_test');
+
function testAddToWithExistingOwner()
{
$course = $this->_createCourseAndSave();
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbAROneToOneRelationsTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbAROneToOneRelationsTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbAROneToOneRelationsTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -55,10 +55,8 @@
function testSaveChild()
{
- $person = new PersonForTest();
- $person->setName('Jim');
- $number = new SocialSecurityForTest();
- $number->setCode('099123');
+ $person = $this->creator->initPerson();
+ $number = $this->creator->initSocialSecurity();
$person->setSocialSecurity($number);
@@ -71,12 +69,9 @@
function testSaveParent()
{
- $person = new PersonForTest();
- $person->setName('Jim');
-
- $number = new SocialSecurityForTest();
- $number->setCode('099123');
-
+ $person = $this->creator->initPerson();
+ $number = $this->creator->initSocialSecurity();
+
$number->setPerson($person);
$this->assertNull($person->getId());
@@ -124,19 +119,15 @@
function testChangingChildObjectIdDirectly()
{
- $person = new PersonForTest();
- $person->setName('Jim');
-
- $number1 = new SocialSecurityForTest();
- $number1->setCode('099123');
-
+ $person = $this->creator->initPerson();
+ $number1 = $this->creator->initSocialSecurity();
+
$person->setSocialSecurity($number1);
$person->save();
- $number2 = new SocialSecurityForTest();
- $number2->setCode('143453');
+ $number2 = $this->creator->initSocialSecurity();
$number2->save();
-
+
$person2 = new PersonForTest($person->getId());
$this->assertEqual($person2->getSocialSecurity()->getId(), $number1->getId());
@@ -149,17 +140,14 @@
function testChangingChildIdRelationFieldDirectlyHasNoAffectIfChildObjectPropertyIsDirty()
{
- $person = new PersonForTest();
- $person->setName('Jim');
-
- $number1 = new SocialSecurityForTest();
- $number1->setCode('099123');
-
+ $person = $this->creator->initPerson();
+
+ $number1 = $this->creator->initSocialSecurity();
+
$person->setSocialSecurity($number1);
$person->save();
- $number2 = new SocialSecurityForTest();
- $number2->setCode('143453');
+ $number2 = $this->creator->initSocialSecurity();
$number2->save();
$person2 = new PersonForTest($person->getId());
@@ -175,13 +163,9 @@
function testLoadParentObject()
{
- $person = new PersonForTest();
- $person->setName('Jim');
- $number = new SocialSecurityForTest();
- $number->setCode('099123');
-
+ $person = $this->creator->initPerson();
+ $number = $this->creator->initSocialSecurity();
$person->setSocialSecurity($number);
-
$person->save();
$number2 = lmbActiveRecord :: findById('SocialSecurityForTest', $number->getId());
@@ -189,18 +173,14 @@
$person2 = $number2->getPerson();
$this->assertEqual($person2->getId(), $person->getId());
- $this->assertEqual($person2->getName(), 'Jim');
+ $this->assertEqual($person2->getName(), $person->getName());
}
function testGenericGetLoadsChildObject()
{
- $person = new PersonForTest();
- $person->setName('Jim');
- $number = new SocialSecurityForTest();
- $number->setCode('099123');
-
+ $person = $this->creator->initPerson();
+ $number = $this->creator->initSocialSecurity();
$person->setSocialSecurity($number);
-
$person->save();
$number2 = lmbActiveRecord :: findById('SocialSecurityForTest', $number->getId());
@@ -208,56 +188,45 @@
$person2 = $number2->getPerson();
$this->assertEqual($person2->getId(), $person->getId());
- $this->assertEqual($person2->getName(), 'Jim');
+ $this->assertEqual($person2->getName(), $person->getName());
}
function testLoadChildObject()
{
- $person = new PersonForTest();
- $person->setName('Jim');
- $number = new SocialSecurityForTest();
- $number->setCode('099123');
-
+ $person = $this->creator->initPerson();
+ $number = $this->creator->initSocialSecurity();
$person->setSocialSecurity($number);
-
$person_id = $person->save();
$person2 = lmbActiveRecord :: findById('PersonForTest', $person_id);
$number2 = $person2->getSocialSecurity();
$this->assertEqual($person2->getId(), $person_id);
- $this->assertEqual($person2->getName(), 'Jim');
+ $this->assertEqual($person2->getName(), $person->getName());
$this->assertEqual($number2->getId(), $number->getId());
- $this->assertEqual($number2->getCode(), '099123');
+ $this->assertEqual($number2->getCode(), $number->getCode());
}
function testGenericGetLoadsParentObject()
{
- $person = new PersonForTest();
- $person->setName('Jim');
- $number = new SocialSecurityForTest();
- $number->setCode('099123');
-
+ $person = $this->creator->initPerson();
+ $number = $this->creator->initSocialSecurity();
$person->setSocialSecurity($number);
-
$person_id = $person->save();
$person2 = lmbActiveRecord :: findById('PersonForTest', $person_id);
$number2 = $person2->get('social_security');
$this->assertEqual($person2->getId(), $person_id);
- $this->assertEqual($person2->getName(), 'Jim');
+ $this->assertEqual($person2->getName(), $person->getName());
$this->assertEqual($number2->getId(), $number->getId());
- $this->assertEqual($number2->getCode(), '099123');
+ $this->assertEqual($number2->getCode(), $number->getCode());
}
function testParentRemovalDeletesChildren()
{
- $person = new PersonForTest();
- $person->setName('Jim');
- $number = new SocialSecurityForTest();
- $number->setCode('099123');
-
+ $person = $this->creator->initPerson();
+ $number = $this->creator->initSocialSecurity();
$person->setSocialSecurity($number);
$person_id = $person->save();
@@ -271,19 +240,15 @@
function testParentDeleteAllDeletesChildren()
{
- $person = new PersonForTest();
- $person->setName('Jim');
- $number = new SocialSecurityForTest();
- $number->setCode('099123');
-
+ $person = $this->creator->initPerson();
+ $number = $this->creator->initSocialSecurity();
$person->setSocialSecurity($number);
-
$person_id = $person->save();
+
$number_id = $number->getId();
//this one should stay
- $untouched_number = new SocialSecurityForTest();
- $untouched_number->setCode('0893127');
+ $untouched_number = $this->creator->initSocialSecurity();
$untouched_number->save();
lmbActiveRecord :: delete('PersonForTest');
@@ -292,19 +257,18 @@
$this->assertNull(lmbActiveRecord :: findFirst('PersonForTest', array('criteria' => 'id = ' . $person_id)));
$number2 = lmbActiveRecord :: findById('SocialSecurityForTest', $untouched_number->getId());
- $this->assertEqual($number2->getCode(), '0893127');
+ $this->assertEqual($number2->getCode(), $untouched_number->getCode());
}
function testParentRemovalWithNoCascadeDeleteChildren()
{
$person = new PersonForTestNoCascadeDelete();
$person->setName('Jim');
- $number = new SocialSecurityForTest();
- $number->setCode('099123');
-
+
+ $number = $this->creator->initSocialSecurity();
$person->setSocialSecurity($number);
-
$person_id = $person->save();
+
$this->assertTrue($number_id = $number->getId());
$person->destroy();
@@ -315,15 +279,10 @@
function testChildRemovalNullifyParentField()
{
- $number = new SocialSecurityForTest();
- $number->setCode('099123');
-
- $person = new PersonForTest();
- $person->setName('Jim');
-
+ $person = $this->creator->initPerson();
+ $number = $this->creator->initSocialSecurity();
$person->setSocialSecurity($number);
$number->setPerson($person);
- $person->setNumber($number);
$person->save();
$number->destroy();
@@ -334,8 +293,7 @@
function testChildRemovalWithRequiredObjectInParentRelationDefinitionThrowsValidationException()
{
- $number = new SocialSecurityForTest();
- $number->setCode('099123');
+ $number = $this->creator->initSocialSecurity();
$person = new PersonForTestWithRequiredSocialSecurity();
$person->setName('Jim');
@@ -361,11 +319,8 @@
function testSettingNullDetachesChildObject()
{
- $person = new PersonForTest();
- $person->setName('Jim');
- $number = new SocialSecurityForTest();
- $number->setCode('099123');
-
+ $person = $this->creator->initPerson();
+ $number = $this->creator->initSocialSecurity();
$person->setSocialSecurity($number);
$person->save();
@@ -381,10 +336,8 @@
function testDontResetParentIfChildImport()
{
- $person = new PersonForTest();
- $person->setName('Jim');
- $number = new SocialSecurityForTest();
- $number->setCode('099123');
+ $person = $this->creator->initPerson();
+ $number = $this->creator->initSocialSecurity();
$person->setSocialSecurity($number);
$person->save();
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARQueryTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARQueryTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARQueryTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -35,19 +35,19 @@
$person1 = $this->creator->createPerson();
$person2 = $this->creator->createPerson();
- $this->conn->reset();
+ $this->conn->resetQueries();
$query = new lmbARQuery('PersonForTest', $this->conn);
$query->join('social_security');
$iterator = $query->fetch();
$arr = $iterator->getArray();
- $this->assertEqual($this->conn->count(), 1);
+ $this->assertEqual($this->conn->countQueries(), 1);
//make sure we really eager fetching
$this->db->delete('social_security_for_test');
- $this->conn->reset();
+ $this->conn->resetQueries();
$this->assertIsA($arr[0], 'PersonForTest');
$this->assertEqual($arr[0]->getName(), $person1->getName());
@@ -59,7 +59,7 @@
$this->assertIsA($arr[1]->getSocialSecurity(), 'SocialSecurityForTest');
$this->assertEqual($arr[1]->getSocialSecurity()->getCode(), $person2->getSocialSecurity()->getCode());
- $this->assertEqual($this->conn->count(), 0);
+ $this->assertEqual($this->conn->countQueries(), 0);
}
function testFetch_Join_RelatedBelongsToObject()
@@ -69,19 +69,19 @@
$person2 = $this->creator->createPerson();
$ss2 = $person2->getSocialSecurity();
- $this->conn->reset();
+ $this->conn->resetQueries();
$query = new lmbARQuery('SocialSecurityForTest', $this->conn);
$query->join('person');
$iterator = $query->fetch();
$arr = $iterator->getArray();
- $this->assertEqual($this->conn->count(), 1);
+ $this->assertEqual($this->conn->countQueries(), 1);
//make sure we really eager fetching
$this->db->delete('person_for_test');
- $this->conn->reset();
+ $this->conn->resetQueries();
$this->assertIsA($arr[0], 'SocialSecurityForTest');
$this->assertEqual($arr[0]->getCode(), $ss1->getCode());
@@ -93,7 +93,7 @@
$this->assertIsA($arr[1]->getPerson(), 'PersonForTest');
$this->assertEqual($arr[1]->getPerson()->getName(), $person2->getName());
- $this->assertEqual($this->conn->count(), 0);
+ $this->assertEqual($this->conn->countQueries(), 0);
}
function testFetch_Join_RelatedManyBelongsToObject()
@@ -104,19 +104,19 @@
$lecture2 = $this->creator->createLecture($course1);
$lecture3 = $this->creator->createLecture($course2);
- $this->conn->reset();
+ $this->conn->resetQueries();
$query = new lmbARQuery('LectureForTest', $this->conn);
$query->join('course');
$iterator = $query->fetch();
$arr = $iterator->getArray();
- $this->assertEqual($this->conn->count(), 1);
+ $this->assertEqual($this->conn->countQueries(), 1);
//make sure we really eager fetching
$this->db->delete('course_for_test');
- $this->conn->reset();
+ $this->conn->resetQueries();
$this->assertIsA($arr[0], 'LectureForTest');
$this->assertEqual($arr[0]->getTitle(), $lecture1->getTitle());
@@ -133,7 +133,7 @@
$this->assertIsA($arr[2]->getCourse(), 'CourseForTest');
$this->assertEqual($arr[2]->getCourse()->getTitle(), $course2->getTitle());
- $this->assertEqual($this->conn->count(), 0);
+ $this->assertEqual($this->conn->countQueries(), 0);
}
function testFetch_Attach_RelatedHasOneObjects()
@@ -141,19 +141,19 @@
$person1 = $this->creator->createPerson();
$person2 = $this->creator->createPerson();
- $this->conn->reset();
+ $this->conn->resetQueries();
$query = new lmbARQuery('PersonForTest', $this->conn);
// note attach() has the same effect as join() but workds is a different way - it produces another sql request
$iterator = $query->attach('social_security')->fetch();
$arr = $iterator->getArray();
- $this->assertEqual($this->conn->count(), 2);
+ $this->assertEqual($this->conn->countQueries(), 2);
//make sure we really eager fetching
$this->db->delete('social_security_for_test');
- $this->conn->reset();
+ $this->conn->resetQueries();
$this->assertIsA($arr[0], 'PersonForTest');
$this->assertEqual($arr[0]->getName(), $person1->getName());
@@ -165,7 +165,7 @@
$this->assertIsA($arr[1]->getSocialSecurity(), 'SocialSecurityForTest');
$this->assertEqual($arr[1]->getSocialSecurity()->getCode(), $person2->getSocialSecurity()->getCode());
- $this->assertEqual($this->conn->count(), 0);
+ $this->assertEqual($this->conn->countQueries(), 0);
}
function testFetch_Attach_RelatedBelongsToObjects()
@@ -177,18 +177,18 @@
$this->db->delete('person_for_test', 'id = ' . $id);
- $this->conn->reset();
+ $this->conn->resetQueries();
$query = new lmbARQuery('SocialSecurityForTest', $this->conn);
// note attach() has the same effect as join() but workds is a different way - it produces another sql request
$arr = $query->attach('person')->fetch()->getArray();
- $this->assertEqual($this->conn->count(), 2);
+ $this->assertEqual($this->conn->countQueries(), 2);
//make sure we really eager fetching
$this->db->delete('person_for_test');
- $this->conn->reset();
+ $this->conn->resetQueries();
$this->assertIsA($arr[0], 'SocialSecurityForTest');
$this->assertEqual($arr[0]->getCode(), $person1->getSocialSecurity()->getCode());
@@ -200,7 +200,7 @@
$this->assertIsA($arr[1]->getPerson(), 'PersonForTest');
$this->assertEqual($arr[1]->getPerson()->getName(), $person2->getName());
- $this->assertEqual($this->conn->count(), 0);
+ $this->assertEqual($this->conn->countQueries(), 0);
}
function testFetch_Attach_RelatedManyBelongsToObjects()
@@ -214,17 +214,17 @@
$lecture2 = $this->creator->createLecture($course, $alt_course2);
$lecture3 = $this->creator->createLecture($course, $alt_course1);
- $this->conn->reset();
+ $this->conn->resetQueries();
$query = new lmbARQuery('LectureForTest', $this->conn);
$arr = $query->attach('course')->attach('alt_course')->fetch()->getArray();
- $this->assertEqual($this->conn->count(), 3);
+ $this->assertEqual($this->conn->countQueries(), 3);
//make sure we really eager fetching
$this->db->delete('course_for_test');
- $this->conn->reset();
+ $this->conn->resetQueries();
$this->assertIsA($arr[0], 'LectureForTest');
$this->assertEqual($arr[0]->getTitle(), $lecture1->getTitle());
@@ -247,7 +247,7 @@
$this->assertIsA($arr[2]->getAltCourse(), 'CourseForTest');
$this->assertEqual($arr[2]->getAltCourse()->getTitle(), $alt_course1->getTitle());
- $this->assertEqual($this->conn->count(), 0);
+ $this->assertEqual($this->conn->countQueries(), 0);
}
function testFetch_Attach_RelatedHasMany()
@@ -260,17 +260,17 @@
$lecture3 = $this->creator->createLecture($course1, null, 'AAA');
$lecture4 = $this->creator->createLecture($course1, null, 'BBB');
- $this->conn->reset();
+ $this->conn->resetQueries();
$query = new lmbARQuery('CourseForTest', $this->conn);
$arr = $query->attach('lectures', array('sort' => array('title' => 'ASC')))->fetch()->getArray();
- $this->assertEqual($this->conn->count(), 2);
+ $this->assertEqual($this->conn->countQueries(), 2);
//make sure we really eager fetching
$this->db->delete('lecture_for_test');
- $this->conn->reset();
+ $this->conn->resetQueries();
$this->assertIsA($arr[0], 'CourseForTest');
$this->assertEqual($arr[0]->getTitle(), $course1->getTitle());
@@ -290,7 +290,7 @@
$this->assertEqual($lectures[0]->getId(), $lecture2->getId());
$this->assertEqual($lectures[0]->getTitle(), 'CCC');
- $this->assertEqual($this->conn->count(), 0);
+ $this->assertEqual($this->conn->countQueries(), 0);
}
function testFetch_Attach_RelatedHasManyToMany()
@@ -306,18 +306,18 @@
$group2->setUsers(array($user2));
$group3->setUsers(array($user1));
- $this->conn->reset();
+ $this->conn->resetQueries();
$query = new lmbARQuery('UserForTest', $this->conn);
$arr = $query->attach('groups', array('sort' => array('title' => 'DESC')))->fetch()->getArray();
- $this->assertEqual($this->conn->count(), 2);
+ $this->assertEqual($this->conn->countQueries(), 2);
//make sure we really eager fetching
$this->db->delete('group_for_test');
$this->db->delete('user2group_for_test');
- $this->conn->reset();
+ $this->conn->resetQueries();
$this->assertIsA($arr[0], 'UserForTest');
$this->assertEqual($arr[0]->getFirstName(), $user1->getFirstName());
@@ -337,7 +337,7 @@
$this->assertEqual($groups[1]->getId(), $group1->getId());
$this->assertEqual($groups[1]->getTitle(), 'AAA');
- $this->assertEqual($this->conn->count(), 0);
+ $this->assertEqual($this->conn->countQueries(), 0);
}
function testFetch_NestedJoinProperty_In_Attach_ForHasMany()
@@ -353,19 +353,19 @@
$lecture3 = $this->creator->createLecture($course1, $alt_course2);
$lecture4 = $this->creator->createLecture($course1, $alt_course1);
- $this->conn->reset();
+ $this->conn->resetQueries();
$query = new lmbARQuery('CourseForTest', $this->conn);
$query->where(lmbSQLCriteria :: in('id', array($course1->getId(), $course2->getId())));
$arr = $query->attach('lectures', array('join' => 'alt_course'))->fetch()->getArray();
- $this->assertEqual($this->conn->count(), 2);
+ $this->assertEqual($this->conn->countQueries(), 2);
//make sure we really eager fetching
$this->db->delete('lecture_for_test');
$this->db->delete('course_for_test');
- $this->conn->reset();
+ $this->conn->resetQueries();
$this->assertIsA($arr[0], 'CourseForTest');
$this->assertEqual($arr[0]->getTitle(), $course1->getTitle());
@@ -386,7 +386,7 @@
$this->assertEqual($lectures[0]->getId(), $lecture2->getId());
$this->assertEqual($lectures[0]->getAltCourse()->getTitle(), $alt_course1->getTitle());
- $this->assertEqual($this->conn->count(), 0);
+ $this->assertEqual($this->conn->countQueries(), 0);
}
function testFetch_NestedAttachProperty_In_Join()
@@ -407,20 +407,20 @@
$lecture7 = $this->creator->createLecture($alt_course2);
$lecture8 = $this->creator->createLecture($alt_course1);
- $this->conn->reset();
+ $this->conn->resetQueries();
$query = new lmbARQuery('LectureForTest', $this->conn);
$query->where(lmbSQLCriteria :: equal('course_id', $course1->getId()));
$iterator = $query->join('alt_course', array('attach' => 'lectures'))->fetch();
$arr = $iterator->getArray();
- $this->assertEqual($this->conn->count(), 2);
+ $this->assertEqual($this->conn->countQueries(), 2);
//make sure we really eager fetching
$this->db->delete('lecture_for_test');
$this->db->delete('course_for_test');
- $this->conn->reset();
+ $this->conn->resetQueries();
$this->assertIsA($arr[0], 'LectureForTest');
$this->assertEqual($arr[0]->getTitle(), $lecture1->getTitle());
@@ -442,7 +442,7 @@
$this->assertEqual($alt_course_lectures[0]->getId(), $lecture6->getId());
$this->assertEqual($alt_course_lectures[1]->getId(), $lecture8->getId());
- $this->assertEqual($this->conn->count(), 0);
+ $this->assertEqual($this->conn->countQueries(), 0);
}
function testFetchNested_AttachProperty_In_JoinProperty_In_Attach()
@@ -463,19 +463,19 @@
$lecture7 = $this->creator->createLecture($alt_course2);
$lecture8 = $this->creator->createLecture($alt_course1);
- $this->conn->reset();
+ $this->conn->resetQueries();
$query = new lmbARQuery('CourseForTest', $this->conn);
$query->where(lmbSQLCriteria :: in('id', array($course1->getId(), $course2->getId())));
$arr = $query->attach('lectures', array('join' => array('alt_course' => array('attach' => 'lectures'))))->fetch()->getArray();
- $this->assertEqual($this->conn->count(), 3);
+ $this->assertEqual($this->conn->countQueries(), 3);
//make sure we really eager fetching
$this->db->delete('lecture_for_test');
$this->db->delete('course_for_test');
- $this->conn->reset();
+ $this->conn->resetQueries();
$this->assertIsA($arr[0], 'CourseForTest');
$this->assertEqual($arr[0]->getTitle(), $course1->getTitle());
@@ -510,7 +510,7 @@
$this->assertEqual($alt_course_lectures[0]->getId(), $lecture6->getId());
$this->assertEqual($alt_course_lectures[1]->getId(), $lecture8->getId());
- $this->assertEqual($this->conn->count(), 0);
+ $this->assertEqual($this->conn->countQueries(), 0);
}
function testFetch_NestedJoinProperty_In_Join()
@@ -522,20 +522,20 @@
$lecture1 = $this->creator->createLecture($course1);
$lecture2 = $this->creator->createLecture($course2);
- $this->conn->reset();
+ $this->conn->resetQueries();
$query = new lmbARQuery('LectureForTest', $this->conn);
$iterator = $query->join('course', array('join' => 'program'))->fetch();
$arr = $iterator->getArray();
- $this->assertEqual($this->conn->count(), 1);
+ $this->assertEqual($this->conn->countQueries(), 1);
//make sure we really eager fetching
$this->db->delete('lecture_for_test');
$this->db->delete('course_for_test');
$this->db->delete('program_for_test');
- $this->conn->reset();
+ $this->conn->resetQueries();
$this->assertIsA($arr[0], 'LectureForTest');
$this->assertEqual($arr[0]->getTitle(), $lecture1->getTitle());
@@ -547,7 +547,7 @@
$this->assertEqual($arr[0]->getCourse()->getProgram()->getTitle(), $program1->getTitle());
$this->assertEqual($arr[1]->getCourse()->getProgram()->getTitle(), $program2->getTitle());
- $this->assertEqual($this->conn->count(), 0);
+ $this->assertEqual($this->conn->countQueries(), 0);
}
function testFetch_NestedAttachProperty_In_Attach()
@@ -567,21 +567,21 @@
$lecture7 = $this->creator->createLecture($course3);
$lecture8 = $this->creator->createLecture($course4);
- $this->conn->reset();
+ $this->conn->resetQueries();
$query = new lmbARQuery('ProgramForTest', $this->conn);
$iterator = $query->attach('courses', array('attach' => 'lectures'))->fetch();
$arr = $iterator->getArray();
- $this->assertEqual($this->conn->count(), 3);
+ $this->assertEqual($this->conn->countQueries(), 3);
//make sure we really eager fetching
$this->db->delete('lecture_for_test');
$this->db->delete('course_for_test');
$this->db->delete('program_for_test');
- $this->conn->reset();
+ $this->conn->resetQueries();
$this->assertIsA($arr[0], 'ProgramForTest');
$this->assertEqual($arr[0]->getTitle(), $program1->getTitle());
@@ -612,7 +612,7 @@
$this->assertEqual($lectures[0]->getTitle(), $lecture4->getTitle());
$this->assertEqual($lectures[1]->getTitle(), $lecture8->getTitle());
- $this->assertEqual($this->conn->count(), 0);
+ $this->assertEqual($this->conn->countQueries(), 0);
}
}
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARRecordSetDecoratorTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARRecordSetDecoratorTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARRecordSetDecoratorTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -9,24 +9,10 @@
require_once('limb/active_record/src/lmbARRecordSetDecorator.class.php');
require_once(dirname(__FILE__) . '/lmbAROneToManyRelationsTest.class.php');
-class lmbARRecordSetDecoratorTest extends UnitTestCase
+class lmbARRecordSetDecoratorTest extends lmbARBaseTestCase
{
- function setUp()
- {
- $this->_dbCleanUp();
- }
-
- function tearDown()
- {
- $this->_dbCleanUp();
- }
-
- function _dbCleanUp()
- {
- lmbActiveRecord :: delete('CourseForTest');
- lmbActiveRecord :: delete('LectureForTest');
- }
-
+ protected $tables_to_cleanup = array('lecture_for_test', 'course_for_test');
+
function testCreateActiveRecordFromCurrentRecord()
{
$course = $this->_createCourseWithTwoLectures();
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARRecordSetJoinDecoratorTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARRecordSetJoinDecoratorTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARRecordSetJoinDecoratorTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -9,24 +9,10 @@
require_once('limb/active_record/src/lmbARRecordSetJoinDecorator.class.php');
require_once(dirname(__FILE__) . '/lmbAROneToManyRelationsTest.class.php');
-class lmbARRecordSetJoinDecoratorTest extends UnitTestCase
+class lmbARRecordSetJoinDecoratorTest extends lmbARBaseTestCase
{
- function setUp()
- {
- $this->_dbCleanUp();
- }
-
- function tearDown()
- {
- $this->_dbCleanUp();
- }
-
- function _dbCleanUp()
- {
- lmbActiveRecord :: delete('CourseForTest');
- lmbActiveRecord :: delete('LectureForTest');
- }
-
+ protected $tables_to_cleanup = array('lecture_for_test', 'course_for_test');
+
function testProcessPrefixedFieldsAsRelatedActiveRecords()
{
$course = $this->_createCourseWithTwoLectures();
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARSubclassingTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARSubclassingTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARSubclassingTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -34,28 +34,10 @@
'class' => 'FooLectureForTest'));
}
-class lmbARSubclassingTest extends UnitTestCase
+class lmbARSubclassingTest extends lmbARBaseTestCase
{
- protected $db;
+ protected $tables_to_cleanup = array('lecture_for_typed_test', 'course_for_typed_test', 'test_one_table_typed_object');
- function setUp()
- {
- $this->db = new lmbSimpleDb(lmbToolkit :: instance()->getDefaultDbConnection());
- $this->_dbCleanUp();
- }
-
- function tearDown()
- {
- $this->_dbCleanUp();
- }
-
- function _dbCleanUp()
- {
- $this->db->delete('lecture_for_typed_test');
- $this->db->delete('course_for_typed_test');
- $this->db->delete('test_one_table_typed_object');
- }
-
function testCreate()
{
$object1 = new FooOneTableTestObject();
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARTestingObjectMother.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARTestingObjectMother.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARTestingObjectMother.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -134,10 +134,16 @@
return $object;
}
- function createPerson()
+ function initPerson()
{
$person = new PersonForTest();
$person->setName('Person_' . rand(0, 1000));
+ return $person;
+ }
+
+ function createPerson()
+ {
+ $person = $this->initPerson();
$number = $this->createSocialSecurity($person);
$person->setSocialSecurity($number);
@@ -145,10 +151,16 @@
return $person;
}
- function createSocialSecurity($person)
+ function initSocialSecurity()
{
$number = new SocialSecurityForTest();
$number->setCode(rand(0,1000));
+ return $number;
+ }
+
+ function createSocialSecurity($person)
+ {
+ $number = $this->initSocialSecurity();
$number->setPerson($person);
return $number;
}
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARTransactionTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARTransactionTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARTransactionTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -20,26 +20,10 @@
}
}
-class lmbARTransactionTest extends UnitTestCase
+class lmbARTransactionTest extends lmbARBaseTestCase
{
- function setUp()
- {
- $this->conn = lmbToolkit :: instance()->getDefaultDbConnection();
- $this->db = new lmbSimpleDb($this->conn);
-
- $this->_cleanUp();
- }
-
- function tearDown()
- {
- $this->_cleanUp();
- }
-
- function _cleanUp()
- {
- $this->db->delete('test_one_table_object');
- }
-
+ protected $tables_to_cleanup = array('test_one_table_object');
+
function testSaveInTransaction()
{
$this->conn->beginTransaction();
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARValidationTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARValidationTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARValidationTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -39,30 +39,10 @@
}
}
-class lmbARValidationTest extends UnitTestCase
+class lmbARValidationTest extends lmbARBaseTestCase
{
- protected $db = null;
-
- function setUp()
- {
- $toolkit = lmbToolkit :: save();
- $this->db = new lmbSimpleDb($toolkit->getDefaultDbConnection());
-
- $this->_cleanUp();
- }
-
- function tearDown()
- {
- $this->_cleanUp();
-
- lmbToolkit :: restore();
- }
-
- function _cleanUp()
- {
- $this->db->delete('test_one_table_object');
- }
-
+ protected $tables_to_cleanup = array('test_one_table_object');
+
function testGetErrorListReturnDefaultErrorList()
{
$object = $this->_createActiveRecord();
Modified: 3.x/trunk/limb/active_record/tests/cases/lmbARValueObjectTest.class.php
===================================================================
--- 3.x/trunk/limb/active_record/tests/cases/lmbARValueObjectTest.class.php 2008-01-18 11:28:58 UTC (rev 6702)
+++ 3.x/trunk/limb/active_record/tests/cases/lmbARValueObjectTest.class.php 2008-01-18 11:29:17 UTC (rev 6703)
@@ -68,23 +68,10 @@
}
-class lmbARValueObjectTest extends UnitTestCase
+class lmbARValueObjectTest extends lmbARBaseTestCase
{
- function setUp()
- {
- $this->_dbCleanUp();
- }
-
- function tearDown()
- {
- $this->_dbCleanUp();
- }
-
- function _dbCleanUp()
- {
- lmbActiveRecord :: delete('LessonForTest');
- }
-
+ protected $tables_to_cleanup = array('lesson_for_test');
+
function testNewObjectReturnsNullValueObjects()
{
$lesson = new LessonForTest();
More information about the limb-svn
mailing list