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: Fix tests to cope with ID type cleanup changed recently (from r101970)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112051 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-10-13 01:23:07 +00:00
parent 28c2c67355
commit e2d17d9b99
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/api/RestfulServerTest.php
View File

@ -106,8 +106,8 @@ class RestfulServerTest extends SapphireTest {
$ratingsArr = $responseArr['Ratings']['RestfulServerTest_AuthorRating']; $ratingsArr = $responseArr['Ratings']['RestfulServerTest_AuthorRating'];
$this->assertEquals(count($ratingsArr), 2); $this->assertEquals(count($ratingsArr), 2);
$ratingIDs = array( $ratingIDs = array(
$ratingsArr[0]['@attributes']['id'], (int)$ratingsArr[0]['@attributes']['id'],
$ratingsArr[1]['@attributes']['id'] (int)$ratingsArr[1]['@attributes']['id']
); );
$this->assertContains($rating1->ID, $ratingIDs); $this->assertContains($rating1->ID, $ratingIDs);
$this->assertContains($rating2->ID, $ratingIDs); $this->assertContains($rating2->ID, $ratingIDs);
@ -127,8 +127,8 @@ class RestfulServerTest extends SapphireTest {
$this->assertEquals(count($authorsArr), 2); $this->assertEquals(count($authorsArr), 2);
$ratingIDs = array( $ratingIDs = array(
$authorsArr[0]['ID'], (int)$authorsArr[0]['ID'],
$authorsArr[1]['ID'] (int)$authorsArr[1]['ID']
); );
$this->assertContains($author2->ID, $ratingIDs); $this->assertContains($author2->ID, $ratingIDs);
$this->assertContains($author3->ID, $ratingIDs); $this->assertContains($author3->ID, $ratingIDs);

3
tests/model/TranslatableTest.php
View File

@ -263,8 +263,7 @@ class TranslatableTest extends FunctionalTest {
$this->assertEquals($resultPagesCustomLang->Count(), 1); $this->assertEquals($resultPagesCustomLang->Count(), 1);
$this->assertNotContains($origTestPage->ID, $resultPagesCustomLang->column('ID')); $this->assertNotContains($origTestPage->ID, $resultPagesCustomLang->column('ID'));
$this->assertNotContains($otherTestPage->ID, $resultPagesCustomLang->column('ID')); $this->assertNotContains($otherTestPage->ID, $resultPagesCustomLang->column('ID'));
// casting as a workaround for types not properly set on duplicated dataobjects from createTranslation() $this->assertContains($translatedPage->ID, $resultPagesCustomLang->column('ID'));
$this->assertContains((string)$translatedPage->ID, $resultPagesCustomLang->column('ID'));
Translatable::set_current_locale('en_US'); Translatable::set_current_locale('en_US');
} }

2
tests/search/TranslatableSearchFormTest.php
View File

@ -71,7 +71,7 @@ class TranslatableSearchFormTest extends FunctionalTest {
'Published pages in default language are not found when searching in another language' 'Published pages in default language are not found when searching in another language'
); );
$this->assertContains( $this->assertContains(
(string)$translatedPublishedPage->ID, $translatedPublishedPage->ID,
$results->column('ID'), $results->column('ID'),
'Published pages in another language are found when searching in this language' 'Published pages in another language are found when searching in this language'
); );