Fixes some tests for Zend_Date and Zend_Locale_Format

tests/Zend/DateTest.php

@@ -704,11 +704,11 @@ class Zend_DateTest extends PHPUnit_Framework_TestCase
         $this->assertSame(                              '5', $date->get(Zend_Date::WEEKDAY_DIGIT,     'es'));
         $this->assertSame(                             '43', $date->get(Zend_Date::DAY_OF_YEAR,       'es'));
         $this->assertSame(                              'v', $date->get(Zend_Date::WEEKDAY_NARROW,    'es'));
-        $this->assertSame(                            'vie', $date->get(Zend_Date::WEEKDAY_NAME,      'es'));
+        $this->assertSame(                           'vie.', $date->get(Zend_Date::WEEKDAY_NAME,      'es'));
         $this->assertSame(                             '07', $date->get(Zend_Date::WEEK,              'es'));
         $this->assertSame(                        'febrero', $date->get(Zend_Date::MONTH_NAME,        'es'));
         $this->assertSame(                             '02', $date->get(Zend_Date::MONTH,             'es'));
-        $this->assertSame(                            'feb', $date->get(Zend_Date::MONTH_NAME_SHORT,  'es'));
+        $this->assertSame(                           'feb.', $date->get(Zend_Date::MONTH_NAME_SHORT,  'es'));
         $this->assertSame(                              '2', $date->get(Zend_Date::MONTH_SHORT,       'es'));
         $this->assertSame(                             '28', $date->get(Zend_Date::MONTH_DAYS,        'es'));
         $this->assertSame(                              'f', $date->get(Zend_Date::MONTH_NAME_NARROW, 'es'));
@@ -717,7 +717,7 @@ class Zend_DateTest extends PHPUnit_Framework_TestCase
         $this->assertSame(                           '2009', $date->get(Zend_Date::YEAR,              'es'));
         $this->assertSame(                             '09', $date->get(Zend_Date::YEAR_SHORT,        'es'));
         $this->assertSame(                             '09', $date->get(Zend_Date::YEAR_SHORT_8601,   'es'));
-        $this->assertSame(                           'p.m.', $date->get(Zend_Date::MERIDIEM,          'es'));
+        $this->assertSame(                          'p. m.', $date->get(Zend_Date::MERIDIEM,          'es'));
         $this->assertSame(                            '021', $date->get(Zend_Date::SWATCH,            'es'));
         $this->assertSame(                             '11', $date->get(Zend_Date::HOUR_SHORT_AM,     'es'));
         $this->assertSame(                             '23', $date->get(Zend_Date::HOUR_SHORT,        'es'));
@@ -737,23 +737,23 @@ class Zend_DateTest extends PHPUnit_Framework_TestCase
         $this->assertSame(      '2009-02-13T23:31:30+00:00', $date->get(Zend_Date::ISO_8601,          'es'));
         $this->assertSame('Fri, 13 Feb 2009 23:31:30 +0000', $date->get(Zend_Date::RFC_2822,          'es'));
         $this->assertSame(                     '1234567890', $date->get(Zend_Date::TIMESTAMP,         'es'));
-        $this->assertSame(                           'd.C.', $date->get(Zend_Date::ERA,               'es'));
-        $this->assertSame(                   'anno Dómini', $date->get(Zend_Date::ERA_NAME,          'es'));
-        $this->assertSame(                     '13/02/2009', $date->get(Zend_Date::DATES,             'es'));
+        $this->assertSame(                          'd. C.', $date->get(Zend_Date::ERA,               'es'));
+        $this->assertSame(                    'anno Dómini', $date->get(Zend_Date::ERA_NAME,          'es'));
+        $this->assertSame(                      '13/2/2009', $date->get(Zend_Date::DATES,             'es'));
         $this->assertSame( 'viernes, 13 de febrero de 2009', $date->get(Zend_Date::DATE_FULL,         'es'));
         $this->assertSame(          '13 de febrero de 2009', $date->get(Zend_Date::DATE_LONG,         'es'));
-        $this->assertSame(                     '13/02/2009', $date->get(Zend_Date::DATE_MEDIUM,       'es'));
-        $this->assertSame(                       '13/02/09', $date->get(Zend_Date::DATE_SHORT,        'es'));
+        $this->assertSame(                      '13/2/2009', $date->get(Zend_Date::DATE_MEDIUM,       'es'));
+        $this->assertSame(                        '13/2/09', $date->get(Zend_Date::DATE_SHORT,        'es'));
         $this->assertSame(                       '23:31:30', $date->get(Zend_Date::TIMES,             'es'));
-        $this->assertSame(                   '23:31:30 UTC', $date->get(Zend_Date::TIME_FULL,         'es'));
+        $this->assertSame(                 '23:31:30 (UTC)', $date->get(Zend_Date::TIME_FULL,         'es'));
         $this->assertSame(                   '23:31:30 UTC', $date->get(Zend_Date::TIME_LONG,         'es'));
         $this->assertSame(                       '23:31:30', $date->get(Zend_Date::TIME_MEDIUM,       'es'));
         $this->assertSame(                          '23:31', $date->get(Zend_Date::TIME_SHORT,        'es'));
-        $this->assertSame(            '13/02/2009 23:31:30', $date->get(Zend_Date::DATETIME,          'es'));
-        $this->assertSame('viernes, 13 de febrero de 2009 23:31:30 UTC', $date->get(Zend_Date::DATETIME_FULL, 'es'));
-        $this->assertSame('13 de febrero de 2009 23:31:30 UTC', $date->get(Zend_Date::DATETIME_LONG,  'es'));
-        $this->assertSame(            '13/02/2009 23:31:30', $date->get(Zend_Date::DATETIME_MEDIUM,   'es'));
-        $this->assertSame(                 '13/02/09 23:31', $date->get(Zend_Date::DATETIME_SHORT,    'es'));
+        $this->assertSame(             '13/2/2009 23:31:30', $date->get(Zend_Date::DATETIME,          'es'));
+        $this->assertSame('viernes, 13 de febrero de 2009, 23:31:30 (UTC)', $date->get(Zend_Date::DATETIME_FULL, 'es'));
+        $this->assertSame('13 de febrero de 2009, 23:31:30 UTC', $date->get(Zend_Date::DATETIME_LONG,  'es'));
+        $this->assertSame(             '13/2/2009 23:31:30', $date->get(Zend_Date::DATETIME_MEDIUM,   'es'));
+        $this->assertSame(                  '13/2/09 23:31', $date->get(Zend_Date::DATETIME_SHORT,    'es'));
         $this->assertSame(      '2009-02-13T23:31:30+00:00', $date->get(Zend_Date::ATOM,              'es'));
         $this->assertSame( 'Friday, 13-Feb-09 23:31:30 UTC', $date->get(Zend_Date::COOKIE,            'es'));
         $this->assertSame(  'Fri, 13 Feb 09 23:31:30 +0000', $date->get(Zend_Date::RFC_822,           'es'));
@@ -1291,7 +1291,7 @@ class Zend_DateTest extends PHPUnit_Framework_TestCase
         }
         $date->set($d2, Zend_Date::MONTH_NAME_SHORT);
         $this->assertSame('2009-01-14T04:31:30+05:00', $date->get(Zend_Date::W3C));
-        $date->set('Mär.', Zend_Date::MONTH_NAME_SHORT);
+        $date->set('März', Zend_Date::MONTH_NAME_SHORT);
         $this->assertSame('2009-03-14T04:31:30+05:00', $date->get(Zend_Date::W3C));
         $date->set('Dez.', Zend_Date::MONTH_NAME_SHORT);
         $this->assertSame('2009-12-14T04:31:30+05:00', $date->get(Zend_Date::W3C));

tests/Zend/Locale/FormatTest.php

@@ -96,8 +96,8 @@ class Zend_Locale_FormatTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(          '0,1234567', Zend_Locale_Format::toNumber(       0.1234567,$options));
         $this->assertEquals( '-1.234.567,12345',   Zend_Locale_Format::toNumber(-1234567.12345,  $options));
         $this->assertEquals(  '1.234.567,12345',   Zend_Locale_Format::toNumber( 1234567.12345,  $options));
-        $this->assertEquals(    '1234567٫12345',   Zend_Locale_Format::toNumber( 1234567.12345,  array('locale' => 'ar_QA')));
-        $this->assertEquals(    '1234567٫12345-',  Zend_Locale_Format::toNumber(-1234567.12345,  array('locale' => 'ar_QA')));
+        $this->assertEquals(  '1٬234٬567٫12345',   Zend_Locale_Format::toNumber( 1234567.12345,  array('locale' => 'ar_QA')));
+        $this->assertEquals(  '‏-1٬234٬567٫12345',  Zend_Locale_Format::toNumber(-1234567.12345,  array('locale' => 'ar_QA')));
         $this->assertEquals(  '12,34,567.12345',   Zend_Locale_Format::toNumber( 1234567.12345,  array('locale' => 'dz_BT')));
         $this->assertEquals(  '-1.234.567,12345',  Zend_Locale_Format::toNumber(-1234567.12345,  array('locale' => 'mk_MK')));
         $this->assertEquals(        '452.25',      Zend_Locale_Format::toNumber(     452.25,     array('locale' => 'en_US')));
@@ -199,8 +199,8 @@ class Zend_Locale_FormatTest extends PHPUnit_Framework_TestCase
         $this->assertEquals( '1.234.567,12345',   Zend_Locale_Format::toFloat( 1234567.12345,   $options));
 
         $options = array('locale' => 'ar_QA');
-        $this->assertEquals(    '1234567٫12345',  Zend_Locale_Format::toFloat( 1234567.12345, $options                  ));
-        $this->assertEquals(    '1234567٫12345-', Zend_Locale_Format::toFloat(-1234567.12345, $options                  ));
+        $this->assertEquals(  '1٬234٬567٫12345',  Zend_Locale_Format::toFloat( 1234567.12345, $options                  ));
+        $this->assertEquals(  '‏-1٬234٬567٫12345', Zend_Locale_Format::toFloat(-1234567.12345, $options                  ));
         $this->assertEquals(  '12,34,567.12345',  Zend_Locale_Format::toFloat( 1234567.12345, array('locale' => 'dz_BT')));
         $this->assertEquals(  '-1.234.567,12345', Zend_Locale_Format::toFloat(-1234567.12345, array('locale' => 'mk_MK')));
 
@@ -286,8 +286,8 @@ class Zend_Locale_FormatTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(          '0',  Zend_Locale_Format::toInteger(       0.1234567, $options));
         $this->assertEquals( '-1.234.567',  Zend_Locale_Format::toInteger(-1234567.12345,   $options));
         $this->assertEquals(  '1.234.567',  Zend_Locale_Format::toInteger( 1234567.12345,   $options));
-        $this->assertEquals(    '1234567',  Zend_Locale_Format::toInteger( 1234567.12345,   array('locale' => 'ar_QA')));
-        $this->assertEquals(    '1234567-', Zend_Locale_Format::toInteger(-1234567.12345,   array('locale' => 'ar_QA')));
+        $this->assertEquals(  '1٬234٬567',  Zend_Locale_Format::toInteger( 1234567.12345,   array('locale' => 'ar_QA')));
+        $this->assertEquals(  '‏-1٬234٬567', Zend_Locale_Format::toInteger(-1234567.12345,   array('locale' => 'ar_QA')));
         $this->assertEquals(  '12,34,567',  Zend_Locale_Format::toInteger( 1234567.12345,   array('locale' => 'dz_BT')));
         $this->assertEquals(  '-1.234.567', Zend_Locale_Format::toInteger(-1234567.12345,   array('locale' => 'mk_MK')));