Ported / fixed most old tests

1 files changed, 13 insertions, 13 deletions

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);
 	}
 }