1 files changed, 40 insertions, 55 deletions

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