" . diff --git a/dev/DevelopmentAdmin.php b/dev/DevelopmentAdmin.php index 6989b6c3e..0008d1744 100644 --- a/dev/DevelopmentAdmin.php +++ b/dev/DevelopmentAdmin.php @@ -129,6 +129,7 @@ class DevelopmentAdmin extends Controller { $renderer->writeHeader(); $renderer->writeInfo("Environment Builder", Director::absoluteBaseURL()); echo "
Some test content
- Comments: =>PageComment.comment3,=>PageComment.comment4 page2: Title: Second Page Permission: diff --git a/tests/DataObjectSetTest.php b/tests/DataObjectSetTest.php index 6ef654c99..09516eee1 100644 --- a/tests/DataObjectSetTest.php +++ b/tests/DataObjectSetTest.php @@ -7,7 +7,7 @@ */ class DataObjectSetTest extends SapphireTest { - static $fixture_file = 'sapphire/tests/DataObjectTest.yml'; + static $fixture_file = 'sapphire/tests/DataObjectSetTest.yml'; protected $extraDataObjects = array( 'DataObjectTest_Team', @@ -106,9 +106,9 @@ class DataObjectSetTest extends SapphireTest { } public function testMultipleOf() { - $comments = DataObject::get('PageComment', '', "\"ID\" ASC"); + $comments = DataObject::get('DataObjectSetTest_TeamComment', '', "\"ID\" ASC"); $commArr = $comments->toArray(); - $multiplesOf3 = 1; + $multiplesOf3 = 0; foreach($comments as $comment) { if($comment->MultipleOf(3)) { @@ -119,15 +119,11 @@ class DataObjectSetTest extends SapphireTest { } } - $this->assertEquals(3, $multiplesOf3); + $this->assertEquals(1, $multiplesOf3); $this->assertFalse($commArr[0]->IsMultipleOf3); $this->assertFalse($commArr[1]->IsMultipleOf3); $this->assertTrue($commArr[2]->IsMultipleOf3); - $this->assertFalse($commArr[3]->IsMultipleOf3); - $this->assertFalse($commArr[4]->IsMultipleOf3); - $this->assertTrue($commArr[5]->IsMultipleOf3); - $this->assertFalse($commArr[6]->IsMultipleOf3); foreach($comments as $comment) { if($comment->MultipleOf(3, 1)) { @@ -140,27 +136,23 @@ class DataObjectSetTest extends SapphireTest { $this->assertFalse($commArr[0]->IsMultipleOf3); $this->assertFalse($commArr[1]->IsMultipleOf3); $this->assertTrue($commArr[2]->IsMultipleOf3); - $this->assertFalse($commArr[3]->IsMultipleOf3); - $this->assertFalse($commArr[4]->IsMultipleOf3); - $this->assertTrue($commArr[5]->IsMultipleOf3); - $this->assertFalse($commArr[6]->IsMultipleOf3); } /** * Test {@link DataObjectSet->Count()} */ function testCount() { - $comments = DataObject::get('PageComment', '', "\"ID\" ASC"); + $comments = DataObject::get('DataObjectSetTest_TeamComment', '', "\"ID\" ASC"); /* There are a total of 8 items in the set */ - $this->assertEquals($comments->Count(), 8, 'There are a total of 8 items in the set'); + $this->assertEquals($comments->Count(), 3, 'There are a total of 8 items in the set'); } /** * Test {@link DataObjectSet->First()} */ function testFirst() { - $comments = DataObject::get('PageComment', '', "\"ID\" ASC"); + $comments = DataObject::get('DataObjectSetTest_TeamComment', '', "\"ID\" ASC"); /* The first object is Joe's comment */ $this->assertEquals($comments->First()->Name, 'Joe', 'The first object has a Name field value of "Joe"'); @@ -170,17 +162,17 @@ class DataObjectSetTest extends SapphireTest { * Test {@link DataObjectSet->Last()} */ function testLast() { - $comments = DataObject::get('PageComment', '', "\"ID\" ASC"); + $comments = DataObject::get('DataObjectSetTest_TeamComment', '', "\"ID\" ASC"); /* The last object is Dean's comment */ - $this->assertEquals($comments->Last()->Name, 'Dean', 'The last object has a Name field value of "Dean"'); + $this->assertEquals($comments->Last()->Name, 'Phil', 'The last object has a Name field value of "Phil"'); } /** * Test {@link DataObjectSet->map()} */ function testMap() { - $comments = DataObject::get('PageComment', '', "\"ID\" ASC"); + $comments = DataObject::get('DataObjectSetTest_TeamComment', '', "\"ID\" ASC"); /* Now we get a map of all the PageComment records */ $map = $comments->map('ID', 'Title', '(Select one)'); @@ -188,31 +180,26 @@ class DataObjectSetTest extends SapphireTest { $expectedMap = array( '' => '(Select one)', 1 => 'Joe', - 2 => 'Jane', - 3 => 'Bob', - 4 => 'Bob', - 5 => 'Ernie', - 6 => 'Jimmy', - 7 => 'Dean', - 8 => 'Dean' + 2 => 'Bob', + 3 => 'Phil' ); - /* There are 9 items in the map. 8 are records. 1 is the empty value */ - $this->assertEquals(count($map), 9, 'There are 9 items in the map. 8 are records. 1 is the empty value'); + /* There are 9 items in the map. 3 are records. 1 is the empty value */ + $this->assertEquals(count($map), 4, 'There are 4 items in the map. 3 are records. 1 is the empty value'); /* We have the same map as our expected map, asserted above */ /* toDropDownMap() is an alias of map() - let's make a map from that */ $map2 = $comments->toDropDownMap('ID', 'Title', '(Select one)'); - /* There are 9 items in the map. 8 are records. 1 is the empty value */ - $this->assertEquals(count($map), 9, 'There are 9 items in the map. 8 are records. 1 is the empty value.'); + /* There are 4 items in the map. 3 are records. 1 is the empty value */ + $this->assertEquals(count($map), 4, 'There are 4 items in the map. 3 are records. 1 is the empty value.'); } function testRemoveDuplicates() { // Note that PageComment and DataObjectSetTest_TeamComment are both descendants of DataObject, and don't // share an inheritance relationship below that. - $pageComments = DataObject::get('PageComment'); + $pageComments = DataObject::get('DataObjectSetTest_TeamComment'); $teamComments = DataObject::get('DataObjectSetTest_TeamComment'); /* Test default functionality (remove by ID). We'd expect to loose all our @@ -221,34 +208,39 @@ class DataObjectSetTest extends SapphireTest { $allComments = new DataObjectSet(); $allComments->merge($pageComments); $allComments->merge($teamComments); - + + $this->assertEquals($allComments->Count(), 6); + $allComments->removeDuplicates(); - $this->assertEquals($allComments->Count(), 11, 'Standard functionality is to remove duplicate base class/IDs'); + $this->assertEquals($allComments->Count(), 3, 'Standard functionality is to remove duplicate base class/IDs'); /* Now test removing duplicates based on a common field. In this case we shall * use 'Name', so we can get all the unique commentators */ - - $allComments = new DataObjectSet(); - $allComments->merge($pageComments); - $allComments->merge($teamComments); + + + $comment = new DataObjectSetTest_TeamComment(); + $comment->Name = "Bob"; + + $allComments->push($comment); + + $this->assertEquals($allComments->Count(), 4); $allComments->removeDuplicates('Name'); - - $this->assertEquals($allComments->Count(), 9, 'There are 9 uniquely named commentators'); + + $this->assertEquals($allComments->Count(), 3, 'There are 3 uniquely named commentators'); // Ensure that duplicates are removed where the base data class is the same. $mixedSet = new DataObjectSet(); $mixedSet->push(new SiteTree(array('ID' => 1))); $mixedSet->push(new Page(array('ID' => 1))); // dup: same base class and ID $mixedSet->push(new Page(array('ID' => 1))); // dup: more than one dup of the same object - $mixedSet->push(new Page(array('ID' => 2))); // not dup: same type again, but different ID - $mixedSet->push(new PageComment(array('ID' => 1))); // not dup: different base type, same ID + $mixedSet->push(new Page(array('ID' => 2))); // not dup: same type again, but different $mixedSet->push(new SiteTree(array('ID' => 1))); // dup: another dup, not consequetive. $mixedSet->removeDuplicates('ID'); - $this->assertEquals($mixedSet->Count(), 3, 'There are 3 unique data objects in a very mixed set'); + $this->assertEquals($mixedSet->Count(), 2, 'There are 3 unique data objects in a very mixed set'); } /** @@ -302,9 +294,10 @@ class DataObjectSetTest extends SapphireTest { */ function testInsertFirst() { // Get one comment - $comment = DataObject::get_one('PageComment', '"Name" = \'Joe\''); + $comment = DataObject::get_one('DataObjectSetTest_TeamComment', "\"Name\" = 'Joe'"); + // Get all other comments - $set = DataObject::get('PageComment', '"Name" != \'Joe\''); + $set = DataObject::get('DataObjectSetTest_TeamComment', '"Name" != \'Joe\''); // Duplicate so we can use it later without another lookup $otherSet = clone $set; @@ -327,18 +320,19 @@ class DataObjectSetTest extends SapphireTest { * Test {@link DataObjectSet->getRange()} */ function testGetRange() { - $comments = DataObject::get('PageComment', '', "\"ID\" ASC"); + $comments = DataObject::get('DataObjectSetTest_TeamComment', '', "\"ID\" ASC"); // Make sure we got all 8 comments - $this->assertEquals($comments->Count(), 8, 'Eight comments in the database.'); + $this->assertEquals($comments->Count(), 3, 'Three comments in the database.'); // Grab a range - $range = $comments->getRange(1, 5); - $this->assertEquals($range->Count(), 5, 'Five comments in the range.'); + $range = $comments->getRange(1, 2); + $this->assertEquals($range->Count(), 2, 'Two comment in the range.'); // And now grab a range that shouldn't be full. Remember counting starts at 0. - $range = $comments->getRange(7, 5); + $range = $comments->getRange(2, 1); $this->assertEquals($range->Count(), 1, 'One comment in the range.'); + // Make sure it's the last one $this->assertEquals($range->First(), $comments->Last(), 'The only item in the range should be the last one.'); } @@ -350,8 +344,9 @@ class DataObjectSetTest extends SapphireTest { // Test an empty set $set = new DataObjectSet(); $this->assertFalse($set->exists(), 'Empty set doesn\'t exist.'); + // Test a non-empty set - $set = DataObject::get('PageComment', '', "\"ID\" ASC"); + $set = DataObject::get('DataObjectSetTest_TeamComment', '', "\"ID\" ASC"); $this->assertTrue($set->exists(), 'Non-empty set does exist.'); } @@ -388,7 +383,29 @@ class DataObjectSetTest extends SapphireTest { $set->push(new ArrayData(array('Name' => 'Ted'))); $this->assertEquals('Ted', $set->pop()->Name); } - + + /** + * Test {@link DataObjectSet->sort()} + */ + function testSort() { + $set = new DataObjectSet(array( + array('Name'=>'Object1', 'F1'=>1, 'F2'=>2, 'F3'=>3), + array('Name'=>'Object2', 'F1'=>2, 'F2'=>1, 'F3'=>4), + array('Name'=>'Object3', 'F1'=>5, 'F2'=>2, 'F3'=>2), + )); + // test a single sort ASC + $set->sort('F3', 'ASC'); + $this->assertEquals($set->First()->Name, 'Object3', 'Object3 should be first in the set'); + // test a single sort DESC + $set->sort('F3', 'DESC'); + $this->assertEquals($set->First()->Name, 'Object2', 'Object2 should be first in the set'); + // test a multi sort + $set->sort(array('F2'=>'ASC', 'F1'=>'ASC')); + $this->assertEquals($set->Last()->Name, 'Object3', 'Object3 should be last in the set'); + // test a multi sort + $set->sort(array('F2'=>'ASC', 'F1'=>'DESC')); + $this->assertEquals($set->Last()->Name, 'Object1', 'Object1 should be last in the set'); + } } /** @@ -396,12 +413,13 @@ class DataObjectSetTest extends SapphireTest { * @subpackage tests */ class DataObjectSetTest_TeamComment extends DataObject implements TestOnly { + static $db = array( 'Name' => 'Varchar', 'Comment' => 'Text', - ); + ); + static $has_one = array( 'Team' => 'DataObjectTest_Team', ); -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/tests/DataObjectSetTest.yml b/tests/DataObjectSetTest.yml new file mode 100644 index 000000000..722ed1c41 --- /dev/null +++ b/tests/DataObjectSetTest.yml @@ -0,0 +1,54 @@ +Page: + home: + Title: Home + page1: + Title: First Page + Content:Some test content
+ page2: + Title: Second Page + +DataObjectTest_Team: + team1: + Title: Team 1 + team2: + Title: Team 2 + +DataObjectTest_Player: + captain1: + FirstName: Captain 1 + FavouriteTeam: =>DataObjectTest_Team.team1 + Teams: =>DataObjectTest_Team.team1 + captain2: + FirstName: Captain 2 + Teams: =>DataObjectTest_Team.team2 + player1: + FirstName: Player 1 + player2: + FirstName: Player 2 + Teams: =>DataObjectTest_Team.team1,=>DataObjectTest_Team.team2 + +DataObjectTest_SubTeam: + subteam1: + Title: Subteam 1 + SubclassDatabaseField: Subclassed 1 + DecoratedDatabaseField: Decorated 1 + subteam2_with_player_relation: + Title: Subteam 2 + SubclassDatabaseField: Subclassed 2 + DecoratedHasOneRelationship: =>DataObjectTest_Player.player1 + subteam3_with_empty_fields: + Title: Subteam 3 + +DataObjectSetTest_TeamComment: + comment1: + Name: Joe + Comment: This is a team comment by Joe + Team: =>DataObjectTest_Team.team1 + comment2: + Name: Bob + Comment: This is a team comment by Bob + Team: =>DataObjectTest_Team.team1 + comment3: + Name: Phil + Comment: Phil is a unique guy, and comments on team2 + Team: =>DataObjectTest_Team.team2 \ No newline at end of file diff --git a/tests/DataObjectTest.php b/tests/DataObjectTest.php index 98d963a44..a7da9cc03 100755 --- a/tests/DataObjectTest.php +++ b/tests/DataObjectTest.php @@ -16,7 +16,7 @@ class DataObjectTest extends SapphireTest { 'DataObjectTest_FieldlessSubTable', 'DataObjectTest_ValidatedObject', 'DataObjectTest_Player', - 'DataObjectSetTest_TeamComment' + 'DataObjectTest_TeamComment' ); function testDataIntegrityWhenTwoSubclassesHaveSameField() { @@ -101,40 +101,47 @@ class DataObjectTest extends SapphireTest { */ function testGet() { // Test getting all records of a DataObject - $comments = DataObject::get('PageComment'); - $this->assertEquals(8, $comments->Count()); + $comments = DataObject::get('DataObjectTest_TeamComment'); + $this->assertEquals(3, $comments->Count()); // Test WHERE clause - $comments = DataObject::get('PageComment', "\"Name\"='Bob'"); - $this->assertEquals(2, $comments->Count()); + $comments = DataObject::get('DataObjectTest_TeamComment', "\"Name\"='Bob'"); + $this->assertEquals(1, $comments->Count()); foreach($comments as $comment) { $this->assertEquals('Bob', $comment->Name); } // Test sorting - $comments = DataObject::get('PageComment', '', '"Name" ASC'); - $this->assertEquals(8, $comments->Count()); + $comments = DataObject::get('DataObjectTest_TeamComment', '', "\"Name\" ASC"); + $this->assertEquals(3, $comments->Count()); $this->assertEquals('Bob', $comments->First()->Name); - $comments = DataObject::get('PageComment', '', '"Name" DESC'); - $this->assertEquals(8, $comments->Count()); - $this->assertEquals('Joe', $comments->First()->Name); + $comments = DataObject::get('DataObjectTest_TeamComment', '', "\"Name\" DESC"); + $this->assertEquals(3, $comments->Count()); + $this->assertEquals('Phil', $comments->First()->Name); // Test join - $comments = DataObject::get('PageComment', "\"SiteTree\".\"Title\"='First Page'", '', 'INNER JOIN "SiteTree" ON "PageComment"."ParentID" = "SiteTree"."ID"'); + $comments = DataObject::get( + 'DataObjectTest_TeamComment', + "\"DataObjectTest_Team\".\"Title\" = 'Team 1'", + "\"Name\" ASC", + "INNER JOIN \"DataObjectTest_Team\" ON \"DataObjectTest_TeamComment\".\"TeamID\" = \"DataObjectTest_Team\".\"ID\"" + ); + $this->assertEquals(2, $comments->Count()); $this->assertEquals('Bob', $comments->First()->Name); - $this->assertEquals('Bob', $comments->Last()->Name); + $this->assertEquals('Joe', $comments->Last()->Name); // Test limit - $comments = DataObject::get('PageComment', '', '"Name" ASC', '', '1,2'); + $comments = DataObject::get('DataObjectTest_TeamComment', '', "\"Name\" ASC", '', '1,2'); $this->assertEquals(2, $comments->Count()); - $this->assertEquals('Bob', $comments->First()->Name); - $this->assertEquals('Dean', $comments->Last()->Name); + $this->assertEquals('Joe', $comments->First()->Name); + $this->assertEquals('Phil', $comments->Last()->Name); // Test container class - $comments = DataObject::get('PageComment', '', '', '', '', 'DataObjectSet'); + $comments = DataObject::get('DataObjectTest_TeamComment', '', '', '', '', 'DataObjectSet'); $this->assertEquals('DataObjectSet', get_class($comments)); - $comments = DataObject::get('PageComment', '', '', '', '', 'ComponentSet'); + + $comments = DataObject::get('DataObjectTest_TeamComment', '', '', '', '', 'ComponentSet'); $this->assertEquals('ComponentSet', get_class($comments)); @@ -144,28 +151,31 @@ class DataObjectTest extends SapphireTest { $this->assertEquals('Home', $page->Title); // Test get_one() without caching - $comment1 = DataObject::get_one('PageComment', "\"Name\"='Joe'", false); + $comment1 = DataObject::get_one('DataObjectTest_TeamComment', "\"Name\" = 'Joe'", false); $comment1->Comment = "Something Else"; - $comment2 = DataObject::get_one('PageComment', "\"Name\"='Joe'", false); + + $comment2 = DataObject::get_one('DataObjectTest_TeamComment', "\"Name\" = 'Joe'", false); $this->assertNotEquals($comment1->Comment, $comment2->Comment); // Test get_one() with caching - $comment1 = DataObject::get_one('PageComment', "\"Name\"='Jane'", true); + $comment1 = DataObject::get_one('DataObjectTest_TeamComment', "\"Name\" = 'Bob'", true); $comment1->Comment = "Something Else"; - $comment2 = DataObject::get_one('PageComment', "\"Name\"='Jane'", true); + + $comment2 = DataObject::get_one('DataObjectTest_TeamComment', "\"Name\" = 'Bob'", true); $this->assertEquals((string)$comment1->Comment, (string)$comment2->Comment); // Test get_one() with order by without caching - $comment = DataObject::get_one('PageComment', '', false, '"Name" ASC'); + $comment = DataObject::get_one('DataObjectTest_TeamComment', '', false, "\"Name\" ASC"); $this->assertEquals('Bob', $comment->Name); - $comment = DataObject::get_one('PageComment', '', false, '"Name" DESC'); - $this->assertEquals('Joe', $comment->Name); + + $comment = DataObject::get_one('DataObjectTest_TeamComment', '', false, "\"Name\" DESC"); + $this->assertEquals('Phil', $comment->Name); // Test get_one() with order by with caching - $comment = DataObject::get_one('PageComment', '', true, '"Name" ASC'); + $comment = DataObject::get_one('DataObjectTest_TeamComment', '', true, '"Name" ASC'); $this->assertEquals('Bob', $comment->Name); - $comment = DataObject::get_one('PageComment', '', true, '"Name" DESC'); - $this->assertEquals('Joe', $comment->Name); + $comment = DataObject::get_one('DataObjectTest_TeamComment', '', true, '"Name" DESC'); + $this->assertEquals('Phil', $comment->Name); } /** @@ -188,14 +198,14 @@ class DataObjectTest extends SapphireTest { * - Test the IDs on the DataObjects are set correctly */ function testHasManyRelationships() { - $page = $this->objFromFixture('Page', 'home'); + $team = $this->objFromFixture('DataObjectTest_Team', 'team1'); // Test getComponents() gets the ComponentSet of the other side of the relation - $this->assertTrue($page->getComponents('Comments')->Count() == 2); + $this->assertTrue($team->getComponents('Comments')->Count() == 2); // Test the IDs on the DataObjects are set correctly - foreach($page->getComponents('Comments') as $comment) { - $this->assertTrue($comment->ParentID == $page->ID); + foreach($team->getComponents('Comments') as $comment) { + $this->assertTrue($comment->TeamID == $team->ID); } } @@ -355,26 +365,6 @@ class DataObjectTest extends SapphireTest { $this->assertFalse($page->isChanged()); } - function testRandomSort() { - /* If we perforn the same regularly sorted query twice, it should return the same results */ - $itemsA = DataObject::get("PageComment", "", "ID"); - foreach($itemsA as $item) $keysA[] = $item->ID; - - $itemsB = DataObject::get("PageComment", "", "ID"); - foreach($itemsB as $item) $keysB[] = $item->ID; - - $this->assertEquals($keysA, $keysB); - - /* If we perform the same random query twice, it shouldn't return the same results */ - $itemsA = DataObject::get("PageComment", "", DB::getConn()->random()); - foreach($itemsA as $item) $keysA[] = $item->ID; - - $itemsB = DataObject::get("PageComment", "", DB::getConn()->random()); - foreach($itemsB as $item) $keysB[] = $item->ID; - - $this->assertNotEquals($keysA, $keysB); - } - function testWriteSavesToHasOneRelations() { /* DataObject::write() should save to a has_one relationship if you set a field called (relname)ID */ $team = new DataObjectTest_Team(); @@ -994,6 +984,10 @@ class DataObjectTest_Team extends DataObject implements TestOnly { 'HasOneRelationship' => 'DataObjectTest_Player', ); + static $has_many = array( + 'Comments' => 'DataObjectTest_TeamComment' + ); + static $many_many = array( 'Players' => 'DataObjectTest_Player' ); @@ -1109,6 +1103,18 @@ class DataObjectTest_CEO extends DataObjectTest_Staff { ); } +class DataObjectTest_TeamComment extends DataObject { + + static $db = array( + 'Name' => "Varchar", + "Comment" => "Text" + ); + + static $has_one = array( + 'Team' => 'DataObjectTest_Team' + ); +} + DataObject::add_extension('DataObjectTest_Team', 'DataObjectTest_Team_Decorator'); ?> diff --git a/tests/DataObjectTest.yml b/tests/DataObjectTest.yml index 2faca775c..ad7f68990 100644 --- a/tests/DataObjectTest.yml +++ b/tests/DataObjectTest.yml @@ -1,37 +1,9 @@ -PageComment: - comment1: - Name: Joe - Comment: This is a test comment - comment2: - Name: Jane - Comment: This is another test comment - comment3: - Name: Bob - Comment: Another comment - comment4: - Name: Bob - Comment: Second comment by Bob - comment5: - Name: Ernie - Comment: This is a test comment - comment6: - Name: Jimmy - Comment: This is another test comment - comment7: - Name: Dean - Comment: Another comment - comment8: - Name: Dean - Comment: Second comment by Dean - Page: home: Title: Home - Comments: =>PageComment.comment1,=>PageComment.comment2 page1: Title: First Page Content:Some test content
- Comments: =>PageComment.comment3,=>PageComment.comment4 page2: Title: Second Page @@ -67,7 +39,7 @@ DataObjectTest_SubTeam: subteam3_with_empty_fields: Title: Subteam 3 -DataObjectSetTest_TeamComment: +DataObjectTest_TeamComment: comment1: Name: Joe Comment: This is a team comment by Joe @@ -79,4 +51,4 @@ DataObjectSetTest_TeamComment: comment3: Name: Phil Comment: Phil is a unique guy, and comments on team2 - Tema: =>DataObjectTest_Team.team2 \ No newline at end of file + Team: =>DataObjectTest_Team.team2 \ No newline at end of file