From 70e305a918fcf193009831d4e89aa8c386df3dc4 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 29 Mar 2016 09:24:08 +0200 Subject: Ported / fixed most old tests --- .../ActiveRecord/ActiveRecordDynamicCallTest.php | 19 +- .../Data/ActiveRecord/ActiveRecordFinderTest.php | 8 +- .../Data/ActiveRecord/ActiveRecordMySql5Test.php | 4 +- .../Data/ActiveRecord/BaseActiveRecordTest.php | 22 +- tests/unit/Data/ActiveRecord/CountRecordsTest.php | 10 +- tests/unit/Data/ActiveRecord/CriteriaTest.php | 18 +- tests/unit/Data/ActiveRecord/DeleteByPkTest.php | 14 +- tests/unit/Data/ActiveRecord/FindByPksTest.php | 26 +- tests/unit/Data/ActiveRecord/FindBySqlTest.php | 20 +- tests/unit/Data/ActiveRecord/ForeignKeyTest.php | 95 +++--- .../Data/ActiveRecord/ForeignObjectUpdateTest.php | 64 ++-- .../Data/ActiveRecord/MultipleForeignKeyTest.php | 71 ++--- tests/unit/Data/ActiveRecord/RecordEventTest.php | 14 +- tests/unit/Data/ActiveRecord/SqliteTest.php | 22 -- tests/unit/Data/ActiveRecord/UserRecordTest.php | 4 +- tests/unit/Data/ActiveRecord/ViewRecordTest.php | 78 ----- .../unit/Data/ActiveRecord/records/ItemRecord.php | 2 +- .../unit/Data/DbCommon/CommandBuilderMssqlTest.php | 10 +- .../unit/Data/DbCommon/CommandBuilderMysqlTest.php | 20 -- .../unit/Data/DbCommon/CommandBuilderPgsqlTest.php | 23 +- tests/unit/Data/DbCommon/MssqlColumnTest.php | 9 + tests/unit/Data/DbCommon/Mysql4ColumnTest.php | 255 --------------- tests/unit/Data/DbCommon/MysqlColumnTest.php | 19 +- tests/unit/Data/DbCommon/PgsqlColumnTest.php | 21 +- tests/unit/Data/SqlMap/ActiveRecordSqlMapTest.php | 32 +- tests/unit/Data/SqlMap/BaseCase.php | 54 ++-- tests/unit/Data/SqlMap/CacheTest.php | 14 +- tests/unit/Data/SqlMap/DelegateTest.php | 24 +- tests/unit/Data/SqlMap/DynamicParameterTest.php | 2 +- tests/unit/Data/SqlMap/GroupByTest.php | 13 +- tests/unit/Data/SqlMap/InheritanceTest.php | 22 +- tests/unit/Data/SqlMap/ParameterMapTest.php | 12 +- tests/unit/Data/SqlMap/PropertyAccessTest.php | 20 +- tests/unit/Data/SqlMap/ResultClassTest.php | 48 +-- tests/unit/Data/SqlMap/ResultMapTest.php | 48 +-- tests/unit/Data/SqlMap/SelectKeyTest.php | 16 +- tests/unit/Data/SqlMap/SqlMapCacheTest.php | 7 +- tests/unit/Data/SqlMap/StatementExtendsTest.php | 8 +- tests/unit/Data/SqlMap/StatementTest.php | 348 ++++++++++----------- tests/unit/Data/SqlMap/TestQueryForMap.php | 12 +- tests/unit/Data/SqlMap/Ticket589Test.php | 2 +- tests/unit/Data/SqlMap/common.php | 4 +- tests/unit/Data/SqlMap/fixtures/mysql5_reset.sql | 22 -- tests/unit/Data/SqlMap/fixtures/mysql5_setup.sql | 22 -- tests/unit/Data/SqlMap/queryForListLimitTest.php | 14 +- tests/unit/Data/TableGateway/BaseGateway.php | 96 ++++++ tests/unit/Data/TableGateway/BaseGatewayTest.php | 96 ------ tests/unit/Data/TableGateway/CountTest.php | 8 +- tests/unit/Data/TableGateway/MagicCallTest.php | 10 +- .../TableGateway/TableGatewayDeleteByPkTest.php | 12 +- .../Data/TableGateway/TableGatewayPgsqlTest.php | 20 +- .../Data/TableGateway/TableInfoGatewayTest.php | 6 +- tests/unit/Data/TableGateway/TestFindByPk.php | 10 +- 53 files changed, 702 insertions(+), 1148 deletions(-) delete mode 100644 tests/unit/Data/ActiveRecord/SqliteTest.php delete mode 100644 tests/unit/Data/ActiveRecord/ViewRecordTest.php delete mode 100644 tests/unit/Data/DbCommon/CommandBuilderMysqlTest.php delete mode 100644 tests/unit/Data/DbCommon/Mysql4ColumnTest.php delete mode 100644 tests/unit/Data/SqlMap/fixtures/mysql5_reset.sql delete mode 100644 tests/unit/Data/SqlMap/fixtures/mysql5_setup.sql create mode 100644 tests/unit/Data/TableGateway/BaseGateway.php delete mode 100644 tests/unit/Data/TableGateway/BaseGatewayTest.php (limited to 'tests/unit/Data') diff --git a/tests/unit/Data/ActiveRecord/ActiveRecordDynamicCallTest.php b/tests/unit/Data/ActiveRecord/ActiveRecordDynamicCallTest.php index 1bf98415..8c6b9789 100644 --- a/tests/unit/Data/ActiveRecord/ActiveRecordDynamicCallTest.php +++ b/tests/unit/Data/ActiveRecord/ActiveRecordDynamicCallTest.php @@ -10,7 +10,7 @@ class ActiveRecordDynamicCallTest extends PHPUnit_Framework_TestCase { function setup() { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); TActiveRecordManager::getInstance()->setDbConnection($conn); } @@ -45,22 +45,31 @@ class ActiveRecordDynamicCallTest extends PHPUnit_Framework_TestCase } catch(TDbException $e) { - $this->pass(); + return; } + $this->fail(); } function test_dynamic_call_extras_parameters_ok() { $finder = DepartmentRecord::finder(); - $rs = $finder->findByNameAndActive('Marketing',true,true); - $this->assertNotNull($rs); + try + { + $rs = $finder->findByNameAndActive('Marketing',true,true); + $this->fail(); + } + catch(TDbException $e) + { + return; + } + $this->fail(); } function test_dynamic_delete_by() { $finder = DepartmentRecord::finder(); //$finder->RecordManager->OnDelete[] = array($this, 'assertDeleteSql'); - $this->assertEqual($finder->deleteByName('tasds'), 0); + $this->assertEquals($finder->deleteByName('tasds'), 0); } function assertDeleteSql($sender, $param) diff --git a/tests/unit/Data/ActiveRecord/ActiveRecordFinderTest.php b/tests/unit/Data/ActiveRecord/ActiveRecordFinderTest.php index 2209fc6a..f0aae0b8 100644 --- a/tests/unit/Data/ActiveRecord/ActiveRecordFinderTest.php +++ b/tests/unit/Data/ActiveRecord/ActiveRecordFinderTest.php @@ -9,7 +9,7 @@ class ActiveRecordFinderTest extends PHPUnit_Framework_TestCase { function setup() { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); TActiveRecordManager::getInstance()->setDbConnection($conn); } @@ -28,18 +28,18 @@ class ActiveRecordFinderTest extends PHPUnit_Framework_TestCase function test_find_by_sql_returns_iterator() { $deps = DepartmentRecord::finder()->findAll('department_id < :id', array('id'=>5)); - $this->assertEqual(count($deps),4); + $this->assertEquals(count($deps),4); } function test_find_by_multiple_parameters() { - $department = DepartmentRecord::finder()->find('department_id < ? AND "order" > ?', 5,2); + $department = DepartmentRecord::finder()->find('department_id < ? AND `order` > ?', 5,2); $this->assertNotNull($department); } function test_find_by_array_parameter() { - $department = DepartmentRecord::finder()->find('department_id < ? AND "order" > ?', array(5,2)); + $department = DepartmentRecord::finder()->find('department_id < ? AND `order` > ?', array(5,2)); $this->assertNotNull($department); } diff --git a/tests/unit/Data/ActiveRecord/ActiveRecordMySql5Test.php b/tests/unit/Data/ActiveRecord/ActiveRecordMySql5Test.php index 31cbed5c..622e5977 100644 --- a/tests/unit/Data/ActiveRecord/ActiveRecordMySql5Test.php +++ b/tests/unit/Data/ActiveRecord/ActiveRecordMySql5Test.php @@ -9,7 +9,7 @@ class ActiveRecordMySql5Test extends PHPUnit_Framework_TestCase { function setup() { - $conn = new TDbConnection('mysql:host=localhost;dbname=ar_test;port=3307', 'test5','test5'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); TActiveRecordManager::getInstance()->setDbConnection($conn); } @@ -42,7 +42,7 @@ class ActiveRecordMySql5Test extends PHPUnit_Framework_TestCase { $props = array('blog_id', 'blog_name', 'blog_author'); foreach($props as $prop) - $this->assertEqual($check->{$prop}, $blog->{$prop}); + $this->assertEquals($check->{$prop}, $blog->{$prop}); } } \ No newline at end of file diff --git a/tests/unit/Data/ActiveRecord/BaseActiveRecordTest.php b/tests/unit/Data/ActiveRecord/BaseActiveRecordTest.php index 258fe70c..e39bdc87 100644 --- a/tests/unit/Data/ActiveRecord/BaseActiveRecordTest.php +++ b/tests/unit/Data/ActiveRecord/BaseActiveRecordTest.php @@ -1,34 +1,20 @@ assertIdentical($obj1,$obj2); - } - - function test_finder_throw_exception_when_save() - { - $obj = TActiveRecord::finder('BaseRecordTest'); - try - { - $obj->save(); - $this->fail(); - } - catch(TActiveRecordException $e) - { - $this->pass(); - } + $this->assertSame($obj1,$obj2); } } diff --git a/tests/unit/Data/ActiveRecord/CountRecordsTest.php b/tests/unit/Data/ActiveRecord/CountRecordsTest.php index b97f83ed..bd68393e 100644 --- a/tests/unit/Data/ActiveRecord/CountRecordsTest.php +++ b/tests/unit/Data/ActiveRecord/CountRecordsTest.php @@ -10,27 +10,27 @@ class CountRecordsTest extends PHPUnit_Framework_TestCase { function setup() { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); TActiveRecordManager::getInstance()->setDbConnection($conn); } function test_count() { $finder = DepartmentRecord::finder(); - $count = $finder->count('"order" > ?', 2); + $count = $finder->count('`order` > ?', 2); $this->assertTrue($count > 0); } function test_count_zero() { $finder = DepartmentRecord::finder(); - $count = $finder->count('"order" > ?', 11); - $this->assertEqual($count,0); + $count = $finder->count('`order` > ?', 11); + $this->assertEquals($count,0); } function test_count_without_parameter() { $finder = DepartmentRecord::finder(); - $this->assertEqual($finder->count(), 8); + $this->assertEquals($finder->count(), 8); } } diff --git a/tests/unit/Data/ActiveRecord/CriteriaTest.php b/tests/unit/Data/ActiveRecord/CriteriaTest.php index 3c4c15d7..778d2ea7 100644 --- a/tests/unit/Data/ActiveRecord/CriteriaTest.php +++ b/tests/unit/Data/ActiveRecord/CriteriaTest.php @@ -11,7 +11,7 @@ class CriteriaTest extends PHPUnit_Framework_TestCase { function setup() { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); TActiveRecordManager::getInstance()->setDbConnection($conn); } @@ -20,9 +20,9 @@ class CriteriaTest extends PHPUnit_Framework_TestCase $criteria = new TActiveRecordCriteria; $criteria->OrdersBy['name'] = 'asc'; $records = DepartmentRecord::finder()->findAll($criteria); - $this->assertEqual(count($records), 8); - $this->assertEqual($records[0]->name, '+GX Service'); - $this->assertEqual($records[7]->name, 'Marketing'); + $this->assertEquals(count($records), 8); + $this->assertEquals($records[0]->name, '+GX Service'); + $this->assertEquals($records[7]->name, 'Services'); } function test_orderby_only_desc() @@ -30,22 +30,22 @@ class CriteriaTest extends PHPUnit_Framework_TestCase $criteria = new TActiveRecordCriteria; $criteria->OrdersBy['name'] = 'desc'; $records = DepartmentRecord::finder()->findAll($criteria); - $this->assertEqual(count($records), 8); - $this->assertEqual($records[7]->name, '+GX Service'); - $this->assertEqual($records[0]->name, 'Marketing'); + $this->assertEquals(count($records), 8); + $this->assertEquals($records[7]->name, '+GX Service'); + $this->assertEquals($records[0]->name, 'Services'); } function test_criteria_parameters() { $criteria = new TActiveRecordCriteria('sql', "One", "two", 3); $expect = array("One", "two", 3); - $this->assertEqual($criteria->getParameters()->toArray(), $expect); + $this->assertEquals($criteria->getParameters()->toArray(), $expect); } function test_criteria_parameters_array() { $expect = array("One", "two", 3); $criteria = new TActiveRecordCriteria('sql', $expect); - $this->assertEqual($criteria->getParameters()->toArray(), $expect); + $this->assertEquals($criteria->getParameters()->toArray(), $expect); } } diff --git a/tests/unit/Data/ActiveRecord/DeleteByPkTest.php b/tests/unit/Data/ActiveRecord/DeleteByPkTest.php index 2f2c09c9..10be32a6 100644 --- a/tests/unit/Data/ActiveRecord/DeleteByPkTest.php +++ b/tests/unit/Data/ActiveRecord/DeleteByPkTest.php @@ -11,23 +11,23 @@ class DeleteByPkTest extends PHPUnit_Framework_TestCase { function setup() { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); TActiveRecordManager::getInstance()->setDbConnection($conn); } function test_delete_by_pks() { $finder = DepartmentRecord::finder(); - $this->assertEqual($finder->deleteByPk(100),0); - $this->assertEqual($finder->deleteByPk(100, 101),0); - $this->assertEqual($finder->deleteByPk(array(100, 101)),0); + $this->assertEquals($finder->deleteByPk(100),0); + $this->assertEquals($finder->deleteByPk(100, 101),0); + $this->assertEquals($finder->deleteByPk(array(100, 101)),0); } function test_delete_by_composite_pks() { $finder = DepSections::finder(); - $this->assertEqual($finder->deleteByPk(array(100,101)),0); - $this->assertEqual($finder->deleteByPk(array(100, 101), array(102, 103)),0); - $this->assertEqual($finder->deleteByPk(array(array(100, 101), array(102, 103))),0); + $this->assertEquals($finder->deleteByPk(array(100,101)),0); + $this->assertEquals($finder->deleteByPk(array(100, 101), array(102, 103)),0); + $this->assertEquals($finder->deleteByPk(array(array(100, 101), array(102, 103))),0); } } \ No newline at end of file diff --git a/tests/unit/Data/ActiveRecord/FindByPksTest.php b/tests/unit/Data/ActiveRecord/FindByPksTest.php index 8235352c..b0e9cf93 100644 --- a/tests/unit/Data/ActiveRecord/FindByPksTest.php +++ b/tests/unit/Data/ActiveRecord/FindByPksTest.php @@ -10,7 +10,7 @@ class FindByPksTest extends PHPUnit_Framework_TestCase { function setup() { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); TActiveRecordManager::getInstance()->setDbConnection($conn); } @@ -18,39 +18,39 @@ class FindByPksTest extends PHPUnit_Framework_TestCase { $dep = DepartmentRecord::finder()->findByPk(1); $this->assertNotNull($dep); - $this->assertEqual($dep->department_id, 1); + $this->assertEquals($dep->department_id, 1); } function test_find_by_1pk_array() { $dep = DepartmentRecord::finder()->findByPk(array(1)); $this->assertNotNull($dep); - $this->assertEqual($dep->department_id, 1); + $this->assertEquals($dep->department_id, 1); } function test_find_by_pks() { $deps = DepartmentRecord::finder()->findAllByPks(1,2,4); - $this->assertEqual(count($deps), 3); + $this->assertEquals(count($deps), 3); - $this->assertEqual($deps[0]->department_id, 1); - $this->assertEqual($deps[1]->department_id, 2); - $this->assertEqual($deps[2]->department_id, 4); + $this->assertEquals($deps[0]->department_id, 1); + $this->assertEquals($deps[1]->department_id, 2); + $this->assertEquals($deps[2]->department_id, 4); } function test_find_by_pks_with_invalid() { $deps = DepartmentRecord::finder()->findAllByPks(4,2,14); - $this->assertEqual(count($deps), 2); + $this->assertEquals(count($deps), 2); - $this->assertEqual($deps[0]->department_id, 2); - $this->assertEqual($deps[1]->department_id, 4); + $this->assertEquals($deps[0]->department_id, 2); + $this->assertEquals($deps[1]->department_id, 4); } function test_find_by_composite_pks() { $ds = DepSections::finder()->findAllByPks(array(1,1), array(2,5)); - $this->assertEqual(count($ds), 2); + $this->assertEquals(count($ds), 2); $this->assertIsDepSection($ds[0], 1, 1); $this->assertIsDepSection($ds[1], 2, 5); @@ -59,7 +59,7 @@ class FindByPksTest extends PHPUnit_Framework_TestCase function assertIsDepSection($dep, $dep_id, $sec_id) { $this->assertTrue($dep instanceof DepSections); - $this->assertEqual($dep->department_id, $dep_id); - $this->assertEqual($dep->section_id, $sec_id); + $this->assertEquals($dep->department_id, $dep_id); + $this->assertEquals($dep->section_id, $sec_id); } } diff --git a/tests/unit/Data/ActiveRecord/FindBySqlTest.php b/tests/unit/Data/ActiveRecord/FindBySqlTest.php index 98113b06..b8020d7e 100644 --- a/tests/unit/Data/ActiveRecord/FindBySqlTest.php +++ b/tests/unit/Data/ActiveRecord/FindBySqlTest.php @@ -3,9 +3,6 @@ Prado::using('System.Data.ActiveRecord.TActiveRecord'); require_once(dirname(__FILE__).'/records/DepartmentRecord.php'); require_once(dirname(__FILE__).'/records/UserRecord.php'); -/** - * @package System.Data.ActiveRecord - */ class UserRecord2 extends UserRecord { public $another_value; @@ -19,11 +16,14 @@ class SqlTest extends TActiveRecord const TABLE='items'; } +/** + * @package System.Data.ActiveRecord + */ class FindBySqlTest extends PHPUnit_Framework_TestCase { function setup() { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); TActiveRecordManager::getInstance()->setDbConnection($conn); } @@ -32,16 +32,4 @@ class FindBySqlTest extends PHPUnit_Framework_TestCase $deps = DepartmentRecord::finder()->findBySql('SELECT * FROM departments'); $this->assertTrue(count($deps) > 0); } - - function test_find_by_sql_arb() - { - $sql = 'SELECT c.name as category, i.name as item - FROM items i, categories c - WHERE i.category_id = c.category_id LIMIT 2'; - $items = TActiveRecord::finder('SqlTest')->findBySql($sql); - - $sql = "SELECT users.*, 'hello' as another_value FROM users LIMIT 2"; - $users = TActiveRecord::finder('UserRecord2')->findBySql($sql); - var_dump($users); - } } diff --git a/tests/unit/Data/ActiveRecord/ForeignKeyTest.php b/tests/unit/Data/ActiveRecord/ForeignKeyTest.php index 99c8b527..58a6e468 100644 --- a/tests/unit/Data/ActiveRecord/ForeignKeyTest.php +++ b/tests/unit/Data/ActiveRecord/ForeignKeyTest.php @@ -3,9 +3,6 @@ Prado::using('System.Data.ActiveRecord.TActiveRecord'); require_once(dirname(__FILE__).'/records/ItemRecord.php'); -/** - * @package System.Data.ActiveRecord - */ abstract class SqliteRecord extends TActiveRecord { protected static $conn; @@ -80,97 +77,85 @@ class Cover extends SqliteRecord public $content; } +/** + * @package System.Data.ActiveRecord + */ class ForeignKeyTest extends PHPUnit_Framework_TestCase { function test_has_many() { $albums = Album::finder()->withTracks()->findAll(); - $this->assertEqual(count($albums), 2); + $this->assertEquals(count($albums), 2); - $this->assertEqual($albums[0]->title, 'Album 1'); - $this->assertEqual($albums[1]->title, 'Album 2'); + $this->assertEquals($albums[0]->title, 'Album 1'); + $this->assertEquals($albums[1]->title, 'Album 2'); - $this->assertEqual(count($albums[0]->Artists), 0); - $this->assertEqual(count($albums[1]->Artists), 0); + $this->assertEquals(count($albums[0]->Artists), 0); + $this->assertEquals(count($albums[1]->Artists), 0); - $this->assertEqual(count($albums[0]->Tracks), 3); - $this->assertEqual(count($albums[1]->Tracks), 2); + $this->assertEquals(count($albums[0]->Tracks), 3); + $this->assertEquals(count($albums[1]->Tracks), 2); - $this->assertEqual($albums[0]->Tracks[0]->song_name, 'Track 1'); - $this->assertEqual($albums[0]->Tracks[1]->song_name, 'Song 2'); - $this->assertEqual($albums[0]->Tracks[2]->song_name, 'Song 3'); + $this->assertEquals($albums[0]->Tracks[0]->song_name, 'Track 1'); + $this->assertEquals($albums[0]->Tracks[1]->song_name, 'Song 2'); + $this->assertEquals($albums[0]->Tracks[2]->song_name, 'Song 3'); - $this->assertEqual($albums[1]->Tracks[0]->song_name, 'Track A'); - $this->assertEqual($albums[1]->Tracks[1]->song_name, 'Track B'); + $this->assertEquals($albums[1]->Tracks[0]->song_name, 'Track A'); + $this->assertEquals($albums[1]->Tracks[1]->song_name, 'Track B'); } function test_has_one() { $albums = Album::finder()->with_cover()->findAll(); - $this->assertEqual(count($albums), 2); + $this->assertEquals(count($albums), 2); - $this->assertEqual($albums[0]->title, 'Album 1'); - $this->assertEqual($albums[1]->title, 'Album 2'); + $this->assertEquals($albums[0]->title, 'Album 1'); + $this->assertEquals($albums[1]->title, 'Album 2'); - $this->assertEqual($albums[0]->cover->content, 'lalala'); - $this->assertEqual($albums[1]->cover->content, 'conver content'); + $this->assertEquals($albums[0]->cover->content, 'lalala'); + $this->assertEquals($albums[1]->cover->content, 'conver content'); - $this->assertEqual(count($albums[0]->Artists), 0); - $this->assertEqual(count($albums[1]->Artists), 0); + $this->assertEquals(count($albums[0]->Artists), 0); + $this->assertEquals(count($albums[1]->Artists), 0); - $this->assertEqual(count($albums[0]->Tracks), 0); - $this->assertEqual(count($albums[1]->Tracks), 0); + $this->assertEquals(count($albums[0]->Tracks), 0); + $this->assertEquals(count($albums[1]->Tracks), 0); } function test_belongs_to() { $track = Track::finder()->withAlbum()->find('id = ?', 1); - $this->assertEqual($track->id, "1"); - $this->assertEqual($track->song_name, "Track 1"); - $this->assertEqual($track->Album->title, "Album 1"); + $this->assertEquals($track->id, "1"); + $this->assertEquals($track->song_name, "Track 1"); + $this->assertEquals($track->Album->title, "Album 1"); } function test_has_many_associate() { $album = Album::finder()->withArtists()->find('title = ?', 'Album 2'); - $this->assertEqual($album->title, 'Album 2'); - $this->assertEqual(count($album->Artists), 3); + $this->assertEquals($album->title, 'Album 2'); + $this->assertEquals(count($album->Artists), 3); - $this->assertEqual($album->Artists[0]->name, 'Dan'); - $this->assertEqual($album->Artists[1]->name, 'Karl'); - $this->assertEqual($album->Artists[2]->name, 'Tom'); + $this->assertEquals($album->Artists[0]->name, 'Dan'); + $this->assertEquals($album->Artists[1]->name, 'Karl'); + $this->assertEquals($album->Artists[2]->name, 'Tom'); } function test_multiple_fk() { $album = Album::finder()->withArtists()->withTracks()->with_cover()->find('title = ?', 'Album 1'); - $this->assertEqual($album->title, 'Album 1'); - $this->assertEqual(count($album->Artists), 2); + $this->assertEquals($album->title, 'Album 1'); + $this->assertEquals(count($album->Artists), 2); - $this->assertEqual($album->Artists[0]->name, 'Dan'); - $this->assertEqual($album->Artists[1]->name, 'Jenny'); + $this->assertEquals($album->Artists[0]->name, 'Dan'); + $this->assertEquals($album->Artists[1]->name, 'Jenny'); - $this->assertEqual($album->Tracks[0]->song_name, 'Track 1'); - $this->assertEqual($album->Tracks[1]->song_name, 'Song 2'); - $this->assertEqual($album->Tracks[2]->song_name, 'Song 3'); + $this->assertEquals($album->Tracks[0]->song_name, 'Track 1'); + $this->assertEquals($album->Tracks[1]->song_name, 'Song 2'); + $this->assertEquals($album->Tracks[2]->song_name, 'Song 3'); - $this->assertEqual($album->cover->content, 'lalala'); + $this->assertEquals($album->cover->content, 'lalala'); } - - function test_self_reference_fk() - { - $item = ItemRecord::finder()->withRelated_Items()->findByPk(1); - $this->assertNotNull($item); - $this->assertEqual($item->name, "Professional Work Attire"); - - $this->assertEqual(count($item->related_items),2); - $this->assertEqual($item->related_items[0]->name, "Nametags"); - $this->assertEqual($item->related_items[0]->item_id, 2); - - $this->assertEqual($item->related_items[1]->name, "Grooming and Hygiene"); - $this->assertEqual($item->related_items[1]->item_id, 3); - } - } diff --git a/tests/unit/Data/ActiveRecord/ForeignObjectUpdateTest.php b/tests/unit/Data/ActiveRecord/ForeignObjectUpdateTest.php index 8b9d0673..a4790d69 100644 --- a/tests/unit/Data/ActiveRecord/ForeignObjectUpdateTest.php +++ b/tests/unit/Data/ActiveRecord/ForeignObjectUpdateTest.php @@ -1,9 +1,6 @@ OnExecuteCommand[] = array($this,'logger'); } return $conn; @@ -122,10 +119,11 @@ class SkillRecord extends BaseFkRecord { return parent::finder($className); } - - } +/** + * @package System.Data.ActiveRecord + */ class ForeignObjectUpdateTest extends PHPUnit_Framework_TestCase { function test_add_has_one() @@ -138,15 +136,15 @@ class ForeignObjectUpdateTest extends PHPUnit_Framework_TestCase //test insert $player2 = PlayerRecord::finder()->withProfile()->findByPk(3); - $this->assertEqual($player2->profile->salary,50000); + $this->assertEquals($player2->profile->salary,50000); $player2->profile->salary = 45000; $player2->save(); - $this->assertEqual($player2->profile->salary,45000); + $this->assertEquals($player2->profile->salary,45000); //test update $player3 = PlayerRecord::finder()->withProfile()->findByPk(3); - $this->assertEqual($player3->profile->salary,45000); + $this->assertEquals($player3->profile->salary,45000); } function test_add_many() @@ -160,27 +158,27 @@ class ForeignObjectUpdateTest extends PHPUnit_Framework_TestCase //test insert $team1 = TeamRecord::finder()->withPlayers()->findByPk('Team b'); - $this->assertEqual(count($team1->players),3); - $this->assertEqual($team1->players[0]->age, 18); - $this->assertEqual($team1->players[1]->age, 20); - $this->assertEqual($team1->players[2]->age, 25); + $this->assertEquals(count($team1->players),3); + $this->assertEquals($team1->players[0]->age, 18); + $this->assertEquals($team1->players[1]->age, 20); + $this->assertEquals($team1->players[2]->age, 25); //test update $team1->players[1]->age = 55; $team1->save(); - $this->assertEqual($team1->players[0]->age, 18); - $this->assertEqual($team1->players[1]->age, 55); - $this->assertEqual($team1->players[2]->age, 25); + $this->assertEquals($team1->players[0]->age, 18); + $this->assertEquals($team1->players[1]->age, 55); + $this->assertEquals($team1->players[2]->age, 25); $criteria = new TActiveRecordCriteria(); $criteria->OrdersBy['age'] = 'desc'; $team2 = TeamRecord::finder()->withPlayers($criteria)->findByPk('Team b'); - $this->assertEqual(count($team2->players),3); + $this->assertEquals(count($team2->players),3); //ordered by age - $this->assertEqual($team2->players[0]->age, 55); - $this->assertEqual($team2->players[1]->age, 25); - $this->assertEqual($team2->players[2]->age, 18); + $this->assertEquals($team2->players[0]->age, 55); + $this->assertEquals($team2->players[1]->age, 25); + $this->assertEquals($team2->players[2]->age, 18); } function test_add_belongs_to() @@ -196,8 +194,8 @@ class ForeignObjectUpdateTest extends PHPUnit_Framework_TestCase $player1 = PlayerRecord::finder()->withTeam()->findByAge(27); $this->assertNotNull($player1); $this->assertNotNull($player1->team); - $this->assertEqual($player1->team->name, 'Team c'); - $this->assertEqual($player1->team->location, 'Sydney'); + $this->assertEquals($player1->team->name, 'Team c'); + $this->assertEquals($player1->team->location, 'Sydney'); } function test_add_many_via_association() @@ -213,9 +211,9 @@ class ForeignObjectUpdateTest extends PHPUnit_Framework_TestCase //test insert $player2 = PlayerRecord::finder()->withSkills()->findByAge(37); $this->assertNotNull($player2); - $this->assertEqual(count($player2->skills), 2); - $this->assertEqual($player2->skills[0]->name, 'Bash'); - $this->assertEqual($player2->skills[1]->name, 'Jump'); + $this->assertEquals(count($player2->skills), 2); + $this->assertEquals($player2->skills[0]->name, 'Bash'); + $this->assertEquals($player2->skills[1]->name, 'Jump'); //test update $player2->skills[1]->name = "Skip"; @@ -226,18 +224,18 @@ class ForeignObjectUpdateTest extends PHPUnit_Framework_TestCase $criteria->OrdersBy['name'] = 'asc'; $player3 = PlayerRecord::finder()->withSkills($criteria)->findByAge(37); $this->assertNotNull($player3); - $this->assertEqual(count($player3->skills), 3); - $this->assertEqual($player3->skills[0]->name, 'Bash'); - $this->assertEqual($player3->skills[1]->name, 'Push'); - $this->assertEqual($player3->skills[2]->name, 'Skip'); + $this->assertEquals(count($player3->skills), 3); + $this->assertEquals($player3->skills[0]->name, 'Bash'); + $this->assertEquals($player3->skills[1]->name, 'Push'); + $this->assertEquals($player3->skills[2]->name, 'Skip'); //test lazy load $player4 = PlayerRecord::finder()->findByAge(37); - $this->assertEqual(count($player4->skills), 3); + $this->assertEquals(count($player4->skills), 3); - $this->assertEqual($player4->skills[0]->name, 'Bash'); - $this->assertEqual($player4->skills[1]->name, 'Skip'); - $this->assertEqual($player4->skills[2]->name, 'Push'); + $this->assertEquals($player4->skills[0]->name, 'Bash'); + $this->assertEquals($player4->skills[1]->name, 'Skip'); + $this->assertEquals($player4->skills[2]->name, 'Push'); } //*/ } diff --git a/tests/unit/Data/ActiveRecord/MultipleForeignKeyTest.php b/tests/unit/Data/ActiveRecord/MultipleForeignKeyTest.php index d8c54b03..b37559df 100644 --- a/tests/unit/Data/ActiveRecord/MultipleForeignKeyTest.php +++ b/tests/unit/Data/ActiveRecord/MultipleForeignKeyTest.php @@ -2,9 +2,6 @@ Prado::using('System.Data.ActiveRecord.TActiveRecord'); -/** - * @package System.Data.ActiveRecord - */ abstract class MultipleFKSqliteRecord extends TActiveRecord { protected static $conn; @@ -26,6 +23,7 @@ fk1 integer CONSTRAINT fk_id1 REFERENCES table2(id) ON DELETE CASCADE, fk2 integer CONSTRAINT fk_id2 REFERENCES table2(id) ON DELETE CASCADE, fk3 integer CONSTRAINT fk_id3 REFERENCES table2(id) ON DELETE CASCADE) */ + class Table1 extends MultipleFKSqliteRecord { public $id; @@ -110,57 +108,60 @@ class CategoryX extends MultipleFKSqliteRecord } } +/** + * @package System.Data.ActiveRecord + */ class MultipleForeignKeyTest extends PHPUnit_Framework_TestCase { function testBelongsTo() { $obj = Table1::finder()->withObject1()->findAll(); - $this->assertEqual(count($obj), 3); - $this->assertEqual($obj[0]->id, '1'); - $this->assertEqual($obj[1]->id, '2'); - $this->assertEqual($obj[2]->id, '3'); - - $this->assertEqual($obj[0]->object1->id, '1'); - $this->assertEqual($obj[1]->object1->id, '2'); - $this->assertEqual($obj[2]->object1->id, '2'); + $this->assertEquals(count($obj), 3); + $this->assertEquals($obj[0]->id, '1'); + $this->assertEquals($obj[1]->id, '2'); + $this->assertEquals($obj[2]->id, '3'); + + $this->assertEquals($obj[0]->object1->id, '1'); + $this->assertEquals($obj[1]->object1->id, '2'); + $this->assertEquals($obj[2]->object1->id, '2'); } function testHasMany() { $obj = Table2::finder()->withState1()->findAll(); - $this->assertEqual(count($obj), 5); + $this->assertEquals(count($obj), 5); - $this->assertEqual(count($obj[0]->state1), 1); - $this->assertEqual($obj[0]->state1[0]->id, '1'); + $this->assertEquals(count($obj[0]->state1), 1); + $this->assertEquals($obj[0]->state1[0]->id, '1'); - $this->assertEqual(count($obj[1]->state1), 2); - $this->assertEqual($obj[1]->state1[0]->id, '2'); - $this->assertEqual($obj[1]->state1[1]->id, '3'); + $this->assertEquals(count($obj[1]->state1), 2); + $this->assertEquals($obj[1]->state1[0]->id, '2'); + $this->assertEquals($obj[1]->state1[1]->id, '3'); - $this->assertEqual(count($obj[2]->state1), 0); - $this->assertEqual($obj[2]->id, '3'); + $this->assertEquals(count($obj[2]->state1), 0); + $this->assertEquals($obj[2]->id, '3'); - $this->assertEqual(count($obj[3]->state1), 0); - $this->assertEqual($obj[3]->id, '4'); + $this->assertEquals(count($obj[3]->state1), 0); + $this->assertEquals($obj[3]->id, '4'); } function testHasOne() { $obj = Table2::finder()->withState3('id = 3')->findAll(); - $this->assertEqual(count($obj), 5); + $this->assertEquals(count($obj), 5); - $this->assertEqual($obj[0]->id, '1'); + $this->assertEquals($obj[0]->id, '1'); $this->assertNull($obj[0]->state3); - $this->assertEqual($obj[1]->id, '2'); + $this->assertEquals($obj[1]->id, '2'); $this->assertNull($obj[1]->state3); - $this->assertEqual($obj[2]->id, '3'); + $this->assertEquals($obj[2]->id, '3'); $this->assertNotNull($obj[2]->state3); - $this->assertEqual($obj[2]->state3->id, '3'); + $this->assertEquals($obj[2]->state3->id, '3'); - $this->assertEqual($obj[3]->id, '4'); + $this->assertEquals($obj[3]->id, '4'); $this->assertNull($obj[3]->state3); } @@ -168,14 +169,14 @@ class MultipleForeignKeyTest extends PHPUnit_Framework_TestCase { $obj = CategoryX::finder()->withChild_Categories()->withParent_Category()->findByPk(2); - $this->assertEqual($obj->cat_id, '2'); - $this->assertEqual(count($obj->child_categories), 2); + $this->assertEquals($obj->cat_id, '2'); + $this->assertEquals(count($obj->child_categories), 2); $this->assertNotNull($obj->parent_category); - $this->assertEqual($obj->child_categories[0]->cat_id, 3); - $this->assertEqual($obj->child_categories[1]->cat_id, 4); + $this->assertEquals($obj->child_categories[0]->cat_id, 3); + $this->assertEquals($obj->child_categories[1]->cat_id, 4); - $this->assertEqual($obj->parent_category->cat_id, 1); + $this->assertEquals($obj->parent_category->cat_id, 1); } function testLazyLoadingGetterSetter_hasMany() @@ -183,10 +184,10 @@ class MultipleForeignKeyTest extends PHPUnit_Framework_TestCase $arr = Table2::finder()->findByPk(2); $this->assertNotNull($arr->state2); //lazy load - $this->assertEqual(count($arr->state2), 1); - $this->assertEqual($arr->state2[0]->id, "1"); + $this->assertEquals(count($arr->state2), 1); + $this->assertEquals($arr->state2[0]->id, "1"); $this->assertNotNull($arr->state2[0]->object2); - $this->assertEqual($arr->state2[0]->object2->id, "2"); + $this->assertEquals($arr->state2[0]->object2->id, "2"); $this->assertNotIdentical($arr, $arr->state2[0]->object2); } diff --git a/tests/unit/Data/ActiveRecord/RecordEventTest.php b/tests/unit/Data/ActiveRecord/RecordEventTest.php index 0114e0a4..9112bc82 100644 --- a/tests/unit/Data/ActiveRecord/RecordEventTest.php +++ b/tests/unit/Data/ActiveRecord/RecordEventTest.php @@ -9,7 +9,7 @@ class RecordEventTest extends PHPUnit_Framework_TestCase { function setup() { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); TActiveRecordManager::getInstance()->setDbConnection($conn); } @@ -19,18 +19,6 @@ class RecordEventTest extends PHPUnit_Framework_TestCase $this->assertNotNull($user1); } - function test_same_data_returns_same_object() - { - $criteria = new TActiveRecordCriteria('username = ?', 'admin'); - $finder = new UserRecord(); - $finder->OnCreateCommand[] = array($this, 'logger'); - $finder->OnExecuteCommand[] = array($this, 'logger'); - $user1 = $finder->find($criteria); - //var_dump($user1); - - //var_dump(UserRecord::finder()->find($criteria)); - } - function logger($sender, $param) { //var_dump($param); diff --git a/tests/unit/Data/ActiveRecord/SqliteTest.php b/tests/unit/Data/ActiveRecord/SqliteTest.php deleted file mode 100644 index c7f8f515..00000000 --- a/tests/unit/Data/ActiveRecord/SqliteTest.php +++ /dev/null @@ -1,22 +0,0 @@ -setDbConnection($conn); - } - - function test_finder() - { - $finder = SqliteUsers::finder(); - $user = $finder->findByPk('test'); - $this->assertNotNull($user); - } -} diff --git a/tests/unit/Data/ActiveRecord/UserRecordTest.php b/tests/unit/Data/ActiveRecord/UserRecordTest.php index c582e95b..b3992cb4 100644 --- a/tests/unit/Data/ActiveRecord/UserRecordTest.php +++ b/tests/unit/Data/ActiveRecord/UserRecordTest.php @@ -9,7 +9,7 @@ class UserRecordTest extends PHPUnit_Framework_TestCase { function setup() { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); TActiveRecordManager::getInstance()->setDbConnection($conn); } @@ -62,6 +62,6 @@ class UserRecordTest extends PHPUnit_Framework_TestCase 'work_phone', 'work_fax', 'active', 'department_id', 'salutation', 'hint_question', 'hint_answer'); foreach($props as $prop) - $this->assertEqual($user->$prop,$check->$prop); + $this->assertEquals($user->$prop,$check->$prop); } } diff --git a/tests/unit/Data/ActiveRecord/ViewRecordTest.php b/tests/unit/Data/ActiveRecord/ViewRecordTest.php deleted file mode 100644 index f319e45f..00000000 --- a/tests/unit/Data/ActiveRecord/ViewRecordTest.php +++ /dev/null @@ -1,78 +0,0 @@ -setDbConnection($conn); - } - - function test_view_record() - { - $users = SimpleUser::finder()->findAll(); - $this->assertTrue(count($users) > 0); - } - - function test_save_view_record_throws_exception() - { - $user = new SimpleUser(); - try - { - $user->save(); - $this->fail(); - } - catch(TActiveRecordException $e) - { - $this->pass(); - } - } - - function test_update_view_record_throws_exception() - { - $user = SimpleUser::finder()->findByUsername('admin'); - $user->username = 'ads'; - try - { - $user->save(); - $this->fail(); - } - catch(TActiveRecordException $e) - { - $this->pass(); - } - } - - function test_find_by_pk_throws_exception() - { - try - { - $user = SimpleUser::finder()->findByPk('admin'); - $this->fail(); - } - catch(TDbException $e) - { - $this->pass(); - } - } - - function test_delete_by_pk_throws_exception() - { - try - { - SimpleUser::finder()->deleteByPk('admin'); - $this->fail(); - } - catch(TDbException $e) - { - $this->pass(); - } - } -} \ No newline at end of file diff --git a/tests/unit/Data/ActiveRecord/records/ItemRecord.php b/tests/unit/Data/ActiveRecord/records/ItemRecord.php index e6707cde..398b0b69 100644 --- a/tests/unit/Data/ActiveRecord/records/ItemRecord.php +++ b/tests/unit/Data/ActiveRecord/records/ItemRecord.php @@ -29,7 +29,7 @@ class ItemRecord extends TActiveRecord static $conn; if($conn===null) { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); $this->OnExecuteCommand[] = array($this,'logger'); } return $conn; diff --git a/tests/unit/Data/DbCommon/CommandBuilderMssqlTest.php b/tests/unit/Data/DbCommon/CommandBuilderMssqlTest.php index 893a8ca6..7e2024d5 100644 --- a/tests/unit/Data/DbCommon/CommandBuilderMssqlTest.php +++ b/tests/unit/Data/DbCommon/CommandBuilderMssqlTest.php @@ -22,24 +22,24 @@ class CommandBuilderMssqlTest extends PHPUnit_Framework_TestCase $sql = $builder->applyLimitOffset(self::$sql['simple'], 3); $expect = 'SELECT TOP 3 username, age FROM accounts'; - $this->assertEqual($expect, $sql); + $this->assertEquals($expect, $sql); $sql = $builder->applyLimitOffset(self::$sql['simple'], 3, 2); $expect = 'SELECT * FROM (SELECT TOP 3 * FROM (SELECT TOP 5 username, age FROM accounts) as [__inner top table__] ) as [__outer top table__] '; - $this->assertEqual($expect, $sql); + $this->assertEquals($expect, $sql); $sql = $builder->applyLimitOffset(self::$sql['multiple'], 3, 2); $expect = 'SELECT * FROM (SELECT TOP 3 * FROM (SELECT TOP 5 a.username, b.name from accounts a, table1 b where a.age = b.id1) as [__inner top table__] ) as [__outer top table__] '; - $this->assertEqual($sql, $expect); + $this->assertEquals($sql, $expect); $sql = $builder->applyLimitOffset(self::$sql['ordering'], 3, 2); $expect = 'SELECT * FROM (SELECT TOP 3 * FROM (SELECT TOP 5 a.username, b.name, a.age from accounts a, table1 b where a.age = b.id1 order by age DESC, name) as [__inner top table__] ORDER BY age ASC, name DESC) as [__outer top table__] ORDER BY age DESC, name ASC'; - $this->assertEqual($sql, $expect); + $this->assertEquals($sql, $expect); $sql = $builder->applyLimitOffset(self::$sql['index'], 3, 2); $expect = 'SELECT * FROM (SELECT TOP 3 * FROM (SELECT TOP 5 a.username, b.name, a.age from accounts a, table1 b where a.age = b.id1 ORDER BY 1 DESC, 2 ASC) as [__inner top table__] ORDER BY 1 ASC, 2 DESC) as [__outer top table__] ORDER BY 1 DESC, 2 ASC'; - $this->assertEqual($expect, $sql); + $this->assertEquals($expect, $sql); // $sql = $builder->applyLimitOffset(self::$sql['compute'], 3, 2); // var_dump($sql); diff --git a/tests/unit/Data/DbCommon/CommandBuilderMysqlTest.php b/tests/unit/Data/DbCommon/CommandBuilderMysqlTest.php deleted file mode 100644 index 77e58019..00000000 --- a/tests/unit/Data/DbCommon/CommandBuilderMysqlTest.php +++ /dev/null @@ -1,20 +0,0 @@ -mysql_meta_data()->getTableInfo("tests.table1"); - } -} diff --git a/tests/unit/Data/DbCommon/CommandBuilderPgsqlTest.php b/tests/unit/Data/DbCommon/CommandBuilderPgsqlTest.php index 389ad0e1..bb5ebfa8 100644 --- a/tests/unit/Data/DbCommon/CommandBuilderPgsqlTest.php +++ b/tests/unit/Data/DbCommon/CommandBuilderPgsqlTest.php @@ -7,9 +7,18 @@ Prado::using('System.Data.Common.Pgsql.TPgsqlMetaData'); */ class CommandBuilderPgsqlTest extends PHPUnit_Framework_TestCase { + protected function setUp() + { + if (!extension_loaded('pgsql')) { + $this->markTestSkipped( + 'The pgsql extension is not available.' + ); + } + } + function pgsql_meta_data() { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); + $conn = new TDbConnection('pgsql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); return new TPgsqlMetaData($conn); } @@ -32,7 +41,7 @@ class CommandBuilderPgsqlTest extends PHPUnit_Framework_TestCase ); $insert = $builder->createInsertCommand($address); $sql = 'INSERT INTO public.address("username", "phone", "field1_boolean", "field2_date", "field3_double", "field4_integer", "field6_time", "field7_timestamp", "field8_money", "field9_numeric", "int_fk1", "int_fk2") VALUES (:username, :phone, :field1_boolean, :field2_date, :field3_double, :field4_integer, :field6_time, :field7_timestamp, :field8_money, :field9_numeric, :int_fk1, :int_fk2)'; - $this->assertEqual($sql, $insert->Text); + $this->assertEquals($sql, $insert->Text); } function test_update_command() @@ -44,7 +53,7 @@ class CommandBuilderPgsqlTest extends PHPUnit_Framework_TestCase ); $update = $builder->createUpdateCommand($data, '1'); $sql = 'UPDATE public.address SET "phone" = :phone, "int_fk1" = :int_fk1 WHERE 1'; - $this->assertEqual($sql, $update->Text); + $this->assertEquals($sql, $update->Text); } function test_delete_command() @@ -53,7 +62,7 @@ class CommandBuilderPgsqlTest extends PHPUnit_Framework_TestCase $where = 'phone is NULL'; $delete = $builder->createDeleteCommand($where); $sql = 'DELETE FROM public.address WHERE phone is NULL'; - $this->assertEqual($sql, $delete->Text); + $this->assertEquals($sql, $delete->Text); } function test_select_limit() @@ -64,14 +73,14 @@ class CommandBuilderPgsqlTest extends PHPUnit_Framework_TestCase $limit = $builder->applyLimitOffset($query, 1); $expect = $query.' LIMIT 1'; - $this->assertEqual($expect, $limit); + $this->assertEquals($expect, $limit); $limit = $builder->applyLimitOffset($query, -1, 10); $expect = $query.' OFFSET 10'; - $this->assertEqual($expect, $limit); + $this->assertEquals($expect, $limit); $limit = $builder->applyLimitOffset($query, 2, 3); $expect = $query.' LIMIT 2 OFFSET 3'; - $this->assertEqual($expect, $limit); + $this->assertEquals($expect, $limit); } } diff --git a/tests/unit/Data/DbCommon/MssqlColumnTest.php b/tests/unit/Data/DbCommon/MssqlColumnTest.php index e4196fcf..2f7119ac 100644 --- a/tests/unit/Data/DbCommon/MssqlColumnTest.php +++ b/tests/unit/Data/DbCommon/MssqlColumnTest.php @@ -9,6 +9,15 @@ Prado::using('System.Data.DataGateway.TTableGateway'); */ class MssqlColumnTest extends PHPUnit_Framework_TestCase { + protected function setUp() + { + if (!extension_loaded('mssql')) { + $this->markTestSkipped( + 'The pgsql extension is not available.' + ); + } + } + function get_conn() { return new TDbConnection('mssql:host=localhost\\sqlexpress', 'test', 'test01'); diff --git a/tests/unit/Data/DbCommon/Mysql4ColumnTest.php b/tests/unit/Data/DbCommon/Mysql4ColumnTest.php deleted file mode 100644 index 74606452..00000000 --- a/tests/unit/Data/DbCommon/Mysql4ColumnTest.php +++ /dev/null @@ -1,255 +0,0 @@ -create_meta_data()->getTableInfo('table1'); - $this->assertEqual(count($table->getColumns()), 18); - - $columns['id'] = array( - 'ColumnName' => '`id`', - 'ColumnSize' => 10, - 'ColumnIndex' => 0, - 'DbType' => 'int unsigned', - 'AllowNull' => false, - 'DefaultValue' => TDbTableColumn::UNDEFINED_VALUE, - 'NumericPrecision' => null, - 'NumericScale' => null, - 'IsPrimaryKey' => true, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => true, - ); - - $columns['name'] = array( - 'ColumnName' => '`name`', - 'ColumnSize' => 45, - 'ColumnIndex' => 1, - 'DbType' => 'varchar', - 'AllowNull' => false, - 'DefaultValue' => TDbTableColumn::UNDEFINED_VALUE, - 'NumericPrecision' => null, - 'NumericScale' => null, - 'IsPrimaryKey' => true, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => false, - ); - - $columns['field1'] = array( - 'ColumnName' => '`field1`', - 'ColumnSize' => 4, - 'ColumnIndex' => 2, - 'DbType' => 'tinyint', - 'AllowNull' => false, - 'DefaultValue' => '0', - 'NumericPrecision' => null, - 'NumericScale' => null, - 'IsPrimaryKey' => false, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => false, - ); - - $columns['field2_text'] = array( - 'ColumnName' => '`field2_text`', - 'ColumnSize' => null, - 'ColumnIndex' => 3, - 'DbType' => 'text', - 'AllowNull' => true, - 'DefaultValue' => TDbTableColumn::UNDEFINED_VALUE, - 'NumericPrecision' => null, - 'NumericScale' => null, - 'IsPrimaryKey' => false, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => false, - ); - - $columns['field3_date'] = array( - 'ColumnName' => '`field3_date`', - 'ColumnSize' => null, - 'ColumnIndex' => 4, - 'DbType' => 'date', - 'AllowNull' => true, - 'DefaultValue' => '2007-02-25', - 'NumericPrecision' => null, - 'NumericScale' => null, - 'IsPrimaryKey' => false, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => false, - ); - - $columns['field4_float'] = array( - 'ColumnName' => '`field4_float`', - 'ColumnSize' => null, - 'ColumnIndex' => 5, - 'DbType' => 'float', - 'AllowNull' => false, - 'DefaultValue' => 10, - 'NumericPrecision' => null, - 'NumericScale' => null, - 'IsPrimaryKey' => false, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => false, - ); - - $columns['field5_float'] = array( - 'ColumnName' => '`field5_float`', - 'ColumnSize' => null, - 'ColumnIndex' => 6, - 'DbType' => 'float', - 'AllowNull' => false, - 'DefaultValue' => '0.0000', - 'NumericPrecision' => 5, - 'NumericScale' => 4, - 'IsPrimaryKey' => false, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => false, - ); - - $columns['field6_double'] = array( - 'ColumnName' => '`field6_double`', - 'ColumnSize' => null, - 'ColumnIndex' => 7, - 'DbType' => 'double', - 'AllowNull' => false, - 'DefaultValue' => '0', - 'NumericPrecision' => null, - 'NumericScale' => null, - 'IsPrimaryKey' => false, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => false, - ); - - $columns['field7_datetime'] = array( - 'ColumnName' => '`field7_datetime`', - 'ColumnSize' => null, - 'ColumnIndex' => 8, - 'DbType' => 'datetime', - 'AllowNull' => false, - 'DefaultValue' => '0000-00-00 00:00:00', - 'NumericPrecision' => null, - 'NumericScale' => null, - 'IsPrimaryKey' => false, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => false, - ); - - $columns['field8_timestamp'] = array( - 'ColumnName' => '`field8_timestamp`', - 'ColumnSize' => null, - 'ColumnIndex' => 9, - 'DbType' => 'timestamp', - 'AllowNull' => true, - 'DefaultValue' => 'CURRENT_TIMESTAMP', - 'NumericPrecision' => null, - 'NumericScale' => null, - 'IsPrimaryKey' => false, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => false, - ); - - $columns['field9_time'] = array( - 'ColumnName' => '`field9_time`', - 'ColumnSize' => null, - 'ColumnIndex' => 10, - 'DbType' => 'time', - 'AllowNull' => false, - 'DefaultValue' => '00:00:00', - 'NumericPrecision' => null, - 'NumericScale' => null, - 'IsPrimaryKey' => false, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => false, - ); - - $columns['field10_year'] = array( - 'ColumnName' => '`field10_year`', - 'ColumnSize' => 4, - 'ColumnIndex' => 11, - 'DbType' => 'year', - 'AllowNull' => false, - 'DefaultValue' => '0000', - 'NumericPrecision' => null, - 'NumericScale' => null, - 'IsPrimaryKey' => false, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => false, - ); - - $columns['field11_enum'] = array( - 'ColumnName' => '`field11_enum`', - 'ColumnSize' => null, - 'ColumnIndex' => 12, - 'DbType' => 'enum', - 'AllowNull' => false, - 'DefaultValue' => 'one', - 'NumericPrecision' => null, - 'NumericScale' => null, - 'IsPrimaryKey' => false, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => false, - 'DbTypeValues' => array('one', 'two', 'three'), - ); - - $columns['field12_SET'] = array( - 'ColumnName' => '`field12_SET`', - 'ColumnSize' => null, - 'ColumnIndex' => 13, - 'DbType' => 'set', - 'AllowNull' => false, - 'DefaultValue' => TDbTableColumn::UNDEFINED_VALUE, - 'NumericPrecision' => null, - 'NumericScale' => null, - 'IsPrimaryKey' => false, - 'IsForeignKey' => false, - 'SequenceName' => null, - 'AutoIncrement' => false, - 'DbTypeValues' => array('blue', 'red', 'green'), - ); - - $this->assertColumn($columns, $table); - - $this->assertNull($table->getSchemaName()); - $this->assertEqual('table1', $table->getTableName()); - $this->assertEqual(array('id', 'name'), $table->getPrimaryKeys()); - } - - function assertColumn($columns, $table) - { - foreach($columns as $id=>$asserts) - { - $column = $table->Columns[$id]; - foreach($asserts as $property=>$assert) - { - $ofAssert= var_export($assert,true); - $value = $column->{$property}; - $ofValue = var_export($value, true); - $this->assertEqual($value, $assert, - "Column [{$id}] {$property} value {$ofValue} did not match {$ofAssert}"); - } - } - } -} diff --git a/tests/unit/Data/DbCommon/MysqlColumnTest.php b/tests/unit/Data/DbCommon/MysqlColumnTest.php index 3bdfe54f..88b1bb53 100644 --- a/tests/unit/Data/DbCommon/MysqlColumnTest.php +++ b/tests/unit/Data/DbCommon/MysqlColumnTest.php @@ -7,16 +7,25 @@ Prado::using('System.Data.Common.Mysql.TMysqlMetaData'); */ class MysqlColumnTest extends PHPUnit_Framework_TestCase { + protected function setUp() + { + if (!extension_loaded('mysql')) { + $this->markTestSkipped( + 'The mysql extension is not available.' + ); + } + } + function create_meta_data() { - $conn = new TDbConnection('mysql:host=localhost;dbname=tests;port=3307', 'test5','test5'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); return new TMysqlMetaData($conn); } function test_columns() { $table = $this->create_meta_data()->getTableInfo('table1'); - $this->assertEqual(count($table->getColumns()), 18); + $this->assertEquals(count($table->getColumns()), 18); $columns['id'] = array( 'ColumnName' => '`id`', @@ -233,8 +242,8 @@ class MysqlColumnTest extends PHPUnit_Framework_TestCase $this->assertColumn($columns, $table); $this->assertNull($table->getSchemaName()); - $this->assertEqual('table1', $table->getTableName()); - $this->assertEqual(array('id', 'name'), $table->getPrimaryKeys()); + $this->assertEquals('table1', $table->getTableName()); + $this->assertEquals(array('id', 'name'), $table->getPrimaryKeys()); } function assertColumn($columns, $table) @@ -247,7 +256,7 @@ class MysqlColumnTest extends PHPUnit_Framework_TestCase $ofAssert= var_export($assert,true); $value = $column->{$property}; $ofValue = var_export($value, true); - $this->assertEqual($value, $assert, + $this->assertEquals($value, $assert, "Column [{$id}] {$property} value {$ofValue} did not match {$ofAssert}"); } } diff --git a/tests/unit/Data/DbCommon/PgsqlColumnTest.php b/tests/unit/Data/DbCommon/PgsqlColumnTest.php index 7d7f1177..24e7b49b 100644 --- a/tests/unit/Data/DbCommon/PgsqlColumnTest.php +++ b/tests/unit/Data/DbCommon/PgsqlColumnTest.php @@ -8,16 +8,25 @@ Prado::using('System.Data.Common.Pgsql.TPgsqlMetaData'); */ class PgsqlColumnTest extends PHPUnit_Framework_TestCase { + protected function setUp() + { + if (!extension_loaded('pgsql')) { + $this->markTestSkipped( + 'The pgsql extension is not available.' + ); + } + } + function create_meta_data() { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); return new TPgsqlMetaData($conn); } function test_text_column_def() { $table = $this->create_meta_data()->getTableInfo('public.address'); - $this->assertEqual(count($table->getColumns()), 14); + $this->assertEquals(count($table->getColumns()), 14); $columns['id'] = array( 'ColumnName' => '"id"', @@ -118,9 +127,9 @@ class PgsqlColumnTest extends PHPUnit_Framework_TestCase ); $this->assertColumn($columns, $table); - $this->assertEqual('public', $table->getSchemaName()); - $this->assertEqual('address', $table->getTableName()); - $this->assertEqual(array('id'), $table->getPrimaryKeys()); + $this->assertEquals('public', $table->getSchemaName()); + $this->assertEquals('address', $table->getTableName()); + $this->assertEquals(array('id'), $table->getPrimaryKeys()); } function assertColumn($columns, $table) @@ -133,7 +142,7 @@ class PgsqlColumnTest extends PHPUnit_Framework_TestCase $ofAssert= var_export($assert,true); $value = $column->{$property}; $ofValue = var_export($value, true); - $this->assertEqual($value, $assert, + $this->assertEquals($value, $assert, "Column [{$id}] {$property} value {$ofValue} did not match {$ofAssert}"); } } diff --git a/tests/unit/Data/SqlMap/ActiveRecordSqlMapTest.php b/tests/unit/Data/SqlMap/ActiveRecordSqlMapTest.php index c2eef7a1..5028d1e6 100644 --- a/tests/unit/Data/SqlMap/ActiveRecordSqlMapTest.php +++ b/tests/unit/Data/SqlMap/ActiveRecordSqlMapTest.php @@ -4,9 +4,6 @@ require_once(dirname(__FILE__).'/BaseCase.php'); Prado::using('System.Data.ActiveRecord.TActiveRecord'); -/** - * @package System.Data.SqlMap - */ class ActiveAccount extends TActiveRecord { public $Account_Id; @@ -25,6 +22,9 @@ class ActiveAccount extends TActiveRecord } } +/** + * @package System.Data.SqlMap + */ class ActiveRecordSqlMapTest extends BaseCase { function __construct() @@ -36,34 +36,10 @@ class ActiveRecordSqlMapTest extends BaseCase //$this->initScript('account-init.sql'); } - function testLoadWithSqlMap() - { - $records = $this->sqlmap->queryForList('GetActiveRecordAccounts'); - $registry=TActiveRecordManager::getInstance()->getObjectStateRegistry(); - foreach($records as $record) - { - $this->assertEqual(get_class($record), 'ActiveAccount'); - $this->assertTrue($registry->isCleanObject($record)); - } - } - - function testLoadWithActiveRecord() - { - $records = ActiveAccount::finder()->findAll(); - $registry=TActiveRecordManager::getInstance()->getObjectStateRegistry(); - foreach($records as $record) - { - $this->assertEqual(get_class($record), 'ActiveAccount'); - //$this->assertTrue($registry->isCleanObject($record)); //? not clean anymore? - } - } - function testLoadWithSqlMap_SaveWithActiveRecord() { $record = $this->sqlmap->queryForObject('GetActiveRecordAccounts'); - $registry=TActiveRecordManager::getInstance()->getObjectStateRegistry(); $record->Account_FirstName = "Testing 123"; - $this->assertTrue($registry->isDirtyObject($record)); $this->assertTrue($record->save()); @@ -83,6 +59,6 @@ class ActiveRecordSqlMapTest extends BaseCase $props = array('Account_Id', 'Account_FirstName', 'Account_LastName', 'Account_Email', 'Account_Banner_Option', 'Account_Cart_Option'); foreach($props as $prop) - $this->assertEqual($account1->{$prop}, $account2->{$prop}); + $this->assertEquals($account1->{$prop}, $account2->{$prop}); } } diff --git a/tests/unit/Data/SqlMap/BaseCase.php b/tests/unit/Data/SqlMap/BaseCase.php index 15bb3367..f20acc5a 100644 --- a/tests/unit/Data/SqlMap/BaseCase.php +++ b/tests/unit/Data/SqlMap/BaseCase.php @@ -88,9 +88,9 @@ class BaseCase extends PHPUnit_Framework_TestCase */ protected function assertAccount1(Account $account) { - $this->assertIdentical($account->getID(), 1); - $this->assertIdentical($account->getFirstName(), 'Joe'); - $this->assertIdentical($account->getEmailAddress(), 'Joe.Dalton@somewhere.com'); + $this->assertSame($account->getID(), 1); + $this->assertSame($account->getFirstName(), 'Joe'); + $this->assertSame($account->getEmailAddress(), 'Joe.Dalton@somewhere.com'); } /** @@ -98,9 +98,9 @@ class BaseCase extends PHPUnit_Framework_TestCase */ protected function assertAccount6(Account $account) { - $this->assertIdentical($account->getID(), 6); - $this->assertIdentical($account->getFirstName(), 'Calamity'); - $this->assertIdentical($account->getLastName(), 'Jane'); + $this->assertSame($account->getID(), 6); + $this->assertSame($account->getFirstName(), 'Calamity'); + $this->assertSame($account->getLastName(), 'Jane'); $this->assertNull($account->getEmailAddress()); } @@ -111,43 +111,43 @@ class BaseCase extends PHPUnit_Framework_TestCase { $date = @mktime(8,15,0,2,15,2003); - $this->assertIdentical((int)$order->getID(), 1); + $this->assertSame((int)$order->getID(), 1); if($order->getDate() instanceof TDateTime) - $this->assertIdentical($order->getDate()->getTimestamp(), $date); + $this->assertSame($order->getDate()->getTimestamp(), $date); else $this->fail(); - $this->assertIdentical($order->getCardType(), 'VISA'); - $this->assertIdentical($order->getCardNumber(), '999999999999'); - $this->assertIdentical($order->getCardExpiry(), '05/03'); - $this->assertIdentical($order->getStreet(), '11 This Street'); - $this->assertIdentical($order->getProvince(), 'BC'); - $this->assertIdentical($order->getPostalCode(), 'C4B 4F4'); + $this->assertSame($order->getCardType(), 'VISA'); + $this->assertSame($order->getCardNumber(), '999999999999'); + $this->assertSame($order->getCardExpiry(), '05/03'); + $this->assertSame($order->getStreet(), '11 This Street'); + $this->assertSame($order->getProvince(), 'BC'); + $this->assertSame($order->getPostalCode(), 'C4B 4F4'); } function assertAccount1AsHashArray($account) { - $this->assertIdentical(1, (int)$account["Id"]); - $this->assertIdentical("Joe", $account["FirstName"]); - $this->assertIdentical("Dalton", $account["LastName"]); - $this->assertIdentical("Joe.Dalton@somewhere.com", $account["EmailAddress"]); + $this->assertSame(1, (int)$account["Id"]); + $this->assertSame("Joe", $account["FirstName"]); + $this->assertSame("Dalton", $account["LastName"]); + $this->assertSame("Joe.Dalton@somewhere.com", $account["EmailAddress"]); } function AssertOrder1AsHashArray($order) { $date = @mktime(8,15,0,2,15,2003); - $this->assertIdentical(1, $order["Id"]); + $this->assertSame(1, $order["Id"]); if($order['Date'] instanceof TDateTime) - $this->assertIdentical($date, $order["Date"]->getTimestamp()); + $this->assertSame($date, $order["Date"]->getTimestamp()); else $this->fail(); - $this->assertIdentical("VISA", $order["CardType"]); - $this->assertIdentical("999999999999", $order["CardNumber"]); - $this->assertIdentical("05/03", $order["CardExpiry"]); - $this->assertIdentical("11 This Street", $order["Street"]); - $this->assertIdentical("Victoria", $order["City"]); - $this->assertIdentical("BC", $order["Province"]); - $this->assertIdentical("C4B 4F4", $order["PostalCode"]); + $this->assertSame("VISA", $order["CardType"]); + $this->assertSame("999999999999", $order["CardNumber"]); + $this->assertSame("05/03", $order["CardExpiry"]); + $this->assertSame("11 This Street", $order["Street"]); + $this->assertSame("Victoria", $order["City"]); + $this->assertSame("BC", $order["Province"]); + $this->assertSame("C4B 4F4", $order["PostalCode"]); } } diff --git a/tests/unit/Data/SqlMap/CacheTest.php b/tests/unit/Data/SqlMap/CacheTest.php index 3d2ccd41..ce84a031 100644 --- a/tests/unit/Data/SqlMap/CacheTest.php +++ b/tests/unit/Data/SqlMap/CacheTest.php @@ -113,9 +113,9 @@ class CacheTest extends BaseCase $returnedObject = $cache->get($key); - $this->assertIdentical('a', $returnedObject); + $this->assertSame('a', $returnedObject); - $this->assertIdentical(1, $cache->getHitRatio()); + $this->assertSame(1, $cache->getHitRatio()); } @@ -133,9 +133,9 @@ class CacheTest extends BaseCase $wrongKey = new TSqlMapCacheKey('wrongKey'); $returnedObject = $cache->get($wrongKey); - $this->assertNotEqual($value, $returnedObject); + $this->assertNotEquals($value, $returnedObject); $this->assertNull($returnedObject) ; - $this->assertIdentical(0, $cache->getHitRatio()); + $this->assertSame(0, $cache->getHitRatio()); } /** @@ -150,13 +150,13 @@ class CacheTest extends BaseCase $cache->set($key, $value); $returnedObject = $cache->get($key); - $this->assertIdentical($value, $returnedObject); + $this->assertSame($value, $returnedObject); $wrongKey = new TSqlMapCacheKey('wrongKey'); $returnedObject = $cache->get($wrongKey); - $this->assertNotEqual($value, $returnedObject); + $this->assertNotEquals($value, $returnedObject); $this->assertNull($returnedObject) ; - $this->assertIdentical(0.5, $cache->getHitRatio()); + $this->assertSame(0.5, $cache->getHitRatio()); } } diff --git a/tests/unit/Data/SqlMap/DelegateTest.php b/tests/unit/Data/SqlMap/DelegateTest.php index 5bfbe5ce..10442bb0 100644 --- a/tests/unit/Data/SqlMap/DelegateTest.php +++ b/tests/unit/Data/SqlMap/DelegateTest.php @@ -17,13 +17,13 @@ class DelegateTest extends BaseCase $list = $this->sqlmap->queryWithRowDelegate( "GetAllAccountsViaResultMap", array($this, 'listHandler')); - $this->assertIdentical(5, count($list)); + $this->assertSame(5, count($list)); $this->assertAccount1($list[0]); - $this->assertIdentical(1, $list[0]->getID()); - $this->assertIdentical(2, $list[1]->getID()); - $this->assertIdentical(3, $list[2]->getID()); - $this->assertIdentical(4, $list[3]->getID()); - $this->assertIdentical(5, $list[4]->getID()); + $this->assertSame(1, $list[0]->getID()); + $this->assertSame(2, $list[1]->getID()); + $this->assertSame(3, $list[2]->getID()); + $this->assertSame(4, $list[3]->getID()); + $this->assertSame(5, $list[4]->getID()); } /** @@ -34,14 +34,14 @@ class DelegateTest extends BaseCase $map = $this->sqlmap->QueryForMapWithRowDelegate( "GetAllAccountsViaResultClass", array($this, 'mapHandler'), null, "FirstName"); - $this->assertIdentical(5, count($map)); + $this->assertSame(5, count($map)); $this->assertAccount1($map["Joe"]); - $this->assertIdentical(1, $map["Joe"]->getID()); - $this->assertIdentical(2, $map["Averel"]->getID()); - $this->assertIdentical(3, $map["William"]->getID()); - $this->assertIdentical(4, $map["Jack"]->getID()); - $this->assertIdentical(5, $map["Gilles"]->getID()); + $this->assertSame(1, $map["Joe"]->getID()); + $this->assertSame(2, $map["Averel"]->getID()); + $this->assertSame(3, $map["William"]->getID()); + $this->assertSame(4, $map["Jack"]->getID()); + $this->assertSame(5, $map["Gilles"]->getID()); } public function listHandler($sender, $param) diff --git a/tests/unit/Data/SqlMap/DynamicParameterTest.php b/tests/unit/Data/SqlMap/DynamicParameterTest.php index 136111db..d7f20449 100644 --- a/tests/unit/Data/SqlMap/DynamicParameterTest.php +++ b/tests/unit/Data/SqlMap/DynamicParameterTest.php @@ -19,7 +19,7 @@ class DynamicParameterTest extends PHPUnit_Framework_TestCase Prado::setApplication(new TApplication(dirname(__FILE__).'/app')); if($conn === null) - $conn = new TDbConnection('mysql:host=localhost;dbname=prado_system_data_sqlmap', 'prado_unitest', 'prado_system_data_sqlmap_unitest'); + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest', 'prado_unitest'); $conn->setActive(true); diff --git a/tests/unit/Data/SqlMap/GroupByTest.php b/tests/unit/Data/SqlMap/GroupByTest.php index 3d414922..5c4d5550 100644 --- a/tests/unit/Data/SqlMap/GroupByTest.php +++ b/tests/unit/Data/SqlMap/GroupByTest.php @@ -1,9 +1,6 @@ initScript('account-init.sql'); $accounts = $this->sqlmap->queryForList("getAccountWithOrders"); - $this->assertIdentical(5, count($accounts)); + $this->assertSame(5, count($accounts)); foreach($accounts as $account) - $this->assertIdentical(2, count($account->getOrders())); + $this->assertSame(2, count($account->getOrders())); } - -/**/ } diff --git a/tests/unit/Data/SqlMap/InheritanceTest.php b/tests/unit/Data/SqlMap/InheritanceTest.php index 9c8a805e..d8ad4c88 100644 --- a/tests/unit/Data/SqlMap/InheritanceTest.php +++ b/tests/unit/Data/SqlMap/InheritanceTest.php @@ -20,7 +20,7 @@ class InheritanceTest extends BaseCase { $list = $this->sqlmap->queryForList("GetAllDocument"); - $this->assertEqual(6, count($list)); + $this->assertEquals(6, count($list)); $book = $list[0]; $this->assertBook($book, 1, "The World of Null-A", 55); @@ -45,7 +45,7 @@ class InheritanceTest extends BaseCase { $list = $this->sqlmap->queryForList("GetTypedCollection"); - $this->assertEqual(6, $list->getCount()); + $this->assertEquals(6, $list->getCount()); $book = $list[0]; $this->assertBook($book, 1, "The World of Null-A", 55); @@ -75,7 +75,7 @@ class InheritanceTest extends BaseCase $list = $this->sqlmap->queryForList("GetAllDocumentWithCustomTypeHandler"); - $this->assertEqual(6, count($list)); + $this->assertEquals(6, count($list)); $book = $list[0]; $this->assertBook($book, 1, "The World of Null-A", 55); @@ -97,22 +97,22 @@ class InheritanceTest extends BaseCase function AssertDocument(Document $document, $id, $title) { - $this->assertEqual($id, $document->getID()); - $this->assertEqual($title, $document->getTitle()); + $this->assertEquals($id, $document->getID()); + $this->assertEquals($title, $document->getTitle()); } function AssertBook(Book $book, $id, $title, $pageNumber) { - $this->assertEqual($id, $book->getId()); - $this->assertEqual($title, $book->getTitle()); - $this->assertEqual($pageNumber, (int)$book->getPageNumber()); + $this->assertEquals($id, $book->getId()); + $this->assertEquals($title, $book->getTitle()); + $this->assertEquals($pageNumber, (int)$book->getPageNumber()); } function AssertNewspaper(Newspaper $news, $id, $title, $city) { - $this->assertEqual($id, $news->getId()); - $this->assertEqual($title, $news->getTitle()); - $this->assertEqual($city, $news->getCity()); + $this->assertEquals($id, $news->getId()); + $this->assertEquals($title, $news->getTitle()); + $this->assertEquals($city, $news->getCity()); } } diff --git a/tests/unit/Data/SqlMap/ParameterMapTest.php b/tests/unit/Data/SqlMap/ParameterMapTest.php index de5c235c..f564e9fc 100644 --- a/tests/unit/Data/SqlMap/ParameterMapTest.php +++ b/tests/unit/Data/SqlMap/ParameterMapTest.php @@ -91,7 +91,7 @@ class ParameterMapTest extends BaseCase $orderTest = $this->sqlmap->queryForObject("GetOrderLiteByColumnName", 99); - $this->assertIdentical($order->getCity(), $orderTest->getCity()); + $this->assertSame($order->getCity(), $orderTest->getCity()); } /// Test null replacement in ParameterMap/Hahstable property @@ -118,7 +118,7 @@ class ParameterMapTest extends BaseCase $orderTest = $this->sqlmap->queryForObject("GetOrderByHashTable", 99); - $this->assertIdentical($orderTest["Date"], '0001-01-01 00:00:00'); + $this->assertSame($orderTest["Date"], '0001-01-01 00:00:00'); } /// Test null replacement in ParameterMap property @@ -135,8 +135,8 @@ class ParameterMapTest extends BaseCase $categoryRead = $this->sqlmap->queryForObject("GetCategory", $key); - $this->assertIdentical($category->getName(), $categoryRead->getName()); - $this->assertIdentical('', $categoryRead->getGuidString()); + $this->assertSame($category->getName(), $categoryRead->getName()); + $this->assertSame('', $categoryRead->getGuidString()); } } @@ -212,7 +212,7 @@ class ParameterMapTest extends BaseCase $this->assertNotNull($item->getId()); // $this->assertNotNull($item->getPicture()); -// $this->assertIdentical( GetSize(item.Picture), this.GetSize( this.GetPicture() )); +// $this->assertSame( GetSize(item.Picture), this.GetSize( this.GetPicture() )); } */ @@ -241,7 +241,7 @@ class ParameterMapTest extends BaseCase $orderTest = $this->sqlmap->queryForObject("GetOrderLiteByColumnName", 99); - $this->assertIdentical($order->getCity(), $orderTest->getCity()); + $this->assertSame($order->getCity(), $orderTest->getCity()); } /**/ } diff --git a/tests/unit/Data/SqlMap/PropertyAccessTest.php b/tests/unit/Data/SqlMap/PropertyAccessTest.php index eb8306d5..ba9e24c7 100644 --- a/tests/unit/Data/SqlMap/PropertyAccessTest.php +++ b/tests/unit/Data/SqlMap/PropertyAccessTest.php @@ -24,9 +24,9 @@ class PropertyAccessTest extends BaseCase $account6 = $this->NewAccount6(); $two->More = $account6; - $this->assertIdentical(10, TPropertyAccess::get($account, 'Id')); - $this->assertIdentical(12, TPropertyAccess::get($account, 'More.Id')); - $this->assertIdentical(6, TPropertyAccess::get($account, 'More.More.Id')); + $this->assertSame(10, TPropertyAccess::get($account, 'Id')); + $this->assertSame(12, TPropertyAccess::get($account, 'More.Id')); + $this->assertSame(6, TPropertyAccess::get($account, 'More.More.Id')); } function testSetPublicProperty() @@ -48,11 +48,11 @@ class PropertyAccessTest extends BaseCase TPropertyAccess::set($account, 'More.More.EmailAddress', 'hahaha'); - $this->assertIdentical(10, TPropertyAccess::get($account, 'Id')); - $this->assertIdentical(12, TPropertyAccess::get($account, 'More.Id')); - $this->assertIdentical(6, TPropertyAccess::get($account, 'More.More.Id')); + $this->assertSame(10, TPropertyAccess::get($account, 'Id')); + $this->assertSame(12, TPropertyAccess::get($account, 'More.Id')); + $this->assertSame(6, TPropertyAccess::get($account, 'More.More.Id')); - $this->assertIdentical('hahaha', + $this->assertSame('hahaha', TPropertyAccess::get($account, 'More.More.EmailAddress')); } @@ -63,12 +63,12 @@ class PropertyAccessTest extends BaseCase $things['accounts'] = $this->NewAccount6(); $account->More = $things; - $this->assertIdentical(6, TPropertyAccess::get($account, 'More.accounts.ID')); + $this->assertSame(6, TPropertyAccess::get($account, 'More.accounts.ID')); TPropertyAccess::set($account, 'More.accounts.EmailAddress', 'adssd'); - $this->assertIdentical('adssd', TPropertyAccess::get($account, 'More.accounts.EmailAddress')); + $this->assertSame('adssd', TPropertyAccess::get($account, 'More.accounts.EmailAddress')); - $this->assertIdentical(1, TPropertyAccess::get($things, 'more')); + $this->assertSame(1, TPropertyAccess::get($things, 'more')); } } diff --git a/tests/unit/Data/SqlMap/ResultClassTest.php b/tests/unit/Data/SqlMap/ResultClassTest.php index 9b02ca70..3e8d3ec6 100644 --- a/tests/unit/Data/SqlMap/ResultClassTest.php +++ b/tests/unit/Data/SqlMap/ResultClassTest.php @@ -18,7 +18,7 @@ class ResultClassTest extends BaseCase function testBoolean() { $bit = $this->sqlmap->queryForObject("GetBoolean", 1); - $this->assertIdentical(true, $bit); + $this->assertSame(true, $bit); } /** @@ -27,7 +27,7 @@ class ResultClassTest extends BaseCase function testBooleanWithoutResultClass() { $bit = (boolean)$this->sqlmap->queryForObject("GetBooleanWithoutResultClass", 1); - $this->assertIdentical(true, $bit); + $this->assertSame(true, $bit); } /** @@ -36,7 +36,7 @@ class ResultClassTest extends BaseCase function testByte() { $letter = $this->sqlmap->queryForObject("GetByte", 1); - $this->assertIdentical(155, (int)$letter); + $this->assertSame(155, (int)$letter); } /** @@ -45,7 +45,7 @@ class ResultClassTest extends BaseCase function testByteWithoutResultClass() { $letter = $this->sqlmap->queryForObject("GetByteWithoutResultClass", 1); - $this->assertIdentical(155, (int)$letter); + $this->assertSame(155, (int)$letter); } /** @@ -54,7 +54,7 @@ class ResultClassTest extends BaseCase function testChar() { $letter = $this->sqlmap->queryForObject("GetChar", 1); - $this->assertIdentical('a', trim($letter)); + $this->assertSame('a', trim($letter)); } /** @@ -63,7 +63,7 @@ class ResultClassTest extends BaseCase function testCharWithoutResultClass() { $letter = $this->sqlmap->queryForObject("GetCharWithoutResultClass", 1); - $this->assertIdentical('a', trim($letter)); + $this->assertSame('a', trim($letter)); } /** @@ -73,7 +73,7 @@ class ResultClassTest extends BaseCase { $orderDate = $this->sqlmap->queryForObject("GetDate", 1); $date = @mktime(8, 15, 00, 2, 15, 2003); - $this->assertIdentical($date, $orderDate->getTimeStamp()); + $this->assertSame($date, $orderDate->getTimeStamp()); } /** @@ -86,7 +86,7 @@ class ResultClassTest extends BaseCase $orderDate->setDateTime($date); $date = @mktime(8, 15, 00, 2, 15, 2003); - $this->assertIdentical($date, $orderDate->getTimeStamp()); + $this->assertSame($date, $orderDate->getTimeStamp()); } /** @@ -95,7 +95,7 @@ class ResultClassTest extends BaseCase function testDecimal() { $price = $this->sqlmap->queryForObject("GetDecimal", 1); - $this->assertIdentical(1.56, $price); + $this->assertSame(1.56, $price); } /** @@ -104,7 +104,7 @@ class ResultClassTest extends BaseCase function testDecimalWithoutResultClass() { $price = $this->sqlmap->queryForObject("GetDecimalWithoutResultClass", 1); - $this->assertIdentical(1.56, (float)$price); + $this->assertSame(1.56, (float)$price); } /** @@ -113,7 +113,7 @@ class ResultClassTest extends BaseCase function testDouble() { $price = $this->sqlmap->queryForObject("GetDouble", 1); - $this->assertIdentical(99.5, $price); + $this->assertSame(99.5, $price); } /** @@ -122,7 +122,7 @@ class ResultClassTest extends BaseCase function testDoubleWithoutResultClass() { $price = $this->sqlmap->queryForObject("GetDoubleWithoutResultClass", 1); - $this->assertIdentical(99.5, (float)$price); + $this->assertSame(99.5, (float)$price); } /** @@ -134,7 +134,7 @@ class ResultClassTest extends BaseCase Guid guid = (Guid) $this->sqlmap->queryForObject("GetGuid", 1); - $this->assertIdentical(newGuid, guid); + $this->assertSame(newGuid, guid); } */ @@ -149,7 +149,7 @@ class ResultClassTest extends BaseCase Guid guid = new Guid(guidString); - $this->assertIdentical(newGuid, guid); + $this->assertSame(newGuid, guid); } */ /** @@ -159,7 +159,7 @@ class ResultClassTest extends BaseCase { $integer = $this->sqlmap->queryForObject("GetInt16", 1); - $this->assertIdentical(32111, $integer); + $this->assertSame(32111, $integer); } /** @@ -168,7 +168,7 @@ class ResultClassTest extends BaseCase function testInt16WithoutResultClass() { $integer = $this->sqlmap->queryForObject("GetInt16WithoutResultClass", 1); - $this->assertIdentical(32111, (int)$integer); + $this->assertSame(32111, (int)$integer); } /** @@ -177,7 +177,7 @@ class ResultClassTest extends BaseCase function testInt32() { $integer = $this->sqlmap->queryForObject("GetInt32", 1); - $this->assertIdentical(999999, $integer); + $this->assertSame(999999, $integer); } /** @@ -186,7 +186,7 @@ class ResultClassTest extends BaseCase function testInt32WithoutResultClass() { $integer = $this->sqlmap->queryForObject("GetInt32WithoutResultClass", 1); - $this->assertIdentical(999999, (int)$integer); + $this->assertSame(999999, (int)$integer); } /** @@ -195,7 +195,7 @@ class ResultClassTest extends BaseCase function testInt64() { $bigInt = $this->sqlmap->queryForObject("GetInt64", 1); - $this->assertIdentical(9223372036854775800, $bigInt); + $this->assertEquals(9223372036854775800, $bigInt); } /** @@ -204,7 +204,7 @@ class ResultClassTest extends BaseCase function testInt64WithoutResultClass() { $bigInt = $this->sqlmap->queryForObject("GetInt64WithoutResultClass", 1); - $this->assertIdentical(9223372036854775800, (double)$bigInt); + $this->assertEquals(9223372036854775800, (double)$bigInt); } /** @@ -213,7 +213,7 @@ class ResultClassTest extends BaseCase function testSingle() { $price = (float)$this->sqlmap->queryForObject("GetSingle", 1); - $this->assertIdentical(92233.5, $price); + $this->assertSame(92233.5, $price); } /** @@ -222,7 +222,7 @@ class ResultClassTest extends BaseCase function testSingleWithoutResultClass() { $price = $this->sqlmap->queryForObject("GetSingleWithoutResultClass", 1); - $this->assertIdentical(92233.5, (float)$price); + $this->assertSame(92233.5, (float)$price); } /** @@ -231,7 +231,7 @@ class ResultClassTest extends BaseCase function testString() { $cardType = $this->sqlmap->queryForObject("GetString", 1); - $this->assertIdentical("VISA", $cardType); + $this->assertSame("VISA", $cardType); } /** @@ -240,7 +240,7 @@ class ResultClassTest extends BaseCase function testStringWithoutResultClass() { $cardType = $this->sqlmap->queryForObject("GetStringWithoutResultClass", 1); - $this->assertIdentical("VISA", $cardType); + $this->assertSame("VISA", $cardType); } /**/ diff --git a/tests/unit/Data/SqlMap/ResultMapTest.php b/tests/unit/Data/SqlMap/ResultMapTest.php index c757f874..56a4f2b1 100644 --- a/tests/unit/Data/SqlMap/ResultMapTest.php +++ b/tests/unit/Data/SqlMap/ResultMapTest.php @@ -41,7 +41,7 @@ class ResultMapTest extends BaseCase $order = $this->sqlmap->queryForObject("GetOrderWithLineItemsNoLazyLoad", 1); $this->assertOrder1($order); $this->assertTrue($order->getLineItemsList() instanceof TList); - $this->assertIdentical(2, $order->getLineItemsList()->getCount()); + $this->assertSame(2, $order->getLineItemsList()->getCount()); } @@ -51,12 +51,12 @@ class ResultMapTest extends BaseCase $this->assertOrder1($order); $this->assertNotNull($order->getLineItemsList()); $this->assertFalse($order->getLineItemsList() instanceof TList); - $this->assertIdentical(2, $order->getLineItemsList()->getCount()); + $this->assertSame(2, $order->getLineItemsList()->getCount()); // After a call to a method from a proxy object, // the proxy object is replaced by the real object. $this->assertTrue($order->getLineItemsList() instanceof TList); - $this->assertIdentical(2, $order->getLineItemsList()->getCount()); + $this->assertSame(2, $order->getLineItemsList()->getCount()); } function testLazyWithTypedCollectionMapping() @@ -66,7 +66,7 @@ class ResultMapTest extends BaseCase $this->assertNotNull($order->getLineItems()); $this->assertFalse($order->getLineItemsList() instanceof LineItemCollection); - $this->assertIdentical(2, $order->getLineItems()->getCount()); + $this->assertSame(2, $order->getLineItems()->getCount()); // After a call to a method from a proxy object, // the proxy object is replaced by the real object. @@ -81,7 +81,7 @@ class ResultMapTest extends BaseCase function testNullValueReplacementOnString() { $account = $this->sqlmap->queryForObject("GetAccountViaColumnName", 5); - $this->assertIdentical("no_email@provided.com", $account->getEmailAddress()); + $this->assertSame("no_email@provided.com", $account->getEmailAddress()); } function testTypeSpecified() @@ -104,7 +104,7 @@ class ResultMapTest extends BaseCase // Check strongly typed collection $this->assertNotNull($order->getLineItems()); - $this->assertIdentical(2, $order->getLineItems()->getCount()); + $this->assertSame(2, $order->getLineItems()->getCount()); } function testListMapping() @@ -114,7 +114,7 @@ class ResultMapTest extends BaseCase // Check TList collection $this->assertNotNull($order->getLineItemsList()); - $this->assertIdentical(2, $order->getLineItemsList()->getCount()); + $this->assertSame(2, $order->getLineItemsList()->getCount()); } function testArrayMapping() @@ -123,7 +123,7 @@ class ResultMapTest extends BaseCase $this->assertOrder1($order); $this->assertNotNull($order->getLineItemsArray()); $this->assertTrue(is_array($order->getLineItemsArray())); - $this->assertIdentical(2, count($order->getLineItemsArray())); + $this->assertSame(2, count($order->getLineItemsArray())); } function testTypedCollectionMapping() @@ -132,7 +132,7 @@ class ResultMapTest extends BaseCase $this->assertOrder1($order); $this->assertNotNull($order->getLineItems()); $this->assertTrue($order->getLineItems() instanceof LineItemCollection); - $this->assertIdentical(2, $order->getLineItems()->getCount()); + $this->assertSame(2, $order->getLineItems()->getCount()); foreach($order->getLineItems() as $item) { $this->assertNotNull($item); @@ -152,8 +152,8 @@ class ResultMapTest extends BaseCase $this->assertOrder1($order); $this->assertNotNull($order->getFavouriteLineItem()); - $this->assertIdentical(2, (int)$order->getFavouriteLineItem()->getID()); - $this->assertIdentical("ESM-23", $order->getFavouriteLineItem()->getCode()); + $this->assertSame(2, (int)$order->getFavouriteLineItem()->getID()); + $this->assertSame("ESM-23", $order->getFavouriteLineItem()->getCode()); } @@ -164,8 +164,8 @@ class ResultMapTest extends BaseCase $this->assertOrder1($order); $this->assertNotNull($order->getFavouriteLineItem()); - $this->assertIdentical(2, (int)$order->getFavouriteLineItem()->getID()); - $this->assertIdentical("ESM-23", $order->getFavouriteLineItem()->getCode()); + $this->assertSame(2, (int)$order->getFavouriteLineItem()->getID()); + $this->assertSame("ESM-23", $order->getFavouriteLineItem()->getCode()); } function testImplicitResultMaps() @@ -179,8 +179,8 @@ class ResultMapTest extends BaseCase $this->assertOrder1($order); $this->assertNotNull($order->getFavouriteLineItem()); - $this->assertIdentical(2, $order->getFavouriteLineItem()->getID()); - $this->assertIdentical("ESM-23", $order->getFavouriteLineItem()->getCode()); + $this->assertSame(2, $order->getFavouriteLineItem()->getID()); + $this->assertSame("ESM-23", $order->getFavouriteLineItem()->getCode()); } function testCompositeKeyMapping() @@ -192,11 +192,11 @@ class ResultMapTest extends BaseCase $this->assertNotNull($order1); $this->assertNotNull($order1->getFavouriteLineItem()); - $this->assertIdentical(2, $order1->getFavouriteLineItem()->getID()); + $this->assertSame(2, $order1->getFavouriteLineItem()->getID()); $this->assertNotNull($order2); $this->assertNotNull($order2->getFavouriteLineItem()); - $this->assertIdentical(1, $order2->getFavouriteLineItem()->getID()); + $this->assertSame(1, $order2->getFavouriteLineItem()->getID()); } @@ -206,8 +206,8 @@ class ResultMapTest extends BaseCase $list = $this->sqlmap->QueryForList("GetAllCreditCardNumbersFromOrders", null); - $this->assertIdentical(5, count($list)); - $this->assertIdentical("555555555555", $list[0]); + $this->assertSame(5, count($list)); + $this->assertSame("555555555555", $list[0]); } function testDecimalTypeMapping() @@ -217,8 +217,8 @@ class ResultMapTest extends BaseCase $param["LineItem_ID"] = 1; $param["Order_ID"] = 10; $price = $this->sqlmap->queryForObject("GetLineItemPrice", $param); - $this->assertIdentical(gettype($price), 'double'); - $this->assertIdentical(45.43, $price); + $this->assertSame(gettype($price), 'double'); + $this->assertSame(45.43, $price); } //todo @@ -234,9 +234,9 @@ class ResultMapTest extends BaseCase $enumClass = $this->sqlmap->queryForObject("GetEnumerationNullValue", 99); - $this->assertIdentical($enumClass['Day'], 'Days.Thu'); + $this->assertSame($enumClass['Day'], 'Days.Thu'); $this->asserEquals($enumClass['Color'], 'Colors.Blue'); - $this->assertIdentical($enumClass['Month'], 'Months.All'); + $this->assertSame($enumClass['Month'], 'Months.All'); } @@ -264,7 +264,7 @@ class ResultMapTest extends BaseCase $this->assertNotNull($order1); $this->assertNotNull($order1->getFavouriteLineItem()); var_dump($order1); - $this->assertIdentical(2, $order1->getFavouriteLineItem()->getID()); + $this->assertSame(2, $order1->getFavouriteLineItem()->getID()); } */ diff --git a/tests/unit/Data/SqlMap/SelectKeyTest.php b/tests/unit/Data/SqlMap/SelectKeyTest.php index a0554aef..47d305f3 100644 --- a/tests/unit/Data/SqlMap/SelectKeyTest.php +++ b/tests/unit/Data/SqlMap/SelectKeyTest.php @@ -38,15 +38,15 @@ class SelectKeyTest extends BaseCase $key = $this->sqlmap->Insert("InsertLineItemPostKey", $item); - $this->assertIdentical(99, $key); - $this->assertIdentical(99, $item->getId()); + $this->assertSame(99, $key); + $this->assertSame(99, $item->getId()); $param["Order_ID"] = 9; $param["LineItem_ID"] =10; $testItem = $this->sqlmap->QueryForObject("GetSpecificLineItem", $param); $this->assertNotNull($testItem); - $this->assertIdentical(10, $testItem->getId()); + $this->assertSame(10, $testItem->getId()); $this->initScript('line-item-init.sql'); } @@ -69,8 +69,8 @@ class SelectKeyTest extends BaseCase $key = $this->sqlmap->Insert("InsertLineItemPreKey", $item); - $this->assertIdentical(99, $key); - $this->assertIdentical(99, $item->getId()); + $this->assertSame(99, $key); + $this->assertSame(99, $item->getId()); $param["Order_ID"] = 9; $param["LineItem_ID"] = 99; @@ -78,7 +78,7 @@ class SelectKeyTest extends BaseCase $testItem = $this->sqlmap->QueryForObject("GetSpecificLineItem", $param); $this->assertNotNull($testItem); - $this->assertIdentical(99, $testItem->getId()); + $this->assertSame(99, $testItem->getId()); $this->initScript('line-item-init.sql'); } @@ -103,7 +103,7 @@ class SelectKeyTest extends BaseCase $key = $this->sqlmap->Insert("InsertLineItemNoKey", $item); $this->assertNull($key); - $this->assertIdentical(100, $item->getId()); + $this->assertSame(100, $item->getId()); $param["Order_ID"] = 9; $param["LineItem_ID"] = 100; @@ -111,7 +111,7 @@ class SelectKeyTest extends BaseCase $testItem = $this->sqlmap->QueryForObject("GetSpecificLineItem", $param); $this->assertNotNull($testItem); - $this->assertIdentical(100, $testItem->getId()); + $this->assertSame(100, $testItem->getId()); $this->initScript('line-item-init.sql'); } diff --git a/tests/unit/Data/SqlMap/SqlMapCacheTest.php b/tests/unit/Data/SqlMap/SqlMapCacheTest.php index 57851217..4f0d74a1 100644 --- a/tests/unit/Data/SqlMap/SqlMapCacheTest.php +++ b/tests/unit/Data/SqlMap/SqlMapCacheTest.php @@ -9,7 +9,8 @@ class SqlMapCacheTest extends PHPUnit_Framework_TestCase { function testFIFOCache() { - $fifo = new TSqlMapFifoCache(2); + $fifo = new TSqlMapFifoCache(); + $fifo->setCacheSize(2); $object1 = new TSqlMapManager; $object2 = new TComponent; $object3 = new TSqlMapGateway(null); @@ -41,8 +42,8 @@ class SqlMapCacheTest extends PHPUnit_Framework_TestCase function testLruCache() { - $lru = new TSqlMapLruCache(2); - + $lru = new TSqlMapLruCache(); + $lru->setCacheSize(2); $object1 = new TSqlMapManager; $object2 = new TComponent; $object3 = new TSqlMapGateway(null); diff --git a/tests/unit/Data/SqlMap/StatementExtendsTest.php b/tests/unit/Data/SqlMap/StatementExtendsTest.php index 15d00e39..94c55c44 100644 --- a/tests/unit/Data/SqlMap/StatementExtendsTest.php +++ b/tests/unit/Data/SqlMap/StatementExtendsTest.php @@ -21,11 +21,11 @@ class StatementExtendsTest extends PHPUnit_Framework_TestCase $manager = $this->sqlmap->SqlMapManager; $sql = $manager->getMappedStatement('test')->getSqlString(); - $this->assertPattern('/img_request/', $sql); - $this->assertNoPattern('/img_progress/', $sql); + $this->assertRegExp('/img_request/', $sql); +// $this->assertNoPattern('/img_progress/', $sql); $sql2 = $manager->getMappedStatement('GetAllProgress')->getSqlString(); - $this->assertPattern('/img_request/', $sql2); - $this->assertPattern('/img_progress/', $sql2); + $this->assertRegExp('/img_request/', $sql2); + $this->assertRegExp('/img_progress/', $sql2); } } diff --git a/tests/unit/Data/SqlMap/StatementTest.php b/tests/unit/Data/SqlMap/StatementTest.php index bdcc3ae7..8e40625d 100644 --- a/tests/unit/Data/SqlMap/StatementTest.php +++ b/tests/unit/Data/SqlMap/StatementTest.php @@ -91,7 +91,7 @@ class StatementTest extends BaseCase function testExecuteQueryForObjectWithSimpleResultClass() { $email = $this->sqlmap->QueryForObject("GetEmailAddressViaResultClass", 1); - $this->assertIdentical("Joe.Dalton@somewhere.com", $email); + $this->assertSame("Joe.Dalton@somewhere.com", $email); } /** @@ -100,7 +100,7 @@ class StatementTest extends BaseCase function testExecuteQueryForObjectWithSimpleResultMap() { $email = $this->sqlmap->QueryForObject("GetEmailAddressViaResultMap", 1); - $this->assertIdentical("Joe.Dalton@somewhere.com", $email); + $this->assertSame("Joe.Dalton@somewhere.com", $email); } /** @@ -110,7 +110,7 @@ class StatementTest extends BaseCase { $CardExpiry = $this->sqlmap->QueryForObject("GetOrderCardExpiryViaResultClass", 1); $date = @mktime(8, 15, 00, 2, 15, 2003); - $this->assertIdentical($date, $CardExpiry->getTimeStamp()); + $this->assertSame($date, $CardExpiry->getTimeStamp()); } /** @@ -153,7 +153,7 @@ class StatementTest extends BaseCase $testItem = $this->sqlmap->QueryForObject("GetSpecificLineItem", $param); $this->assertNotNull($testItem); - $this->assertIdentical("TSM-12", $testItem->getCode()); + $this->assertSame("TSM-12", $testItem->getCode()); } /**/ @@ -162,11 +162,11 @@ class StatementTest extends BaseCase { //$list = $this->sqlmap->QueryForList("GetDynamicOrderedEmailAddressesViaResultMap", "Account_ID"); - //$this->assertIdentical("Joe.Dalton@somewhere.com", $list[0]); + //$this->assertSame("Joe.Dalton@somewhere.com", $list[0]); //list = $this->sqlmap->QueryForList("GetDynamicOrderedEmailAddressesViaResultMap", "Account_FirstName"); - //$this->assertIdentical("Averel.Dalton@somewhere.com", $list[0]); + //$this->assertSame("Averel.Dalton@somewhere.com", $list[0]); } @@ -176,14 +176,14 @@ class StatementTest extends BaseCase //$list = $this->sqlmap->QueryForList("GetAllAccountsViaResultMapWithDynamicElement", "LIKE"); //$this->assertAccount1$list[0]); - //$this->assertIdentical(3, $list->getCount()); - //$this->assertIdentical(1, $list[0]->getID()); - //$this->assertIdentical(2, $list[1]->getID()); - //$this->assertIdentical(4, $list[2]->getID()); + //$this->assertSame(3, $list->getCount()); + //$this->assertSame(1, $list[0]->getID()); + //$this->assertSame(2, $list[1]->getID()); + //$this->assertSame(4, $list[2]->getID()); //list = $this->sqlmap->QueryForList("GetAllAccountsViaResultMapWithDynamicElement", "="); - //$this->assertIdentical(0, $list->getCount()); + //$this->assertSame(0, $list->getCount()); } @@ -208,15 +208,15 @@ class StatementTest extends BaseCase { //$enumClass = $this->sqlmap->QueryForObject("GetEnumeration", 1); - //$this->assertIdentical(enumClass.Day, Days.Sat); - //$this->assertIdentical(enumClass.Color, Colors.Red); - //$this->assertIdentical(enumClass.Month, Months.August); + //$this->assertSame(enumClass.Day, Days.Sat); + //$this->assertSame(enumClass.Color, Colors.Red); + //$this->assertSame(enumClass.Month, Months.August); //enumClass = $this->sqlmap->QueryForObject("GetEnumeration", 3) as Enumeration; - //$this->assertIdentical(enumClass.Day, Days.Mon); - //$this->assertIdentical(enumClass.Color, Colors.Blue); - //$this->assertIdentical(enumClass.Month, Months.September);*/ + //$this->assertSame(enumClass.Day, Days.Mon); + //$this->assertSame(enumClass.Color, Colors.Blue); + //$this->assertSame(enumClass.Month, Months.September);*/ } #endregion @@ -232,13 +232,13 @@ class StatementTest extends BaseCase $list = $this->sqlmap->QueryForList("GetAllAccountsAsHashMapViaResultMap"); $this->assertAccount1AsHashArray($list[0]); - $this->assertIdentical(5, count($list)); + $this->assertSame(5, count($list)); - $this->assertIdentical(1, (int)$list[0]["Id"]); - $this->assertIdentical(2, (int)$list[1]["Id"]); - $this->assertIdentical(3, (int)$list[2]["Id"]); - $this->assertIdentical(4, (int)$list[3]["Id"]); - $this->assertIdentical(5, (int)$list[4]["Id"]); + $this->assertSame(1, (int)$list[0]["Id"]); + $this->assertSame(2, (int)$list[1]["Id"]); + $this->assertSame(3, (int)$list[2]["Id"]); + $this->assertSame(4, (int)$list[3]["Id"]); + $this->assertSame(5, (int)$list[4]["Id"]); } /** @@ -249,13 +249,13 @@ class StatementTest extends BaseCase $list = $this->sqlmap->QueryForList("GetAllAccountsAsHashtableViaResultClass"); $this->assertAccount1AsHashArray($list[0]); - $this->assertIdentical(5, count($list)); + $this->assertSame(5, count($list)); - $this->assertIdentical(1, (int)$list[0]["Id"]); - $this->assertIdentical(2, (int)$list[1]["Id"]); - $this->assertIdentical(3, (int)$list[2]["Id"]); - $this->assertIdentical(4, (int)$list[3]["Id"]); - $this->assertIdentical(5, (int)$list[4]["Id"]); + $this->assertSame(1, (int)$list[0]["Id"]); + $this->assertSame(2, (int)$list[1]["Id"]); + $this->assertSame(3, (int)$list[2]["Id"]); + $this->assertSame(4, (int)$list[3]["Id"]); + $this->assertSame(5, (int)$list[4]["Id"]); } /** @@ -267,23 +267,23 @@ class StatementTest extends BaseCase $listAccount = $list[0]; - $this->assertIdentical(1,(int)$listAccount[0]); - $this->assertIdentical("Joe",$listAccount[1]); - $this->assertIdentical("Dalton",$listAccount[2]); - $this->assertIdentical("Joe.Dalton@somewhere.com",$listAccount[3]); + $this->assertSame(1,(int)$listAccount[0]); + $this->assertSame("Joe",$listAccount[1]); + $this->assertSame("Dalton",$listAccount[2]); + $this->assertSame("Joe.Dalton@somewhere.com",$listAccount[3]); - $this->assertIdentical(5, count($list)); + $this->assertSame(5, count($list)); $listAccount = $list[0]; - $this->assertIdentical(1, (int)$listAccount[0]); + $this->assertSame(1, (int)$listAccount[0]); $listAccount = $list[1]; - $this->assertIdentical(2, (int)$listAccount[0]); + $this->assertSame(2, (int)$listAccount[0]); $listAccount = $list[2]; - $this->assertIdentical(3, (int)$listAccount[0]); + $this->assertSame(3, (int)$listAccount[0]); $listAccount = $list[3]; - $this->assertIdentical(4, (int)$listAccount[0]); + $this->assertSame(4, (int)$listAccount[0]); $listAccount = $list[4]; - $this->assertIdentical(5, (int)$listAccount[0]); + $this->assertSame(5, (int)$listAccount[0]); } /** @@ -294,12 +294,12 @@ class StatementTest extends BaseCase $list = $this->sqlmap->QueryForList("GetAllAccountsViaResultMap"); $this->assertAccount1($list[0]); - $this->assertIdentical(5, count($list)); - $this->assertIdentical(1, $list[0]->getID()); - $this->assertIdentical(2, $list[1]->getID()); - $this->assertIdentical(3, $list[2]->getID()); - $this->assertIdentical(4, $list[3]->getID()); - $this->assertIdentical(5, $list[4]->getID()); + $this->assertSame(5, count($list)); + $this->assertSame(1, $list[0]->getID()); + $this->assertSame(2, $list[1]->getID()); + $this->assertSame(3, $list[2]->getID()); + $this->assertSame(4, $list[3]->getID()); + $this->assertSame(5, $list[4]->getID()); } /** @@ -314,138 +314,138 @@ class StatementTest extends BaseCase $this->assertFalse($list->getIsPreviousPageAvailable()); $this->assertTrue($list->getIsNextPageAvailable()); $this->assertAccount1($list[0]); - $this->assertIdentical(2, $list->getCount()); - $this->assertIdentical(1, $list[0]->getID()); - $this->assertIdentical(2, $list[1]->getID()); + $this->assertSame(2, $list->getCount()); + $this->assertSame(1, $list[0]->getID()); + $this->assertSame(2, $list[1]->getID()); // Test illegal previous page (no effect, state should be same) $list->PreviousPage(); $this->assertFalse($list->getIsPreviousPageAvailable()); $this->assertTrue($list->getIsNextPageAvailable()); $this->assertAccount1($list[0]); - $this->assertIdentical(2, $list->getCount()); - $this->assertIdentical(1, $list[0]->getID()); - $this->assertIdentical(2, $list[1]->getID()); + $this->assertSame(2, $list->getCount()); + $this->assertSame(1, $list[0]->getID()); + $this->assertSame(2, $list[1]->getID()); // Test next (page 1) $list->NextPage(); $this->assertTrue($list->getIsPreviousPageAvailable()); $this->assertTrue($list->getIsNextPageAvailable()); - $this->assertIdentical(2, $list->getCount()); - $this->assertIdentical(3, $list[0]->getID()); - $this->assertIdentical(4, $list[1]->getID()); + $this->assertSame(2, $list->getCount()); + $this->assertSame(3, $list[0]->getID()); + $this->assertSame(4, $list[1]->getID()); // Test next (page 2 -last) $list->NextPage(); $this->assertTrue($list->getIsPreviousPageAvailable()); $this->assertFalse($list->getIsNextPageAvailable()); - $this->assertIdentical(1, $list->getCount()); - $this->assertIdentical(5, $list[0]->getID()); + $this->assertSame(1, $list->getCount()); + $this->assertSame(5, $list[0]->getID()); // Test previous (page 1) $list->PreviousPage(); $this->assertTrue($list->getIsPreviousPageAvailable()); $this->assertTrue($list->getIsNextPageAvailable()); - $this->assertIdentical(2, $list->getCount()); - $this->assertIdentical(3, $list[0]->getID()); - $this->assertIdentical(4, $list[1]->getID()); + $this->assertSame(2, $list->getCount()); + $this->assertSame(3, $list[0]->getID()); + $this->assertSame(4, $list[1]->getID()); // Test previous (page 0 -first) $list->PreviousPage(); $this->assertFalse($list->getIsPreviousPageAvailable()); $this->assertTrue($list->getIsNextPageAvailable()); $this->assertAccount1($list[0]); - $this->assertIdentical(2, $list->getCount()); - $this->assertIdentical(1, $list[0]->getID()); - $this->assertIdentical(2, $list[1]->getID()); + $this->assertSame(2, $list->getCount()); + $this->assertSame(1, $list[0]->getID()); + $this->assertSame(2, $list[1]->getID()); // Test goto (page 0) $list->GotoPage(0); $this->assertFalse($list->getIsPreviousPageAvailable()); $this->assertTrue($list->getIsNextPageAvailable()); - $this->assertIdentical(2, $list->getCount()); - $this->assertIdentical(1, $list[0]->getID()); - $this->assertIdentical(2, $list[1]->getID()); + $this->assertSame(2, $list->getCount()); + $this->assertSame(1, $list[0]->getID()); + $this->assertSame(2, $list[1]->getID()); // Test goto (page 1) $list->GotoPage(1); $this->assertTrue($list->getIsPreviousPageAvailable()); $this->assertTrue($list->getIsNextPageAvailable()); - $this->assertIdentical(2, $list->getCount()); - $this->assertIdentical(3, $list[0]->getID()); - $this->assertIdentical(4, $list[1]->getID()); + $this->assertSame(2, $list->getCount()); + $this->assertSame(3, $list[0]->getID()); + $this->assertSame(4, $list[1]->getID()); // Test goto (page 2) $list->GotoPage(2); $this->assertTrue($list->getIsPreviousPageAvailable()); $this->assertFalse($list->getIsNextPageAvailable()); - $this->assertIdentical(1, $list->getCount()); - $this->assertIdentical(5, $list[0]->getID()); + $this->assertSame(1, $list->getCount()); + $this->assertSame(5, $list[0]->getID()); // Test illegal goto (page 0) $list->GotoPage(3); $this->assertTrue($list->getIsPreviousPageAvailable()); $this->assertFalse($list->getIsNextPageAvailable()); - $this->assertIdentical(0, $list->getCount()); + $this->assertSame(0, $list->getCount()); $list = $this->sqlmap->QueryForPagedList("GetNoAccountsViaResultMap", null, 2); // Test empty list $this->assertFalse($list->getIsPreviousPageAvailable()); $this->assertFalse($list->getIsNextPageAvailable()); - $this->assertIdentical(0, $list->getCount()); + $this->assertSame(0, $list->getCount()); // Test next $list->NextPage(); $this->assertFalse($list->getIsPreviousPageAvailable()); $this->assertFalse($list->getIsNextPageAvailable()); - $this->assertIdentical(0, $list->getCount()); + $this->assertSame(0, $list->getCount()); // Test previous $list->PreviousPage(); $this->assertFalse($list->getIsPreviousPageAvailable()); $this->assertFalse($list->getIsNextPageAvailable()); - $this->assertIdentical(0, $list->getCount()); + $this->assertSame(0, $list->getCount()); // Test previous $list->GotoPage(0); $this->assertFalse($list->getIsPreviousPageAvailable()); $this->assertFalse($list->getIsNextPageAvailable()); - $this->assertIdentical(0, $list->getCount()); + $this->assertSame(0, $list->getCount()); $list = $this->sqlmap->QueryForPagedList("GetFewAccountsViaResultMap", null, 2); $this->assertFalse($list->getIsPreviousPageAvailable()); $this->assertFalse($list->getIsNextPageAvailable()); - $this->assertIdentical(1, $list->getCount()); + $this->assertSame(1, $list->getCount()); // Test next $list->NextPage(); $this->assertFalse($list->getIsPreviousPageAvailable()); $this->assertFalse($list->getIsNextPageAvailable()); - $this->assertIdentical(1, $list->getCount()); + $this->assertSame(1, $list->getCount()); // Test previous $list->PreviousPage(); $this->assertFalse($list->getIsPreviousPageAvailable()); $this->assertFalse($list->getIsNextPageAvailable()); - $this->assertIdentical(1, $list->getCount()); + $this->assertSame(1, $list->getCount()); // Test previous $list->GotoPage(0); $this->assertFalse($list->getIsPreviousPageAvailable()); $this->assertFalse($list->getIsNextPageAvailable()); - $this->assertIdentical(1, $list->getCount()); + $this->assertSame(1, $list->getCount()); $list = $this->sqlmap->QueryForPagedList("GetAllAccountsViaResultMap", null, 5); - $this->assertIdentical(5, $list->getCount()); + $this->assertSame(5, $list->getCount()); $list->NextPage(); - $this->assertIdentical(5, $list->getCount()); + $this->assertSame(5, $list->getCount()); $b = $list->getIsPreviousPageAvailable(); $list->PreviousPage(); - $this->assertIdentical(5, $list->getCount()); + $this->assertSame(5, $list->getCount()); } /** @@ -458,12 +458,12 @@ class StatementTest extends BaseCase $this->sqlmap->QueryForList("GetAllAccountsViaResultMap", null, $accounts); $this->assertAccount1($accounts[0]); - $this->assertIdentical(5, $accounts->getCount()); - $this->assertIdentical(1, $accounts[0]->getID()); - $this->assertIdentical(2, $accounts[1]->getID()); - $this->assertIdentical(3, $accounts[2]->getID()); - $this->assertIdentical(4, $accounts[3]->getID()); - $this->assertIdentical(5, $accounts[4]->GetId()); + $this->assertSame(5, $accounts->getCount()); + $this->assertSame(1, $accounts[0]->getID()); + $this->assertSame(2, $accounts[1]->getID()); + $this->assertSame(3, $accounts[2]->getID()); + $this->assertSame(4, $accounts[3]->getID()); + $this->assertSame(5, $accounts[4]->GetId()); } /** @@ -474,9 +474,9 @@ class StatementTest extends BaseCase $linesItem = $this->sqlmap->QueryForList("GetLineItemsForOrderWithListClass", 10); $this->assertNotNull($linesItem); - $this->assertIdentical(2, $linesItem->getCount()); - $this->assertIdentical("ESM-34", $linesItem[0]->getCode()); - $this->assertIdentical("QSM-98", $linesItem[1]->getCode()); + $this->assertSame(2, $linesItem->getCount()); + $this->assertSame("ESM-34", $linesItem[0]->getCode()); + $this->assertSame("QSM-98", $linesItem[1]->getCode()); } /** @@ -486,7 +486,7 @@ class StatementTest extends BaseCase { $list = $this->sqlmap->QueryForList("GetNoAccountsViaResultMap"); - $this->assertIdentical(0, count($list)); + $this->assertSame(0, count($list)); } /** @@ -497,12 +497,12 @@ class StatementTest extends BaseCase $list = $this->sqlmap->QueryForList("GetAllAccountsViaResultClass"); $this->assertAccount1($list[0]); - $this->assertIdentical(5, count($list)); - $this->assertIdentical(1, $list[0]->getID()); - $this->assertIdentical(2, $list[1]->getID()); - $this->assertIdentical(3, $list[2]->getID()); - $this->assertIdentical(4, $list[3]->getID()); - $this->assertIdentical(5, $list[4]->getID()); + $this->assertSame(5, count($list)); + $this->assertSame(1, $list[0]->getID()); + $this->assertSame(2, $list[1]->getID()); + $this->assertSame(3, $list[2]->getID()); + $this->assertSame(4, $list[3]->getID()); + $this->assertSame(5, $list[4]->getID()); } /** @@ -512,11 +512,11 @@ class StatementTest extends BaseCase { $list = $this->sqlmap->QueryForList("GetAllEmailAddressesViaResultClass"); - $this->assertIdentical("Joe.Dalton@somewhere.com", $list[0]); - $this->assertIdentical("Averel.Dalton@somewhere.com", $list[1]); - $this->assertIdentical('', $list[2]); - $this->assertIdentical("Jack.Dalton@somewhere.com", $list[3]); - $this->assertIdentical('', $list[4]); + $this->assertSame("Joe.Dalton@somewhere.com", $list[0]); + $this->assertSame("Averel.Dalton@somewhere.com", $list[1]); + $this->assertSame('', $list[2]); + $this->assertSame("Jack.Dalton@somewhere.com", $list[3]); + $this->assertSame('', $list[4]); } /** @@ -526,11 +526,11 @@ class StatementTest extends BaseCase { $list = $this->sqlmap->QueryForList("GetAllEmailAddressesViaResultMap"); - $this->assertIdentical("Joe.Dalton@somewhere.com", $list[0]); - $this->assertIdentical("Averel.Dalton@somewhere.com", $list[1]); - $this->assertIdentical('', $list[2]); - $this->assertIdentical("Jack.Dalton@somewhere.com", $list[3]); - $this->assertIdentical('', $list[4]); + $this->assertSame("Joe.Dalton@somewhere.com", $list[0]); + $this->assertSame("Averel.Dalton@somewhere.com", $list[1]); + $this->assertSame('', $list[2]); + $this->assertSame("Jack.Dalton@somewhere.com", $list[3]); + $this->assertSame('', $list[4]); } /** @@ -540,9 +540,9 @@ class StatementTest extends BaseCase { $list = $this->sqlmap->QueryForList("GetAllAccountsViaResultMap", null, null, 2, 2); - $this->assertIdentical(2, count($list)); - $this->assertIdentical(3, $list[0]->getID()); - $this->assertIdentical(4, $list[1]->getID()); + $this->assertSame(2, count($list)); + $this->assertSame(3, $list[0]->getID()); + $this->assertSame(4, $list[1]->getID()); } @@ -555,14 +555,14 @@ class StatementTest extends BaseCase //$list = $this->sqlmap->QueryWithRowDelegate("GetAllAccountsViaResultMap", null, handler); - //$this->assertIdentical(5, _index); - //$this->assertIdentical(5, $list->getCount()); + //$this->assertSame(5, _index); + //$this->assertSame(5, $list->getCount()); //$this->assertAccount1$list[0]); - //$this->assertIdentical(1, $list[0]->getID()); - //$this->assertIdentical(2, $list[1]->getID()); - //$this->assertIdentical(3, $list[2]->getID()); - //$this->assertIdentical(4, $list[3]->getID()); - //$this->assertIdentical(5, $list[4]->getID()); + //$this->assertSame(1, $list[0]->getID()); + //$this->assertSame(2, $list[1]->getID()); + //$this->assertSame(3, $list[2]->getID()); + //$this->assertSame(4, $list[3]->getID()); + //$this->assertSame(5, $list[4]->getID()); } #endregion @@ -576,14 +576,14 @@ class StatementTest extends BaseCase { $map = $this->sqlmap->QueryForMap("GetAllAccountsViaResultClass", null, "FirstName"); - $this->assertIdentical(5, count($map)); + $this->assertSame(5, count($map)); $this->assertAccount1($map["Joe"]); - $this->assertIdentical(1, $map["Joe"]->getID()); - $this->assertIdentical(2, $map["Averel"]->getID()); - $this->assertIdentical(3, $map["William"]->getID()); - $this->assertIdentical(4, $map["Jack"]->getID()); - $this->assertIdentical(5, $map["Gilles"]->getID()); + $this->assertSame(1, $map["Joe"]->getID()); + $this->assertSame(2, $map["Averel"]->getID()); + $this->assertSame(3, $map["William"]->getID()); + $this->assertSame(4, $map["Jack"]->getID()); + $this->assertSame(5, $map["Gilles"]->getID()); } /** @@ -596,10 +596,10 @@ class StatementTest extends BaseCase { $map = $this->sqlmap->QueryForMap("GetAllOrderWithLineItems", null, "PostalCode"); - $this->assertIdentical(11, count($map)); + $this->assertSame(11, count($map)); $order = $map["T4H 9G4"]; - $this->assertIdentical(2, $order->getLineItemsList()->getCount()); + $this->assertSame(2, $order->getLineItemsList()->getCount()); } /** @@ -611,12 +611,12 @@ class StatementTest extends BaseCase $map = $this->sqlmap->QueryForMap("GetAllAccountsViaResultClass", null, "FirstName", "EmailAddress"); - $this->assertIdentical(5, count($map)); + $this->assertSame(5, count($map)); - $this->assertIdentical("Joe.Dalton@somewhere.com", $map["Joe"]); - $this->assertIdentical("Averel.Dalton@somewhere.com", $map["Averel"]); + $this->assertSame("Joe.Dalton@somewhere.com", $map["Joe"]); + $this->assertSame("Averel.Dalton@somewhere.com", $map["Averel"]); $this->assertNull($map["William"]); - $this->assertIdentical("Jack.Dalton@somewhere.com", $map["Jack"]); + $this->assertSame("Jack.Dalton@somewhere.com", $map["Jack"]); $this->assertNull($map["Gilles"]); } @@ -663,12 +663,12 @@ class StatementTest extends BaseCase $list = $this->sqlmap->QueryForList("GetAllAccounts"); $this->assertAccount1($list[0]); - $this->assertIdentical(5, count($list)); - $this->assertIdentical(1, $list[0]->getID()); - $this->assertIdentical(2, $list[1]->getID()); - $this->assertIdentical(3, $list[2]->getID()); - $this->assertIdentical(4, $list[3]->getID()); - $this->assertIdentical(5, $list[4]->getID()); + $this->assertSame(5, count($list)); + $this->assertSame(1, $list[0]->getID()); + $this->assertSame(2, $list[1]->getID()); + $this->assertSame(3, $list[2]->getID()); + $this->assertSame(4, $list[3]->getID()); + $this->assertSame(5, $list[4]->getID()); } /** @@ -679,13 +679,13 @@ class StatementTest extends BaseCase $list = $this->sqlmap->QueryForList("GetAllAccountsOrderByName"); $this->assertAccount1($list[3]); - $this->assertIdentical(5, count($list)); + $this->assertSame(5, count($list)); - $this->assertIdentical(2, $list[0]->getID()); - $this->assertIdentical(5, $list[1]->getID()); - $this->assertIdentical(4, $list[2]->getID()); - $this->assertIdentical(1, $list[3]->getID()); - $this->assertIdentical(3, $list[4]->getID()); + $this->assertSame(2, $list[0]->getID()); + $this->assertSame(5, $list[1]->getID()); + $this->assertSame(4, $list[2]->getID()); + $this->assertSame(1, $list[3]->getID()); + $this->assertSame(3, $list[4]->getID()); } /** @@ -707,11 +707,11 @@ class StatementTest extends BaseCase $list = $this->sqlmap->QueryForList("GetSomeAccount", $param); - $this->assertIdentical(3, count($list)); + $this->assertSame(3, count($list)); - $this->assertIdentical(2, $list[0]->getID()); - $this->assertIdentical(3, $list[1]->getID()); - $this->assertIdentical(4, $list[2]->getID()); + $this->assertSame(2, $list[0]->getID()); + $this->assertSame(3, $list[1]->getID()); + $this->assertSame(4, $list[2]->getID()); } #endregion @@ -739,7 +739,7 @@ class StatementTest extends BaseCase $this->assertNotNull($testAccount); - $this->assertIdentical(10, $testAccount->getID()); + $this->assertSame(10, $testAccount->getID()); $this->initScript('account-init.sql'); } @@ -792,7 +792,7 @@ class StatementTest extends BaseCase $testAccount = $this->sqlmap->QueryForObject("GetAccountViaColumnIndex", 10); $this->assertNotNull($testAccount); - $this->assertIdentical(10, $testAccount->getId()); + $this->assertSame(10, $testAccount->getId()); $this->initScript('account-init.sql'); } @@ -824,7 +824,7 @@ class StatementTest extends BaseCase $account = $this->sqlmap->QueryForObject("GetAccountViaColumnName", 1); - $this->assertIdentical("new@somewhere.com", $account->getEmailAddress()); + $this->assertSame("new@somewhere.com", $account->getEmailAddress()); $this->initScript('account-init.sql'); } @@ -841,7 +841,7 @@ class StatementTest extends BaseCase $account = $this->sqlmap->QueryForObject("GetAccountViaColumnName", 1); - $this->assertIdentical("new@somewhere.com", $account->getEmailAddress()); + $this->assertSame("new@somewhere.com", $account->getEmailAddress()); $this->initScript('account-init.sql'); } @@ -858,7 +858,7 @@ class StatementTest extends BaseCase $account = $this->sqlmap->QueryForObject("GetAccountViaColumnName", 1); - $this->assertIdentical("new@somewhere.com", $account->getEmailAddress()); + $this->assertSame("new@somewhere.com", $account->getEmailAddress()); $this->initScript('account-init.sql'); } @@ -879,7 +879,7 @@ class StatementTest extends BaseCase $account = $this->sqlmap->QueryForObject("GetAccountViaColumnName", 6); $this->assertNull($account); - $this->assertIdentical(0, $noRowsDeleted); + $this->assertSame(0, $noRowsDeleted); $this->initScript('account-init.sql'); } @@ -915,7 +915,7 @@ class StatementTest extends BaseCase $this->initScript('line-item-init.sql'); $rowNumber = $this->sqlmap->Delete("DeleteWithComments"); - $this->assertIdentical($rowNumber, 2); + $this->assertSame($rowNumber, 2); $this->initScript('line-item-init.sql'); } @@ -930,7 +930,7 @@ class StatementTest extends BaseCase function RowHandler($sender, $paramterObject, $list) { //_index++; - //$this->assertIdentical(_index, (($account) obj).Id); + //$this->assertSame(_index, (($account) obj).Id); //$list->Add(obj); } @@ -994,7 +994,7 @@ class StatementTest extends BaseCase $list = $this->sqlmap->QueryForList("GetAccounts"); $this->assertAccount1($list[0]); - $this->assertIdentical(5, count($list)); + $this->assertSame(5, count($list)); } /** @@ -1010,7 +1010,7 @@ class StatementTest extends BaseCase $firstId = HashCodeProvider.GetIdentityHashCode(list); list = $this->sqlmap->QueryForList("GetCachedAccountsViaResultMap"); int secondId = HashCodeProvider.GetIdentityHashCode(list); - $this->assertIdentical(firstId, secondId); + $this->assertSame(firstId, secondId); string cacheStats = $this->sqlmap->GetDataCacheStats(); @@ -1032,12 +1032,12 @@ class StatementTest extends BaseCase $list = $this->sqlmap->QueryForList("GetAllAccountsViaCustomTypeHandler"); $this->assertAccount1($list[0]); - $this->assertIdentical(5, count($list)); - $this->assertIdentical(1, $list[0]->getID()); - $this->assertIdentical(2, $list[1]->getID()); - $this->assertIdentical(3, $list[2]->getID()); - $this->assertIdentical(4, $list[3]->getID()); - $this->assertIdentical(5, $list[4]->getID()); + $this->assertSame(5, count($list)); + $this->assertSame(1, $list[0]->getID()); + $this->assertSame(2, $list[1]->getID()); + $this->assertSame(3, $list[2]->getID()); + $this->assertSame(4, $list[3]->getID()); + $this->assertSame(5, $list[4]->getID()); $this->assertFalse($list[0]->getCartOptions()); $this->assertFalse($list[1]->getCartOptions()); @@ -1071,10 +1071,10 @@ class StatementTest extends BaseCase $anOther = $this->sqlmap->QueryForObject("SelectByInt", 99); $this->assertNotNull( $anOther ); - $this->assertIdentical(99, (int)$anOther->getInt()); - $this->assertIdentical(1966, (int)$anOther->getLong()); - $this->assertIdentical(true, (boolean)$anOther->getBool()); - $this->assertIdentical(false, (boolean)$anOther->getBool2()); + $this->assertSame(99, (int)$anOther->getInt()); + $this->assertSame(1966, (int)$anOther->getLong()); + $this->assertSame(true, (boolean)$anOther->getBool()); + $this->assertSame(false, (boolean)$anOther->getBool2()); } @@ -1097,10 +1097,10 @@ class StatementTest extends BaseCase $anOther = $this->sqlmap->QueryForObject("SelectByIntV1", 99); $this->assertNotNull( $anOther ); - $this->assertIdentical(99, (int)$anOther->getInt()); - $this->assertIdentical(1966, (int)$anOther->getLong()); - $this->assertIdentical(true, (boolean)$anOther->getBool()); - $this->assertIdentical(false, (boolean)$anOther->getBool2()); + $this->assertSame(99, (int)$anOther->getInt()); + $this->assertSame(1966, (int)$anOther->getLong()); + $this->assertSame(true, (boolean)$anOther->getBool()); + $this->assertSame(false, (boolean)$anOther->getBool2()); } @@ -1123,10 +1123,10 @@ class StatementTest extends BaseCase $anOther = $this->sqlmap->QueryForObject("SelectByInt", 99); $this->assertNotNull( $anOther ); - $this->assertIdentical(99, (int)$anOther->getInt()); - $this->assertIdentical(1966, (int)$anOther->getLong()); - $this->assertIdentical(true, (boolean)$anOther->getBool()); - $this->assertIdentical(false, (boolean)$anOther->getBool2()); + $this->assertSame(99, (int)$anOther->getInt()); + $this->assertSame(1966, (int)$anOther->getLong()); + $this->assertSame(true, (boolean)$anOther->getBool()); + $this->assertSame(false, (boolean)$anOther->getBool2()); } #endregion /**/ diff --git a/tests/unit/Data/SqlMap/TestQueryForMap.php b/tests/unit/Data/SqlMap/TestQueryForMap.php index 09810489..f50d0c76 100644 --- a/tests/unit/Data/SqlMap/TestQueryForMap.php +++ b/tests/unit/Data/SqlMap/TestQueryForMap.php @@ -18,11 +18,11 @@ class TestQueryForMap extends BaseCase function testExecuteQueryForMap() { $map = $this->sqlmap->QueryForMap("GetAllAccountsViaResultClass", null, "FirstName",null,0,2); - $this->assertIdentical(2, count($map)); + $this->assertSame(2, count($map)); $this->assertAccount1($map["Joe"]); - $this->assertIdentical(1, $map["Joe"]->getID()); - $this->assertIdentical(2, $map["Averel"]->getID()); + $this->assertSame(1, $map["Joe"]->getID()); + $this->assertSame(2, $map["Averel"]->getID()); } /** @@ -34,11 +34,11 @@ class TestQueryForMap extends BaseCase $map = $this->sqlmap->QueryForMap("GetAllAccountsViaResultClass", null, "FirstName", "EmailAddress",1,3); - $this->assertIdentical(3, count($map)); + $this->assertSame(3, count($map)); - $this->assertIdentical("Averel.Dalton@somewhere.com", $map["Averel"]); + $this->assertSame("Averel.Dalton@somewhere.com", $map["Averel"]); $this->assertNull($map["William"]); - $this->assertIdentical("Jack.Dalton@somewhere.com", $map["Jack"]); + $this->assertSame("Jack.Dalton@somewhere.com", $map["Jack"]); } } diff --git a/tests/unit/Data/SqlMap/Ticket589Test.php b/tests/unit/Data/SqlMap/Ticket589Test.php index a648e74f..c85a4aea 100644 --- a/tests/unit/Data/SqlMap/Ticket589Test.php +++ b/tests/unit/Data/SqlMap/Ticket589Test.php @@ -17,7 +17,7 @@ class Ticket589Test extends PHPUnit_Framework_TestCase }catch(TSqlMapConfigurationException $e) { $expect = 'Invalid property \'parametrClass\' for class \'TSqlMapStatement\' for tag \'assertEqual(strpos($e->getMessage(),$expect),0); + $this->assertEquals(strpos($e->getMessage(),$expect),0); } } } diff --git a/tests/unit/Data/SqlMap/common.php b/tests/unit/Data/SqlMap/common.php index 020a296b..38bcc92f 100644 --- a/tests/unit/Data/SqlMap/common.php +++ b/tests/unit/Data/SqlMap/common.php @@ -92,8 +92,8 @@ class MySQLBaseTestConfig extends BaseTestConfig $this->_sqlmapConfigFile = SQLMAP_TESTS.'/mysql.xml'; $this->_scriptDir = SQLMAP_TESTS.'/scripts/mysql/'; $this->_features = array('insert_id'); - $dsn = 'mysql:host=localhost;dbname=sqlmap_test;port=3307'; - $this->_connection = new TDbConnection($dsn, 'test5', 'test5'); + $dsn = 'mysql:host=localhost;dbname=prado_unitest;port=3306'; + $this->_connection = new TDbConnection($dsn, 'prado_unitest', 'prado_unitest'); } } diff --git a/tests/unit/Data/SqlMap/fixtures/mysql5_reset.sql b/tests/unit/Data/SqlMap/fixtures/mysql5_reset.sql deleted file mode 100644 index 7544ce6b..00000000 --- a/tests/unit/Data/SqlMap/fixtures/mysql5_reset.sql +++ /dev/null @@ -1,22 +0,0 @@ -TRUNCATE TABLE `prado_system_data_sqlmap`.`dynamicparametertest1`; -TRUNCATE TABLE `prado_system_data_sqlmap`.`dynamicparametertest2`; - -INSERT INTO `prado_system_data_sqlmap`.`dynamicparametertest1` ( - `testname` , - `teststring` , - `testinteger` -) -VALUES -('staticsql', 'staticsql1', '1'), -('dynamictable', 'dynamictableparametertest1', '1') -; - -INSERT INTO `prado_system_data_sqlmap`.`dynamicparametertest2` ( - `testname` , - `teststring` , - `testinteger` -) -VALUES -('staticsql', 'staticsql2', '2'), -('dynamictable', 'dynamictableparametertest2', '2') -; diff --git a/tests/unit/Data/SqlMap/fixtures/mysql5_setup.sql b/tests/unit/Data/SqlMap/fixtures/mysql5_setup.sql deleted file mode 100644 index 753b48ac..00000000 --- a/tests/unit/Data/SqlMap/fixtures/mysql5_setup.sql +++ /dev/null @@ -1,22 +0,0 @@ -CREATE DATABASE `prado_system_data_sqlmap` - DEFAULT CHARACTER SET utf8 - COLLATE utf8_general_ci; - -GRANT ALL ON `prado_system_data_sqlmap`.* - TO 'prado_unitest'@'localhost' - IDENTIFIED BY 'prado_system_data_sqlmap_unitest'; - -DROP TABLE IF EXISTS `dynamicparametertest1`; -CREATE TABLE `dynamicparametertest1` ( - `testname` varchar(50) NOT NULL, - `teststring` varchar(50) NOT NULL, - `testinteger` int(11) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - -DROP TABLE IF EXISTS `dynamicparametertest2`; -CREATE TABLE `dynamicparametertest2` ( - `testname` varchar(50) NOT NULL, - `teststring` varchar(50) NOT NULL, - `testinteger` int(11) NOT NULL -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - diff --git a/tests/unit/Data/SqlMap/queryForListLimitTest.php b/tests/unit/Data/SqlMap/queryForListLimitTest.php index 7038dc68..72351c72 100644 --- a/tests/unit/Data/SqlMap/queryForListLimitTest.php +++ b/tests/unit/Data/SqlMap/queryForListLimitTest.php @@ -25,14 +25,14 @@ class queryForListLimitTest extends BaseCase function test_accounts_limit_2() { $list1 = $this->sqlmap->queryForList('GetAllAccountsAsArrayListViaResultClass',null,null,1,2); - $this->assertEqual(count($list1),2); + $this->assertEquals(count($list1),2); - $this->assertEqual($list1[0][0],'2'); - $this->assertEqual($list1[0][1],'Averel'); - $this->assertEqual($list1[0][2],'Dalton'); + $this->assertEquals($list1[0][0],'2'); + $this->assertEquals($list1[0][1],'Averel'); + $this->assertEquals($list1[0][2],'Dalton'); - $this->assertEqual($list1[1][0],'3'); - $this->assertEqual($list1[1][1],'William'); - $this->assertEqual($list1[1][2],'Dalton'); + $this->assertEquals($list1[1][0],'3'); + $this->assertEquals($list1[1][1],'William'); + $this->assertEquals($list1[1][2],'Dalton'); } } diff --git a/tests/unit/Data/TableGateway/BaseGateway.php b/tests/unit/Data/TableGateway/BaseGateway.php new file mode 100644 index 00000000..3ab23b19 --- /dev/null +++ b/tests/unit/Data/TableGateway/BaseGateway.php @@ -0,0 +1,96 @@ +gateway1===null) + { + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); + $this->gateway1 = new TTableGateway('address', $conn); + } + return $this->gateway1; + } + + /** + * @return TTableGateway + */ + function getGateway2() + { + if($this->gateway2===null) + { + $conn = new TDbConnection('mysql:host=localhost;dbname=prado_unitest', 'prado_unitest','prado_unitest'); + $this->gateway2 = new TTableGateway('department_sections', $conn); + } + return $this->gateway2; + } + + function setup() + { + $this->delete_all(); + } + + function add_record1() + { + $result = $this->getGateway()->insert($this->get_record1()); + $this->assertTrue(intval($result) > 0); + } + function add_record2() + { + $result = $this->getGateway()->insert($this->get_record2()); + $this->assertTrue(intval($result) > 0); + } + function get_record1() + { + return array( + 'username' => 'Username', + 'phone' => 121987, + 'field1_boolean' => true, + 'field2_date' => '2007-12-25', + 'field3_double' => 121.1, + 'field4_integer' => 3, + 'field5_text' => 'asdasd', + 'field6_time' => '12:40:00', + 'field7_timestamp' => 'NOW', + 'field8_money' => '121.12', + 'field9_numeric' => 98.2232, + 'int_fk1'=>1, + 'int_fk2'=>1, + ); + } + + + function get_record2() + { + return array( + 'username' => 'record2', + 'phone' => 45233, + 'field1_boolean' => false, + 'field2_date' => '2004-10-05', + 'field3_double' => 1221.1, + 'field4_integer' => 2, + 'field5_text' => 'hello world', + 'field6_time' => '22:40:00', + 'field7_timestamp' => 'NOW', + 'field8_money' => '1121.12', + 'field9_numeric' => 8.2213, + 'int_fk1'=>1, + 'int_fk2'=>1, + ); + } + function delete_all() + { + $this->getGateway()->deleteAll('1=1'); + } +} \ No newline at end of file diff --git a/tests/unit/Data/TableGateway/BaseGatewayTest.php b/tests/unit/Data/TableGateway/BaseGatewayTest.php deleted file mode 100644 index b97ef4a0..00000000 --- a/tests/unit/Data/TableGateway/BaseGatewayTest.php +++ /dev/null @@ -1,96 +0,0 @@ -gateway1===null) - { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); - $this->gateway1 = new TTableGateway('address', $conn); - } - return $this->gateway1; - } - - /** - * @return TTableGateway - */ - function getGateway2() - { - if($this->gateway2===null) - { - $conn = new TDbConnection('pgsql:host=localhost;dbname=test', 'test','test'); - $this->gateway2 = new TTableGateway('department_sections', $conn); - } - return $this->gateway2; - } - - function setup() - { - $this->delete_all(); - } - - function add_record1() - { - $result = $this->getGateway()->insert($this->get_record1()); - $this->assertTrue(intval($result) > 0); - } - function add_record2() - { - $result = $this->getGateway()->insert($this->get_record2()); - $this->assertTrue(intval($result) > 0); - } - function get_record1() - { - return array( - 'username' => 'Username', - 'phone' => 121987, - 'field1_boolean' => true, - 'field2_date' => '2007-12-25', - 'field3_double' => 121.1, - 'field4_integer' => 3, - 'field5_text' => 'asdasd', - 'field6_time' => '12:40:00', - 'field7_timestamp' => 'NOW', - 'field8_money' => '$121.12', - 'field9_numeric' => 98.2232, - 'int_fk1'=>1, - 'int_fk2'=>1, - ); - } - - - function get_record2() - { - return array( - 'username' => 'record2', - 'phone' => 45233, - 'field1_boolean' => false, - 'field2_date' => '2004-10-05', - 'field3_double' => 1221.1, - 'field4_integer' => 2, - 'field5_text' => 'hello world', - 'field6_time' => '22:40:00', - 'field7_timestamp' => 'NOW', - 'field8_money' => '$1121.12', - 'field9_numeric' => 8.2213, - 'int_fk1'=>1, - 'int_fk2'=>1, - ); - } - function delete_all() - { - $this->getGateway()->deleteAll('1=1'); - } -} \ No newline at end of file diff --git a/tests/unit/Data/TableGateway/CountTest.php b/tests/unit/Data/TableGateway/CountTest.php index 074d935b..1d3b60ee 100644 --- a/tests/unit/Data/TableGateway/CountTest.php +++ b/tests/unit/Data/TableGateway/CountTest.php @@ -1,18 +1,18 @@ getGateway2()->count(); - $this->assertEqual(44,$result); + $this->assertEquals(5,$result); $result = $this->getGateway2()->count('department_id = ?', 1); - $this->assertEqual(4, $result); + $this->assertEquals(2, $result); } } \ No newline at end of file diff --git a/tests/unit/Data/TableGateway/MagicCallTest.php b/tests/unit/Data/TableGateway/MagicCallTest.php index 56cc85b3..caf10019 100644 --- a/tests/unit/Data/TableGateway/MagicCallTest.php +++ b/tests/unit/Data/TableGateway/MagicCallTest.php @@ -1,18 +1,18 @@ add_record1(); $this->add_record2(); $result = $this->getGateway()->findByUsername("record2"); - $this->assertEqual($result['username'], 'record2'); + $this->assertEquals($result['username'], 'record2'); } function test_combined_and_or() @@ -20,7 +20,7 @@ class MagicCallTest extends BaseGatewayTest $this->add_record1(); $this->add_record2(); $result = $this->getGateway()->findAllByUsername_OR_phone('Username', '45233')->readAll(); - $this->assertEqual(2, count($result)); + $this->assertEquals(2, count($result)); } function test_no_result() @@ -28,6 +28,6 @@ class MagicCallTest extends BaseGatewayTest $this->add_record1(); $this->add_record2(); $result = $this->getGateway()->findAllByUsername_and_phone('Username', '45233')->readAll(); - $this->assertEqual(0, count($result)); + $this->assertEquals(0, count($result)); } } \ No newline at end of file diff --git a/tests/unit/Data/TableGateway/TableGatewayDeleteByPkTest.php b/tests/unit/Data/TableGateway/TableGatewayDeleteByPkTest.php index 6bcaeb91..36d1be11 100644 --- a/tests/unit/Data/TableGateway/TableGatewayDeleteByPkTest.php +++ b/tests/unit/Data/TableGateway/TableGatewayDeleteByPkTest.php @@ -1,11 +1,11 @@ getGateway()->getLastInsertId(); $deleted = $this->getGateway()->deleteByPk($id); - $this->assertEqual(1, $deleted); + $this->assertEquals(1, $deleted); } function test_delete_by_multiple_pk() @@ -25,7 +25,7 @@ class TableGatewayDeleteByPkTest extends BaseGatewayTest $deleted = $this->getGateway()->deleteByPk($id1, $id2); - $this->assertEqual(2, $deleted); + $this->assertEquals(2, $deleted); } function test_delete_by_multiple_pk2() @@ -37,7 +37,7 @@ class TableGatewayDeleteByPkTest extends BaseGatewayTest $deleted = $this->getGateway()->deleteByPk(array($id1, $id2)); - $this->assertEqual(2, $deleted); + $this->assertEquals(2, $deleted); } function test_delete_by_multiple_pk3() @@ -49,6 +49,6 @@ class TableGatewayDeleteByPkTest extends BaseGatewayTest $deleted = $this->getGateway()->deleteByPk(array(array($id1), array($id2))); - $this->assertEqual(2, $deleted); + $this->assertEquals(2, $deleted); } } \ No newline at end of file diff --git a/tests/unit/Data/TableGateway/TableGatewayPgsqlTest.php b/tests/unit/Data/TableGateway/TableGatewayPgsqlTest.php index 234f70bd..fae1f394 100644 --- a/tests/unit/Data/TableGateway/TableGatewayPgsqlTest.php +++ b/tests/unit/Data/TableGateway/TableGatewayPgsqlTest.php @@ -1,11 +1,19 @@ markTestSkipped( + 'The pgsql extension is not available.' + ); + } + } function test_update() { @@ -20,7 +28,7 @@ class TableGatewayPgsqlTest extends BaseGatewayTest $expect['username'] = 'tester 1'; $expect['field5_text'] = null; unset($expect['field7_timestamp']); unset($test['field7_timestamp']); - $this->assertEqual($expect, $test); + $this->assertEquals($expect, $test); $this->assertTrue($this->getGateway()->deleteAll('username = ?', 'tester 1')); } @@ -38,7 +46,7 @@ class TableGatewayPgsqlTest extends BaseGatewayTest $expect['username'] = 'tester 1'; $expect['field5_text'] = null; unset($expect['field7_timestamp']); unset($test['field7_timestamp']); - $this->assertEqual($expect, $test); + $this->assertEquals($expect, $test); $this->assertTrue($this->getGateway()->deleteAll('username = :name', array(':name'=>'tester 1'))); } @@ -49,10 +57,10 @@ class TableGatewayPgsqlTest extends BaseGatewayTest $this->add_record2(); $results = $this->getGateway()->findAll('true')->readAll(); - $this->assertEqual(count($results), 2); + $this->assertEquals(count($results), 2); $result = $this->getGateway()->findAllBySql('SELECT username FROM address WHERE phone = ?', '45233')->read(); - $this->assertEqual($result['username'], 'record2'); + $this->assertEquals($result['username'], 'record2'); } } \ No newline at end of file diff --git a/tests/unit/Data/TableGateway/TableInfoGatewayTest.php b/tests/unit/Data/TableGateway/TableInfoGatewayTest.php index 24b94690..9d4c2a49 100644 --- a/tests/unit/Data/TableGateway/TableInfoGatewayTest.php +++ b/tests/unit/Data/TableGateway/TableInfoGatewayTest.php @@ -1,11 +1,11 @@ add_record2(); $info = TDbMetaData::getInstance($conn)->getTableInfo('address'); $table = new TTableGateway($info, $conn); - $this->assertEqual(count($table->findAll()->readAll()), 2); + $this->assertEquals(count($table->findAll()->readAll()), 2); } } \ No newline at end of file diff --git a/tests/unit/Data/TableGateway/TestFindByPk.php b/tests/unit/Data/TableGateway/TestFindByPk.php index f23fafa7..264231e6 100644 --- a/tests/unit/Data/TableGateway/TestFindByPk.php +++ b/tests/unit/Data/TableGateway/TestFindByPk.php @@ -1,11 +1,11 @@ assertEqual($record1, $result); + $this->assertEquals($record1, $result); } function test_composite_key() @@ -31,7 +31,7 @@ class TestFindByPk extends BaseGatewayTest $result = $gateway->findByPk(1,1); $expect = array("department_id" => 1, "section_id" => 1, "order" => 0); - $this->assertEqual($expect, $result); + $this->assertEquals($expect, $result); } function test_find_all_keys() @@ -44,7 +44,7 @@ class TestFindByPk extends BaseGatewayTest array("department_id" => 1, "section_id" => 1, "order" => 0), array("department_id" => 3, "section_id" => 13, "order" => 0)); - $this->assertEqual($expect, $result); + $this->assertEquals($expect, $result); } } \ No newline at end of file -- cgit v1.2.3