tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

MINOR Merged from trunk

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76597 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-05-12 00:48:39 +00:00 committed by Sam Minnee
parent 7e50b9ef1c
commit 518fb12c42
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/model/TranslatableTest.php
View File

@ -335,7 +335,7 @@ class TranslatableTest extends FunctionalTest {
$child1Page = $this->objFromFixture('Page', 'child1'); $child1Page = $this->objFromFixture('Page', 'child1');
$child2Page = $this->objFromFixture('Page', 'child2'); $child2Page = $this->objFromFixture('Page', 'child2');
$child3Page = $this->objFromFixture('Page', 'child3'); $child3Page = $this->objFromFixture('Page', 'child3');
$grandchildPage = $this->objFromFixture('Page', 'grandchild'); $grandchildPage = $this->objFromFixture('Page', 'grandchild1');
$parentPageTranslated = $parentPage->createTranslation('de_DE'); $parentPageTranslated = $parentPage->createTranslation('de_DE');
$child4PageTranslated = new SiteTree(); $child4PageTranslated = new SiteTree();
@ -372,7 +372,7 @@ class TranslatableTest extends FunctionalTest {
$child1Page->publish('Stage', 'Live'); $child1Page->publish('Stage', 'Live');
$child2Page = $this->objFromFixture('Page', 'child2'); $child2Page = $this->objFromFixture('Page', 'child2');
$child3Page = $this->objFromFixture('Page', 'child3'); $child3Page = $this->objFromFixture('Page', 'child3');
$grandchildPage = $this->objFromFixture('Page', 'grandchild'); $grandchildPage = $this->objFromFixture('Page', 'grandchild1');
$parentPageTranslated = $parentPage->createTranslation('de_DE'); $parentPageTranslated = $parentPage->createTranslation('de_DE');
@ -517,26 +517,28 @@ class TranslatableTest extends FunctionalTest {
$parentPage = $this->objFromFixture('Page', 'parent'); $parentPage = $this->objFromFixture('Page', 'parent');
$child1Page = $this->objFromFixture('Page', 'child1'); $child1Page = $this->objFromFixture('Page', 'child1');
$child1PageOrigID = $child1Page->ID; $child1PageOrigID = $child1Page->ID;
$grandchildPage = $this->objFromFixture('Page', 'grandchild'); $grandChild1Page = $this->objFromFixture('Page', 'grandchild1');
$grandChild2Page = $this->objFromFixture('Page', 'grandchild2');
$this->assertFalse($grandchildPage->hasTranslation('de_DE'));
$this->assertFalse($grandChild1Page->hasTranslation('de_DE'));
$this->assertFalse($child1Page->hasTranslation('de_DE')); $this->assertFalse($child1Page->hasTranslation('de_DE'));
$this->assertFalse($parentPage->hasTranslation('de_DE')); $this->assertFalse($parentPage->hasTranslation('de_DE'));
$translatedGrandChildPage = $grandchildPage->createTranslation('de_DE'); $translatedGrandChild1Page = $grandChild1Page->createTranslation('de_DE');
$translatedGrandChild2Page = $grandChild2Page->createTranslation('de_DE');
$this->assertTrue($grandchildPage->hasTranslation('de_DE')); $translatedChildPage = $child1Page->getTranslation('de_DE');
$translatedParentPage = $parentPage->getTranslation('de_DE');
$this->assertTrue($grandChild1Page->hasTranslation('de_DE'));
$this->assertEquals($translatedGrandChild1Page->ParentID, $translatedChildPage->ID);
$this->assertTrue($grandChild2Page->hasTranslation('de_DE'));
$this->assertEquals($translatedGrandChild2Page->ParentID, $translatedChildPage->ID);
$this->assertTrue($child1Page->hasTranslation('de_DE')); $this->assertTrue($child1Page->hasTranslation('de_DE'));
$this->assertEquals($translatedChildPage->ParentID, $translatedParentPage->ID);
$this->assertTrue($parentPage->hasTranslation('de_DE')); $this->assertTrue($parentPage->hasTranslation('de_DE'));
$this->assertEquals(
$grandchildPage->getTranslation('de_DE')->Parent()->ID,
$child1Page->getTranslation('de_DE')->ID
);
$this->assertEquals(
$child1Page->getTranslation('de_DE')->Parent()->ID,
$parentPage->getTranslation('de_DE')->ID
);
} }
function testHierarchyAllChildrenIncludingDeleted() { function testHierarchyAllChildrenIncludingDeleted() {

8
tests/model/TranslatableTest.yml
View File

@ -28,9 +28,13 @@ Page:
Title: Child 3 Title: Child 3
URLSegment: child3 URLSegment: child3
Parent: =>Page.parent Parent: =>Page.parent
grandchild: grandchild1:
Title: Grandchild Title: Grandchild
URLSegment: grandchild URLSegment: grandchild1
Parent: =>Page.child1
grandchild2:
Title: Grandchild
URLSegment: grandchild2
Parent: =>Page.child1 Parent: =>Page.child1
TranslatableTest_DataObject: TranslatableTest_DataObject:
testobject_en: testobject_en: