[Intl] Only the StubNumberFormatterTest requires stub data

webmozart · webmozart · commit c55c4a26fe4f · 2013-04-05T10:11:16.000+02:00
diff --git a/src/Symfony/Component/Intl/Tests/IntlTestCase.php b/src/Symfony/Component/Intl/Tests/IntlTestCase.php
@@ -22,12 +22,6 @@
  */
 abstract class IntlTestCase extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        // Always use stub data for testing to have consistent results
-        Intl::setDataSource(Intl::STUB);
-    }
-
     protected function is32Bit()
     {
         return PHP_INT_SIZE == 4;
diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/StubNumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/StubNumberFormatterTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Intl\Tests\NumberFormatter;
 
 use Symfony\Component\Intl\Globals\StubIntlGlobals;
+use Symfony\Component\Intl\Intl;
 use Symfony\Component\Intl\NumberFormatter\StubNumberFormatter;
 
 /**
@@ -20,6 +21,14 @@
  */
 class StubNumberFormatterTest extends AbstractNumberFormatterTest
 {
+    protected function setUp()
+    {
+        // Force the use of stub data to have consistent results
+        Intl::setDataSource(Intl::STUB);
+
+        parent::setUp();
+    }
+
     /**
      * @expectedException \Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException
      */

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,6 @@`
`22`	`22`	`*/`
`23`	`23`	`abstract class IntlTestCase extends \PHPUnit_Framework_TestCase`
`24`	`24`	`{`
`25`		`- protected function setUp()`
`26`		`- {`
`27`		`- // Always use stub data for testing to have consistent results`
`28`		`- Intl::setDataSource(Intl::STUB);`
`29`		`- }`
`30`		`-`
`31`	`25`	`protected function is32Bit()`
`32`	`26`	`{`
`33`	`27`	`return PHP_INT_SIZE == 4;`