Formatting: CPDateFormatter changes and tests.

Refs #2155.
This commit is contained in:
Alexander Ljungberg
2014-07-22 12:49:35 +01:00
parent 4c44ede945
commit 58928a5000
2 changed files with 24 additions and 32 deletions
+6 -14
View File
@@ -225,11 +225,9 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
*/
- (CPDictionary)symbolsForLanguageCode:(CPString)languageCode
{
var languageSymbols;
var languageSymbols = [_symbols valueForKey:languageCode];
languageSymbols = [_symbols valueForKey:languageCode];
if(!languageSymbols)
if (!languageSymbols)
{
languageSymbols = [self symbolsForLanguageCode:@"root"];
[self setSymbols:languageSymbols forLanguageCode:languageCode];
@@ -249,14 +247,10 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
*/
- (id)symbolForKey:(CPString)aKey languageCode:(CPString)languageCode
{
var languageSymbols,
symbol;
var languageSymbols = [self symbolsForLanguageCode:languageCode],
symbol = [languageSymbols valueForKey:aKey];
languageSymbols = [self symbolsForLanguageCode:languageCode];
symbol = [languageSymbols valueForKey:aKey];
if(!symbol)
if (!symbol)
{
symbol = [self symbolForKey:aKey languageCode:@"root"];
[self setSymbol:symbol forKey:aKey languageCode:languageCode];
@@ -269,9 +263,7 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
*/
- (void)setSymbol:(CPString)aSymbol forKey:(CPString)aKey languageCode:(CPString)languageCode
{
var languageSymbols;
languageSymbols = [self symbolsForLanguageCode:languageCode];
var languageSymbols = [self symbolsForLanguageCode:languageCode];
[languageSymbols setValue:aSymbol forKey:aKey];
}
+18 -18
View File
@@ -1231,126 +1231,126 @@
- (void)testGetNonEnAMSymbol
{
var enValue = [_dateFormatter AMSymbol],
value = [_nonEnDateFormatter AMSymbol]
value = [_nonEnDateFormatter AMSymbol];
[self assert:enValue equals:value];
}
- (void)testGetNonEnPMSymbol
{
var enValue = [_dateFormatter PMSymbol],
value = [_nonEnDateFormatter PMSymbol]
value = [_nonEnDateFormatter PMSymbol];
[self assert:enValue equals:value];
}
- (void)testGetNonEnWeekdaySymbols
{
var enValue = [_dateFormatter weekdaySymbols],
value = [_nonEnDateFormatter weekdaySymbols]
value = [_nonEnDateFormatter weekdaySymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnShortWeekdaySymbols
{
var enValue = [_dateFormatter shortWeekdaySymbols],
value = [_nonEnDateFormatter shortWeekdaySymbols]
value = [_nonEnDateFormatter shortWeekdaySymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnVeryShortWeekdaySymbols
{
var enValue = [_dateFormatter veryShortWeekdaySymbols],
value = [_nonEnDateFormatter veryShortWeekdaySymbols]
value = [_nonEnDateFormatter veryShortWeekdaySymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnStandaloneWeekdaySymbols
{
var enValue = [_dateFormatter standaloneWeekdaySymbols],
value = [_nonEnDateFormatter standaloneWeekdaySymbols]
value = [_nonEnDateFormatter standaloneWeekdaySymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnShortStandaloneWeekdaySymbols
{
var enValue = [_dateFormatter shortStandaloneWeekdaySymbols],
value = [_nonEnDateFormatter shortStandaloneWeekdaySymbols]
value = [_nonEnDateFormatter shortStandaloneWeekdaySymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnVeryShortStandaloneWeekdaySymbols
{
var enValue = [_dateFormatter veryShortStandaloneWeekdaySymbols],
value = [_nonEnDateFormatter veryShortStandaloneWeekdaySymbols]
value = [_nonEnDateFormatter veryShortStandaloneWeekdaySymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnMonthSymbols
{
var enValue = [_dateFormatter monthSymbols],
value = [_nonEnDateFormatter monthSymbols]
value = [_nonEnDateFormatter monthSymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnShortMonthSymbols
{
var enValue = [_dateFormatter shortMonthSymbols],
value = [_nonEnDateFormatter shortMonthSymbols]
value = [_nonEnDateFormatter shortMonthSymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnVeryShortMonthSymbols
{
var enValue = [_dateFormatter veryShortMonthSymbols],
value = [_nonEnDateFormatter veryShortMonthSymbols]
value = [_nonEnDateFormatter veryShortMonthSymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnStandaloneMonthSymbols
{
var enValue = [_dateFormatter standaloneMonthSymbols],
value = [_nonEnDateFormatter standaloneMonthSymbols]
value = [_nonEnDateFormatter standaloneMonthSymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnShortStandaloneMonthSymbols
{
var enValue = [_dateFormatter shortStandaloneMonthSymbols],
value = [_nonEnDateFormatter shortStandaloneMonthSymbols]
value = [_nonEnDateFormatter shortStandaloneMonthSymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnVeryShortStandaloneMonthSymbols
{
var enValue = [_dateFormatter veryShortStandaloneMonthSymbols],
value = [_nonEnDateFormatter veryShortStandaloneMonthSymbols]
value = [_nonEnDateFormatter veryShortStandaloneMonthSymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnQuarterSymbols
{
var enValue = [_dateFormatter quarterSymbols],
value = [_nonEnDateFormatter quarterSymbols]
value = [_nonEnDateFormatter quarterSymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnShortQuarterSymbols
{
var enValue = [_dateFormatter shortQuarterSymbols],
value = [_nonEnDateFormatter shortQuarterSymbols]
value = [_nonEnDateFormatter shortQuarterSymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnStandaloneQuarterSymbols
{
var enValue = [_dateFormatter standaloneQuarterSymbols],
value = [_nonEnDateFormatter standaloneQuarterSymbols]
value = [_nonEnDateFormatter standaloneQuarterSymbols];
[self assert:enValue equals:value];
}
- (void)testGetNonEnShortStandaloneQuarterSymbols
{
var enValue = [_dateFormatter shortStandaloneQuarterSymbols],
value = [_nonEnDateFormatter shortStandaloneQuarterSymbols]
value = [_nonEnDateFormatter shortStandaloneQuarterSymbols];
[self assert:enValue equals:value];
}