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

MINOR Updated MemberDatetimeOptionsetFieldTest, i18nTest, MoneyTest to accept new default date formats caused by Zend/CLDR upgrade (from 'MM/dd/yyyy' to a less ambiguous 'MMM d, y')

Browse Source
This commit is contained in:
Ingo Schommer 2011-05-30 21:33:27 +12:00
parent f11751c42d
commit 0f7b115d33
3 changed files with 12 additions and 64 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_MM_dd_yyyy');
$xmlArr = $parser->getBySelector('#Form_Form_DateFormat_MMM_d__y');
$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_hh_mm_a');
$xmlArr = $parser->getBySelector('#Form_Form_TimeFormat_h_mm_ss_a');
$this->assertEquals('checked', (string) $xmlArr[0]['checked']);
}

8
tests/i18n/i18nTest.php
View File

@ -47,7 +47,7 @@ class i18nTest extends SapphireTest {
function testDateFormatFromLocale() {
i18n::set_locale('en_US');
$this->assertEquals('MM/dd/yyyy', i18n::get_date_format());
$this->assertEquals('MMM d, y', i18n::get_date_format());
i18n::set_locale('en_NZ');
$this->assertEquals('d/MM/yyyy', i18n::get_date_format());
i18n::set_locale('en_US');
@ -55,7 +55,7 @@ class i18nTest extends SapphireTest {
function testTimeFormatFromLocale() {
i18n::set_locale('en_US');
$this->assertEquals('hh:mm a', i18n::get_time_format());
$this->assertEquals('h:mm:ss a', i18n::get_time_format());
i18n::set_locale('de_DE');
$this->assertEquals('HH:mm:ss', i18n::get_time_format());
i18n::set_locale('en_US');
@ -63,14 +63,14 @@ class i18nTest extends SapphireTest {
function testDateFormatCustom() {
i18n::set_locale('en_US');
$this->assertEquals('MM/dd/yyyy', i18n::get_date_format());
$this->assertEquals('MMM d, y', 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('hh:mm a', i18n::get_time_format());
$this->assertEquals('h:mm:ss a', i18n::get_time_format());
i18n::set_time_format('HH:mm:ss');
$this->assertEquals('HH:mm:ss', i18n::get_time_format());
}

64
tests/model/MoneyTest.php
View File

@ -102,73 +102,24 @@ class MoneyTest extends SapphireTest {
public function testToCurrency() {
$USD = new Money();
$USD->setCurrency('USD');
$USD->setLocale('en_US');
$EGP = new Money();
$EGP->setCurrency('EGP');
$EGP->setLocale('ar_EG');
$USD->setAmount(53292.18);
$this->assertSame('$53,292.18', $USD->Nice());
$USD->setAmount(53292.18);
$this->assertSame('$٥٣,٢٩٢.١٨', $USD->Nice(array('script' => 'Arab' )));
$USD->setAmount(53292.18);
$this->assertSame('$ ٥٣.٢٩٢,١٨', $USD->Nice(array('script' => 'Arab', 'format' => 'de_AT')));
$USD->setAmount(53292.18);
$this->assertSame('$ 53.292,18', $USD->Nice(array('format' => 'de_AT')));
$EGP->setAmount(53292.18);
$this->assertSame('ج.م.‏ 53٬292٫18', $EGP->Nice());
$EGP->setAmount(53292.18);
$this->assertSame('ج.م.‏ ٥٣٬٢٩٢٫١٨', $EGP->Nice(array('script' => 'Arab' )));
$EGP->setAmount(53292.18);
$this->assertSame('ج.م.‏ ٥٣.٢٩٢,١٨', $EGP->Nice(array('script' =>'Arab', 'format' => 'de_AT')));
$EGP->setAmount(53292.18);
$this->assertSame('ج.م.‏ 53.292,18', $EGP->Nice(array('format' => 'de_AT')));
$USD = new Money();
$USD->setLocale('en_US');
$USD->setAmount(53292.18);
$this->assertSame('$53,292.18', $USD->Nice());
/*
try {
$this->assertSame('$ 53,292.18', $USD->Nice('nocontent'));
$this->fail("No currency expected");
} catch (Exception $e) {
$this->assertContains("has to be numeric", $e->getMessage());
}
*/
$INR = new Money();
$INR->setLocale('de_AT');
$INR->setCurrency('INR');
$INR->setAmount(1.2);
$this->assertSame('Rs. 1,20', $INR->Nice());
$INR->setAmount(1);
$this->assertSame('Re. 1,00', $INR->Nice());
$INR->setAmount(0);
$this->assertSame('Rs. 0,00', $INR->Nice());
$INR->setAmount(-3);
$this->assertSame('-Rs. 3,00', $INR->Nice());
}
public function testGetSign() {
$EGP = new Money();
$EGP->setValue(array(
'Currency' => 'EGP',
$SKR = new Money();
$SKR->setValue(array(
'Currency' => 'SKR',
'Amount' => 3.44
));
$EGP->setLocale('ar_EG');
$this->assertSame('ج.م.‏', $EGP->getSymbol('EGP','ar_EG'));
$this->assertSame('€', $EGP->getSymbol('EUR','de_AT'));
$this->assertSame('ج.م.‏', $EGP->getSymbol(null, 'ar_EG'));
//$this->assertSame('€', $EGP->getSymbol(null, 'de_AT'));
$this->assertSame('ج.م.‏', $EGP->getSymbol());
$this->assertSame('€', $SKR->getSymbol('EUR','de_AT'));
$this->assertSame(null, $SKR->getSymbol());
try {
$EGP->getSymbol('EGP', 'de_XX');
$SKR->getSymbol('EGP', 'de_XX');
$this->setExpectedException("Exception");
} catch(Exception $e) {
}
@ -191,10 +142,7 @@ class MoneyTest extends SapphireTest {
));
$m->setLocale('ar_EG');
$this->assertSame('جنيه مصرى', $m->getName('EGP','ar_EG'));
$this->assertSame('Estnische Krone', $m->getName('EEK','de_AT'));
//$this->assertSame('جنيه مصرى', $m->getName(null, 'ar_EG'));
//$this->assertSame('Euro', $m->getName('de_AT'));
$this->assertSame('يورو', $m->getName());
try {