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 Fixed regression from r111843 (i18nText, MemberDatetimeFieldTest, MemberTest)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@111844 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-10-10 21:01:32 +00:00 committed by Sam Minnee
parent d7a7fb325c
commit dfb9c71342
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/forms/MemberDatetimeOptionsetFieldTest.php
View File

@ -47,7 +47,7 @@ class MemberDatetimeOptionsetFieldTest extends SapphireTest {
$field = $this->createDateFormatFieldForMember($this->objFromFixture('Member', 'noformatmember'));
$field->setForm(new Form(new MemberDatetimeOptionsetFieldTest_Controller(), 'Form', new FieldSet(), new FieldSet())); // fake form
$parser = new CSSContentParser($field->Field());
$xmlArr = $parser->getBySelector('#Form_Form_DateFormat_MMM_d__yyyy');
$xmlArr = $parser->getBySelector('#Form_Form_DateFormat_MM_dd_yyyy');
$this->assertEquals('checked', (string) $xmlArr[0]['checked']);
}
@ -55,7 +55,7 @@ class MemberDatetimeOptionsetFieldTest extends SapphireTest {
$field = $this->createTimeFormatFieldForMember($this->objFromFixture('Member', 'noformatmember'));
$field->setForm(new Form(new MemberDatetimeOptionsetFieldTest_Controller(), 'Form', new FieldSet(), new FieldSet())); // fake form
$parser = new CSSContentParser($field->Field());
$xmlArr = $parser->getBySelector('#Form_Form_TimeFormat_h_mm_ss_a');
$xmlArr = $parser->getBySelector('#Form_Form_TimeFormat_hh_mm_a');
$this->assertEquals('checked', (string) $xmlArr[0]['checked']);
}

8
tests/i18n/i18nTest.php
View File

@ -75,7 +75,7 @@ class i18nTest extends SapphireTest {
function testDateFormatFromLocale() {
i18n::set_locale('en_US');
$this->assertEquals('MMM d, yyyy', i18n::get_date_format());
$this->assertEquals('MM/dd/yyyy', i18n::get_date_format());
i18n::set_locale('en_NZ');
$this->assertEquals('d/MM/yyyy', i18n::get_date_format());
i18n::set_locale('en_US');
@ -83,7 +83,7 @@ class i18nTest extends SapphireTest {
function testTimeFormatFromLocale() {
i18n::set_locale('en_US');
$this->assertEquals('h:mm:ss a', i18n::get_time_format());
$this->assertEquals('hh:mm a', i18n::get_time_format());
i18n::set_locale('de_DE');
$this->assertEquals('HH:mm:ss', i18n::get_time_format());
i18n::set_locale('en_US');
@ -91,14 +91,14 @@ class i18nTest extends SapphireTest {
function testDateFormatCustom() {
i18n::set_locale('en_US');
$this->assertEquals('MMM d, yyyy', i18n::get_date_format());
$this->assertEquals('MM/dd/yyyy', i18n::get_date_format());
i18n::set_date_format('d/MM/yyyy');
$this->assertEquals('d/MM/yyyy', i18n::get_date_format());
}
function testTimeFormatCustom() {
i18n::set_locale('en_US');
$this->assertEquals('h:mm:ss a', i18n::get_time_format());
$this->assertEquals('hh:mm a', i18n::get_time_format());
i18n::set_time_format('HH:mm:ss');
$this->assertEquals('HH:mm:ss', i18n::get_time_format());
}

4
tests/security/MemberTest.php
View File

@ -300,8 +300,8 @@ class MemberTest extends FunctionalTest {
function testMemberWithNoDateFormatFallsbackToGlobalLocaleDefaultFormat() {
$member = $this->objFromFixture('Member', 'noformatmember');
$this->assertEquals('MMM d, yyyy', $member->DateFormat);
$this->assertEquals('h:mm:ss a', $member->TimeFormat);
$this->assertEquals('MM/dd/yyyy', $member->DateFormat);
$this->assertEquals('hh:mm a', $member->TimeFormat);
}
function testMemberWithNoDateFormatFallsbackToTheirLocaleDefaultFormat() {