From 3d2552a453f3e36c775aa8fab3cddccb5acfe115 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 9 Dec 2010 05:51:11 +0000 Subject: [PATCH] MINOR Partially reverted r114744 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@114745 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/Translatable.php | 1 - tests/DataObjectTest.php | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/core/model/Translatable.php b/core/model/Translatable.php index 172ec2b47..fe9e1d42a 100755 --- a/core/model/Translatable.php +++ b/core/model/Translatable.php @@ -1154,7 +1154,6 @@ class Translatable extends DataObjectDecorator implements PermissionProvider { $newTranslation = new $class; // copy all fields from owner (apart from ID) - var_dump($this->owner->toMap()); $newTranslation->update($this->owner->toMap()); // If the object has Hierarchy extension, diff --git a/tests/DataObjectTest.php b/tests/DataObjectTest.php index a48b3d874..3b1a139ba 100755 --- a/tests/DataObjectTest.php +++ b/tests/DataObjectTest.php @@ -5,23 +5,6 @@ */ class DataObjectTest extends SapphireTest { - function testToMap() { - $obj = $this->objFromFixture('DataObjectTest_SubTeam', 'subteam1'); - - $map = $obj->toMap(); - - $this->assertArrayHasKey('ID', $map, 'Contains base fields'); - $this->assertArrayHasKey('Title', $map, 'Contains fields from parent class'); - $this->assertArrayHasKey('SubclassDatabaseField', $map, 'Contains fields from concrete class'); - - $this->assertEquals($obj->ID, $map['ID'], 'Contains values from base fields'); - $this->assertEquals($obj->Title, $map['Title'], 'Contains values from parent class fields'); - $this->assertEquals($obj->SubclassDatabaseField, $map['SubclassDatabaseField'], 'Contains values from concrete class fields'); - - $newObj = new DataObjectTest_SubTeam(); - $this->assertArrayHasKey('Title', $map, 'Contains null fields'); - } - static $fixture_file = 'sapphire/tests/DataObjectTest.yml'; protected $extraDataObjects = array(