From aceb20d6105ea1d4dae43792e993a9aed1aceeb1 Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Sat, 16 Mar 2013 01:38:38 +0100 Subject: [PATCH] [Form] Improved tests to use the IntlTestHelper class --- .../Core/DataTransformer/DateTimeTestCase.php | 2 +- ...teTimeToLocalizedStringTransformerTest.php | 28 +++----- ...ntegerToLocalizedStringTransformerTest.php | 6 +- .../DataTransformer/LocalizedTestCase.php | 70 ------------------- .../MoneyToLocalizedStringTransformerTest.php | 6 +- ...NumberToLocalizedStringTransformerTest.php | 32 ++------- ...ercentToLocalizedStringTransformerTest.php | 6 +- .../Extension/Core/Type/CountryTypeTest.php | 10 ++- .../Extension/Core/Type/DateTimeTypeTest.php | 10 ++- .../Extension/Core/Type/DateTypeTest.php | 8 ++- .../Extension/Core/Type/IntegerTypeTest.php | 11 ++- .../Extension/Core/Type/LanguageTypeTest.php | 10 ++- .../Extension/Core/Type/LocaleTypeTest.php | 10 ++- .../Extension/Core/Type/LocalizedTestCase.php | 34 --------- .../Extension/Core/Type/MoneyTypeTest.php | 13 +++- .../Extension/Core/Type/NumberTypeTest.php | 7 +- .../Extension/Core/Type/TimeTypeTest.php | 10 ++- .../Tests/Extension/Core/Type/UrlTypeTest.php | 2 +- 18 files changed, 111 insertions(+), 164 deletions(-) delete mode 100644 src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/LocalizedTestCase.php delete mode 100644 src/Symfony/Component/Form/Tests/Extension/Core/Type/LocalizedTestCase.php diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeTestCase.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeTestCase.php index e9596b3efb..f7722c496e 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeTestCase.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeTestCase.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; -abstract class DateTimeTestCase extends LocalizedTestCase +abstract class DateTimeTestCase extends \PHPUnit_Framework_TestCase { public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual) { diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php index df786a74fa..abef21ba6d 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToLocalizedStringTransformer; +use Symfony\Component\Intl\Util\IntlTestHelper; class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase { @@ -22,6 +23,9 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase { parent::setUp(); + // Since we test against "de_AT", we need the full implementation + IntlTestHelper::requireFullIntl($this); + \Locale::setDefault('de_AT'); $this->dateTime = new \DateTime('2010-02-03 04:05:06 UTC'); @@ -57,15 +61,11 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase array(\IntlDateFormatter::FULL, \IntlDateFormatter::NONE, null, 'Mittwoch, 03. Februar 2010', '2010-02-03 00:00:00 UTC'), array(null, \IntlDateFormatter::SHORT, null, '03.02.2010 04:05', '2010-02-03 04:05:00 UTC'), array(null, \IntlDateFormatter::MEDIUM, null, '03.02.2010 04:05:06', '2010-02-03 04:05:06 UTC'), - array(null, \IntlDateFormatter::LONG, null, - '03.02.2010 04:05:06 GMT'.($this->isLowerThanIcuVersion('4.8') ? '+00:00' : ''), - '2010-02-03 04:05:06 UTC'), + array(null, \IntlDateFormatter::LONG, null, '03.02.2010 04:05:06 GMT', '2010-02-03 04:05:06 UTC'), // see below for extra test case for time format FULL array(\IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, null, '04:05', '1970-01-01 04:05:00 UTC'), array(\IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM, null, '04:05:06', '1970-01-01 04:05:06 UTC'), - array(\IntlDateFormatter::NONE, \IntlDateFormatter::LONG, null, - '04:05:06 GMT'.($this->isLowerThanIcuVersion('4.8') ? '+00:00' : ''), - '1970-01-01 04:05:06 UTC'), + array(\IntlDateFormatter::NONE, \IntlDateFormatter::LONG, null, '04:05:06 GMT', '1970-01-01 04:05:06 UTC'), array(null, null, 'yyyy-MM-dd HH:mm:00', '2010-02-03 04:05:00', '2010-02-03 04:05:00 UTC'), array(null, null, 'yyyy-MM-dd HH:mm', '2010-02-03 04:05', '2010-02-03 04:05:00 UTC'), array(null, null, 'yyyy-MM-dd HH', '2010-02-03 04', '2010-02-03 04:00:00 UTC'), @@ -101,15 +101,9 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase public function testTransformFullTime() { - if ($this->isLowerThanIcuVersion('4.0')) { - $this->markTestSkipped('Please upgrade ICU version to 4.0+'); - } - $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL); - $expected = $this->isLowerThanIcuVersion('4.8') ? '03.02.2010 04:05:06 GMT+00:00' : '03.02.2010 04:05:06 GMT'; - - $this->assertEquals($expected, $transformer->transform($this->dateTime)); + $this->assertEquals('03.02.2010 04:05:06 GMT', $transformer->transform($this->dateTime)); } public function testTransformToDifferentLocale() @@ -118,7 +112,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC'); - $this->assertEquals('Feb 3, 2010 4:05 AM', $transformer->transform($this->dateTime)); + $this->assertEquals('Feb 3, 2010, 4:05 AM', $transformer->transform($this->dateTime)); } public function testTransformEmpty() @@ -188,10 +182,6 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase public function testReverseTransformFullTime() { - if ($this->isLowerThanIcuVersion('4.0')) { - $this->markTestSkipped('Please upgrade ICU version to 4.0+'); - } - $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL); $this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010 04:05:06 GMT+00:00')); @@ -203,7 +193,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC'); - $this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010 04:05 AM')); + $this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010, 04:05 AM')); } public function testReverseTransformWithDifferentTimezones() diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php index d099cde910..9aa3deee44 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php @@ -12,13 +12,17 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use Symfony\Component\Form\Extension\Core\DataTransformer\IntegerToLocalizedStringTransformer; +use Symfony\Component\Intl\Util\IntlTestHelper; -class IntegerToLocalizedStringTransformerTest extends LocalizedTestCase +class IntegerToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase { protected function setUp() { parent::setUp(); + // Since we test against "de_AT", we need the full implementation + IntlTestHelper::requireFullIntl($this); + \Locale::setDefault('de_AT'); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/LocalizedTestCase.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/LocalizedTestCase.php deleted file mode 100644 index 494928b7e1..0000000000 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/LocalizedTestCase.php +++ /dev/null @@ -1,70 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; - -abstract class LocalizedTestCase extends \PHPUnit_Framework_TestCase -{ - protected static $icuVersion = null; - - protected function setUp() - { - parent::setUp(); - - if (!$this->isIntlExtensionLoaded()) { - $this->markTestSkipped('The "intl" extension is not available'); - } - } - - protected function isIntlExtensionLoaded() - { - return extension_loaded('intl'); - } - - protected function isLowerThanIcuVersion($version) - { - $version = $this->normalizeIcuVersion($version); - $icuVersion = $this->normalizeIcuVersion($this->getIntlExtensionIcuVersion()); - - return $icuVersion < $version; - } - - protected function normalizeIcuVersion($version) - { - return ((float) $version) * 100; - } - - protected function getIntlExtensionIcuVersion() - { - if (isset(self::$icuVersion)) { - return self::$icuVersion; - } - - if (!$this->isIntlExtensionLoaded()) { - throw new \RuntimeException('The intl extension is not available'); - } - - if (defined('INTL_ICU_VERSION')) { - return INTL_ICU_VERSION; - } - - $reflector = new \ReflectionExtension('intl'); - - ob_start(); - $reflector->info(); - $output = ob_get_clean(); - - preg_match('/^ICU version => (.*)$/m', $output, $matches); - self::$icuVersion = $matches[1]; - - return self::$icuVersion; - } -} diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php index 8ff5c16ac0..59606f5c47 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php @@ -12,13 +12,17 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use Symfony\Component\Form\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer; +use Symfony\Component\Intl\Util\IntlTestHelper; -class MoneyToLocalizedStringTransformerTest extends LocalizedTestCase +class MoneyToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase { protected function setUp() { parent::setUp(); + // Since we test against "de_AT", we need the full implementation + IntlTestHelper::requireFullIntl($this); + \Locale::setDefault('de_AT'); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php index 151dbc80f6..fad6e32376 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php @@ -12,13 +12,17 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer; +use Symfony\Component\Intl\Util\IntlTestHelper; -class NumberToLocalizedStringTransformerTest extends LocalizedTestCase +class NumberToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase { protected function setUp() { parent::setUp(); + // Since we test against "de_AT", we need the full implementation + IntlTestHelper::requireFullIntl($this); + \Locale::setDefault('de_AT'); } @@ -96,10 +100,6 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot() { - if ($this->isLowerThanIcuVersion('4.7')) { - $this->markTestSkipped('Please upgrade ICU version to 4.7+'); - } - \Locale::setDefault('fr'); $transformer = new NumberToLocalizedStringTransformer(null, true); @@ -117,10 +117,6 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase */ public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot() { - if ($this->isLowerThanIcuVersion('4.7')) { - $this->markTestSkipped('Please upgrade ICU version to 4.7+'); - } - $transformer = new NumberToLocalizedStringTransformer(null, true); $transformer->reverseTransform('1.234.5'); @@ -131,10 +127,6 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase */ public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGroupSep() { - if ($this->isLowerThanIcuVersion('4.7')) { - $this->markTestSkipped('Please upgrade ICU version to 4.7+'); - } - $transformer = new NumberToLocalizedStringTransformer(null, true); $transformer->reverseTransform('1234.5'); @@ -151,11 +143,7 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsNotComma() { - if ($this->isLowerThanIcuVersion('4.7')) { - $this->markTestSkipped('Please upgrade ICU version to 4.7+'); - } - - \Locale::setDefault('ak'); + \Locale::setDefault('bg'); $transformer = new NumberToLocalizedStringTransformer(null, true); // completely valid format @@ -172,10 +160,6 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase */ public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma() { - if ($this->isLowerThanIcuVersion('4.7')) { - $this->markTestSkipped('Please upgrade ICU version to 4.7+'); - } - \Locale::setDefault('en'); $transformer = new NumberToLocalizedStringTransformer(null, true); @@ -187,10 +171,6 @@ class NumberToLocalizedStringTransformerTest extends LocalizedTestCase */ public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsCommaWithNoGroupSep() { - if ($this->isLowerThanIcuVersion('4.7')) { - $this->markTestSkipped('Please upgrade ICU version to 4.7+'); - } - \Locale::setDefault('en'); $transformer = new NumberToLocalizedStringTransformer(null, true); diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php index 6cbca5a402..4bc139e72d 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php @@ -12,13 +12,17 @@ namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer; use Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer; +use Symfony\Component\Intl\Util\IntlTestHelper; -class PercentToLocalizedStringTransformerTest extends LocalizedTestCase +class PercentToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase { protected function setUp() { parent::setUp(); + // Since we test against "de_AT", we need the full implementation + IntlTestHelper::requireFullIntl($this); + \Locale::setDefault('de_AT'); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php index 97339d106e..1d56e2a024 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php @@ -12,9 +12,17 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; use Symfony\Component\Form\Extension\Core\View\ChoiceView; +use Symfony\Component\Intl\Util\IntlTestHelper; -class CountryTypeTest extends LocalizedTestCase +class CountryTypeTest extends TypeTestCase { + protected function setUp() + { + IntlTestHelper::requireIntl($this); + + parent::setUp(); + } + public function testCountriesAreSelectable() { $form = $this->factory->create('country'); diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php index 568766cf20..b5aad87eee 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php @@ -12,9 +12,17 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; use Symfony\Component\Form\FormError; +use Symfony\Component\Intl\Util\IntlTestHelper; -class DateTimeTypeTest extends LocalizedTestCase +class DateTimeTypeTest extends TypeTestCase { + protected function setUp() + { + IntlTestHelper::requireIntl($this); + + parent::setUp(); + } + public function testSubmitDateTime() { $form = $this->factory->create('datetime', null, array( diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php index c0d7da676b..abef0b18ba 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php @@ -13,13 +13,17 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; use Symfony\Component\Form\Extension\Core\View\ChoiceView; use Symfony\Component\Form\FormError; +use Symfony\Component\Intl\Util\IntlTestHelper; -class DateTypeTest extends LocalizedTestCase +class DateTypeTest extends TypeTestCase { protected function setUp() { parent::setUp(); + // we test against "de_AT", so we need the full implementation + IntlTestHelper::requireFullIntl($this); + \Locale::setDefault('de_AT'); } @@ -385,7 +389,7 @@ class DateTypeTest extends LocalizedTestCase $this->assertEquals(array( new ChoiceView('1', '1', 'Jän'), - new ChoiceView('4', '4', 'Apr') + new ChoiceView('4', '4', 'Apr.') ), $view['month']->vars['choices']); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php index 435749a16b..d16cc867b5 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php @@ -11,8 +11,17 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; -class IntegerTypeTest extends LocalizedTestCase +use Symfony\Component\Intl\Util\IntlTestHelper; + +class IntegerTypeTest extends TypeTestCase { + protected function setUp() + { + IntlTestHelper::requireIntl($this); + + parent::setUp(); + } + public function testSubmitCastsToInteger() { $form = $this->factory->create('integer'); diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php index 5b78ed0b00..24434b2148 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php @@ -12,9 +12,17 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; use Symfony\Component\Form\Extension\Core\View\ChoiceView; +use Symfony\Component\Intl\Util\IntlTestHelper; -class LanguageTypeTest extends LocalizedTestCase +class LanguageTypeTest extends TypeTestCase { + protected function setUp() + { + IntlTestHelper::requireIntl($this); + + parent::setUp(); + } + public function testCountriesAreSelectable() { $form = $this->factory->create('language'); diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php index 56c0396143..e402cb4bfb 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php @@ -12,9 +12,17 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; use Symfony\Component\Form\Extension\Core\View\ChoiceView; +use Symfony\Component\Intl\Util\IntlTestHelper; -class LocaleTypeTest extends LocalizedTestCase +class LocaleTypeTest extends TypeTestCase { + protected function setUp() + { + IntlTestHelper::requireIntl($this); + + parent::setUp(); + } + public function testLocalesAreSelectable() { $form = $this->factory->create('locale'); diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocalizedTestCase.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocalizedTestCase.php deleted file mode 100644 index 18a939d1f4..0000000000 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocalizedTestCase.php +++ /dev/null @@ -1,34 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\Form\Tests\Extension\Core\Type; - -use Symfony\Component\Intl\Intl; - -abstract class LocalizedTestCase extends TypeTestCase -{ - protected function setUp() - { - parent::setUp(); - - if (!class_exists('Symfony\Component\Intl\Intl')) { - $this->markTestSkipped('The "Intl" component is not available'); - } - - if (!Intl::isExtensionLoaded()) { - $this->markTestSkipped('The "intl" extension is not available'); - } - - Intl::setDataSource(Intl::STUB); - - \Locale::setDefault('en'); - } -} diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php index 9eadaac2c4..97fc37fa3d 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/MoneyTypeTest.php @@ -11,8 +11,19 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; -class MoneyTypeTest extends LocalizedTestCase +use Symfony\Component\Intl\Util\IntlTestHelper; + +class MoneyTypeTest extends TypeTestCase { + protected function setUp() + { + // we test against different locales, so we need the full + // implementation + IntlTestHelper::requireFullIntl($this); + + parent::setUp(); + } + public function testPassMoneyPatternToView() { \Locale::setDefault('de_DE'); diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php index a282190520..e5b3dd747c 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php @@ -11,12 +11,17 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; -class NumberTypeTest extends LocalizedTestCase +use Symfony\Component\Intl\Util\IntlTestHelper; + +class NumberTypeTest extends TypeTestCase { protected function setUp() { parent::setUp(); + // we test against "de_DE", so we need the full implementation + IntlTestHelper::requireFullIntl($this); + \Locale::setDefault('de_DE'); } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php index 6d23250e04..fa630b2201 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php @@ -13,9 +13,17 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; use Symfony\Component\Form\Extension\Core\View\ChoiceView; use Symfony\Component\Form\FormError; +use Symfony\Component\Intl\Util\IntlTestHelper; -class TimeTypeTest extends LocalizedTestCase +class TimeTypeTest extends TypeTestCase { + protected function setUp() + { + IntlTestHelper::requireIntl($this); + + parent::setUp(); + } + public function testSubmitDateTime() { $form = $this->factory->create('time', null, array( diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php index d1fa6dad8d..0782528884 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; -class UrlTypeTest extends LocalizedTestCase +class UrlTypeTest extends TypeTestCase { public function testSubmitAddsDefaultProtocolIfNoneIsIncluded() {