Skip to content

Commit 98d32fd

Browse files
webmozartwebmozart
committed
[Form] Improved tests to use the IntlTestHelper class
1 parent acf7f49 commit 98d32fd

18 files changed

+111
-164
lines changed

‎Tests/Extension/Core/DataTransformer/DateTimeTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
1313

14-
abstract class DateTimeTestCase extends LocalizedTestCase
14+
abstract class DateTimeTestCase extends \PHPUnit_Framework_TestCase
1515
{
1616
public static function assertDateTimeEquals(\DateTime $expected, \DateTime $actual)
1717
{

‎Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
1313

1414
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToLocalizedStringTransformer;
15+
use Symfony\Component\Intl\Util\IntlTestHelper;
1516

1617
class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
1718
{
@@ -22,6 +23,9 @@ protected function setUp()
2223
{
2324
parent::setUp();
2425

26+
// Since we test against "de_AT", we need the full implementation
27+
IntlTestHelper::requireFullIntl($this);
28+
2529
\Locale::setDefault('de_AT');
2630

2731
$this->dateTime = new \DateTime('2010-02-03 04:05:06 UTC');
@@ -57,15 +61,11 @@ public function dataProvider()
5761
array(\IntlDateFormatter::FULL, \IntlDateFormatter::NONE, null, 'Mittwoch, 03. Februar 2010', '2010-02-03 00:00:00 UTC'),
5862
array(null, \IntlDateFormatter::SHORT, null, '03.02.2010 04:05', '2010-02-03 04:05:00 UTC'),
5963
array(null, \IntlDateFormatter::MEDIUM, null, '03.02.2010 04:05:06', '2010-02-03 04:05:06 UTC'),
60-
array(null, \IntlDateFormatter::LONG, null,
61-
'03.02.2010 04:05:06 GMT'.($this->isLowerThanIcuVersion('4.8') ? '+00:00' : ''),
62-
'2010-02-03 04:05:06 UTC'),
64+
array(null, \IntlDateFormatter::LONG, null, '03.02.2010 04:05:06 GMT', '2010-02-03 04:05:06 UTC'),
6365
// see below for extra test case for time format FULL
6466
array(\IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, null, '04:05', '1970-01-01 04:05:00 UTC'),
6567
array(\IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM, null, '04:05:06', '1970-01-01 04:05:06 UTC'),
66-
array(\IntlDateFormatter::NONE, \IntlDateFormatter::LONG, null,
67-
'04:05:06 GMT'.($this->isLowerThanIcuVersion('4.8') ? '+00:00' : ''),
68-
'1970-01-01 04:05:06 UTC'),
68+
array(\IntlDateFormatter::NONE, \IntlDateFormatter::LONG, null, '04:05:06 GMT', '1970-01-01 04:05:06 UTC'),
6969
array(null, null, 'yyyy-MM-dd HH:mm:00', '2010-02-03 04:05:00', '2010-02-03 04:05:00 UTC'),
7070
array(null, null, 'yyyy-MM-dd HH:mm', '2010-02-03 04:05', '2010-02-03 04:05:00 UTC'),
7171
array(null, null, 'yyyy-MM-dd HH', '2010-02-03 04', '2010-02-03 04:00:00 UTC'),
@@ -101,15 +101,9 @@ public function testTransform($dateFormat, $timeFormat, $pattern, $output, $inpu
101101

102102
public function testTransformFullTime()
103103
{
104-
if ($this->isLowerThanIcuVersion('4.0')) {
105-
$this->markTestSkipped('Please upgrade ICU version to 4.0+');
106-
}
107-
108104
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL);
109105

110-
$expected = $this->isLowerThanIcuVersion('4.8') ? '03.02.2010 04:05:06 GMT+00:00' : '03.02.2010 04:05:06 GMT';
111-
112-
$this->assertEquals($expected, $transformer->transform($this->dateTime));
106+
$this->assertEquals('03.02.2010 04:05:06 GMT', $transformer->transform($this->dateTime));
113107
}
114108

115109
public function testTransformToDifferentLocale()
@@ -118,7 +112,7 @@ public function testTransformToDifferentLocale()
118112

119113
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
120114

121-
$this->assertEquals('Feb 3, 2010 4:05 AM', $transformer->transform($this->dateTime));
115+
$this->assertEquals('Feb 3, 2010, 4:05 AM', $transformer->transform($this->dateTime));
122116
}
123117

124118
public function testTransformEmpty()
@@ -188,10 +182,6 @@ public function testReverseTransform($dateFormat, $timeFormat, $pattern, $input,
188182

189183
public function testReverseTransformFullTime()
190184
{
191-
if ($this->isLowerThanIcuVersion('4.0')) {
192-
$this->markTestSkipped('Please upgrade ICU version to 4.0+');
193-
}
194-
195185
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL);
196186

197187
$this->assertDateTimeEquals($this->dateTime, $transformer->reverseTransform('03.02.2010 04:05:06 GMT+00:00'));
@@ -203,7 +193,7 @@ public function testReverseTransformFromDifferentLocale()
203193

204194
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
205195

206-
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010 04:05 AM'));
196+
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('Feb 3, 2010, 04:05 AM'));
207197
}
208198

209199
public function testReverseTransformWithDifferentTimezones()

‎Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
1313

1414
use Symfony\Component\Form\Extension\Core\DataTransformer\IntegerToLocalizedStringTransformer;
15+
use Symfony\Component\Intl\Util\IntlTestHelper;
1516

16-
class IntegerToLocalizedStringTransformerTest extends LocalizedTestCase
17+
class IntegerToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase
1718
{
1819
protected function setUp()
1920
{
2021
parent::setUp();
2122

23+
// Since we test against "de_AT", we need the full implementation
24+
IntlTestHelper::requireFullIntl($this);
25+
2226
\Locale::setDefault('de_AT');
2327
}
2428

‎Tests/Extension/Core/DataTransformer/LocalizedTestCase.php

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
1313

1414
use Symfony\Component\Form\Extension\Core\DataTransformer\MoneyToLocalizedStringTransformer;
15+
use Symfony\Component\Intl\Util\IntlTestHelper;
1516

16-
class MoneyToLocalizedStringTransformerTest extends LocalizedTestCase
17+
class MoneyToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase
1718
{
1819
protected function setUp()
1920
{
2021
parent::setUp();
2122

23+
// Since we test against "de_AT", we need the full implementation
24+
IntlTestHelper::requireFullIntl($this);
25+
2226
\Locale::setDefault('de_AT');
2327
}
2428

‎Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
1313

1414
use Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer;
15+
use Symfony\Component\Intl\Util\IntlTestHelper;
1516

16-
class NumberToLocalizedStringTransformerTest extends LocalizedTestCase
17+
class NumberToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase
1718
{
1819
protected function setUp()
1920
{
2021
parent::setUp();
2122

23+
// Since we test against "de_AT", we need the full implementation
24+
IntlTestHelper::requireFullIntl($this);
25+
2226
\Locale::setDefault('de_AT');
2327
}
2428

@@ -96,10 +100,6 @@ public function testReverseTransformWithGrouping()
96100

97101
public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
98102
{
99-
if ($this->isLowerThanIcuVersion('4.7')) {
100-
$this->markTestSkipped('Please upgrade ICU version to 4.7+');
101-
}
102-
103103
\Locale::setDefault('fr');
104104
$transformer = new NumberToLocalizedStringTransformer(null, true);
105105

@@ -117,10 +117,6 @@ public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
117117
*/
118118
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
119119
{
120-
if ($this->isLowerThanIcuVersion('4.7')) {
121-
$this->markTestSkipped('Please upgrade ICU version to 4.7+');
122-
}
123-
124120
$transformer = new NumberToLocalizedStringTransformer(null, true);
125121

126122
$transformer->reverseTransform('1.234.5');
@@ -131,10 +127,6 @@ public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
131127
*/
132128
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGroupSep()
133129
{
134-
if ($this->isLowerThanIcuVersion('4.7')) {
135-
$this->markTestSkipped('Please upgrade ICU version to 4.7+');
136-
}
137-
138130
$transformer = new NumberToLocalizedStringTransformer(null, true);
139131

140132
$transformer->reverseTransform('1234.5');
@@ -151,11 +143,7 @@ public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsDotButNoGroupin
151143

152144
public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsNotComma()
153145
{
154-
if ($this->isLowerThanIcuVersion('4.7')) {
155-
$this->markTestSkipped('Please upgrade ICU version to 4.7+');
156-
}
157-
158-
\Locale::setDefault('ak');
146+
\Locale::setDefault('bg');
159147
$transformer = new NumberToLocalizedStringTransformer(null, true);
160148

161149
// completely valid format
@@ -172,10 +160,6 @@ public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsNotComma()
172160
*/
173161
public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma()
174162
{
175-
if ($this->isLowerThanIcuVersion('4.7')) {
176-
$this->markTestSkipped('Please upgrade ICU version to 4.7+');
177-
}
178-
179163
\Locale::setDefault('en');
180164
$transformer = new NumberToLocalizedStringTransformer(null, true);
181165

@@ -187,10 +171,6 @@ public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma()
187171
*/
188172
public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsCommaWithNoGroupSep()
189173
{
190-
if ($this->isLowerThanIcuVersion('4.7')) {
191-
$this->markTestSkipped('Please upgrade ICU version to 4.7+');
192-
}
193-
194174
\Locale::setDefault('en');
195175
$transformer = new NumberToLocalizedStringTransformer(null, true);
196176

‎Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
1313

1414
use Symfony\Component\Form\Extension\Core\DataTransformer\PercentToLocalizedStringTransformer;
15+
use Symfony\Component\Intl\Util\IntlTestHelper;
1516

16-
class PercentToLocalizedStringTransformerTest extends LocalizedTestCase
17+
class PercentToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase
1718
{
1819
protected function setUp()
1920
{
2021
parent::setUp();
2122

23+
// Since we test against "de_AT", we need the full implementation
24+
IntlTestHelper::requireFullIntl($this);
25+
2226
\Locale::setDefault('de_AT');
2327
}
2428

‎Tests/Extension/Core/Type/CountryTypeTest.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,17 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

1414
use Symfony\Component\Form\Extension\Core\View\ChoiceView;
15+
use Symfony\Component\Intl\Util\IntlTestHelper;
1516

16-
class CountryTypeTest extends LocalizedTestCase
17+
class CountryTypeTest extends TypeTestCase
1718
{
19+
protected function setUp()
20+
{
21+
IntlTestHelper::requireIntl($this);
22+
23+
parent::setUp();
24+
}
25+
1826
public function testCountriesAreSelectable()
1927
{
2028
$form = $this->factory->create('country');

‎Tests/Extension/Core/Type/DateTimeTypeTest.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,17 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

1414
use Symfony\Component\Form\FormError;
15+
use Symfony\Component\Intl\Util\IntlTestHelper;
1516

16-
class DateTimeTypeTest extends LocalizedTestCase
17+
class DateTimeTypeTest extends TypeTestCase
1718
{
19+
protected function setUp()
20+
{
21+
IntlTestHelper::requireIntl($this);
22+
23+
parent::setUp();
24+
}
25+
1826
public function testSubmitDateTime()
1927
{
2028
$form = $this->factory->create('datetime', null, array(

‎Tests/Extension/Core/Type/DateTypeTest.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@
1313

1414
use Symfony\Component\Form\Extension\Core\View\ChoiceView;
1515
use Symfony\Component\Form\FormError;
16+
use Symfony\Component\Intl\Util\IntlTestHelper;
1617

17-
class DateTypeTest extends LocalizedTestCase
18+
class DateTypeTest extends TypeTestCase
1819
{
1920
protected function setUp()
2021
{
2122
parent::setUp();
2223

24+
// we test against "de_AT", so we need the full implementation
25+
IntlTestHelper::requireFullIntl($this);
26+
2327
\Locale::setDefault('de_AT');
2428
}
2529

@@ -385,7 +389,7 @@ public function testMonthsOptionShortFormat()
385389

386390
$this->assertEquals(array(
387391
new ChoiceView('1', '1', 'Jän'),
388-
new ChoiceView('4', '4', 'Apr')
392+
new ChoiceView('4', '4', 'Apr.')
389393
), $view['month']->vars['choices']);
390394
}
391395

‎Tests/Extension/Core/Type/IntegerTypeTest.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,17 @@
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

14-
class IntegerTypeTest extends LocalizedTestCase
14+
use Symfony\Component\Intl\Util\IntlTestHelper;
15+
16+
class IntegerTypeTest extends TypeTestCase
1517
{
18+
protected function setUp()
19+
{
20+
IntlTestHelper::requireIntl($this);
21+
22+
parent::setUp();
23+
}
24+
1625
public function testSubmitCastsToInteger()
1726
{
1827
$form = $this->factory->create('integer');

0 commit comments

Comments
 (0)