[Intl] Removed method IntlTestCase::skipIfInsufficientIcuVersion()

webmozart · webmozart · commit 838798f2f3fe · 2013-04-05T10:11:15.000+02:00
diff --git a/src/Symfony/Component/Intl/Tests/Collator/Verification/CollatorTest.php b/src/Symfony/Component/Intl/Tests/Collator/Verification/CollatorTest.php
@@ -25,7 +25,6 @@ class CollatorTest extends AbstractCollatorTest
     protected function setUp()
     {
         $this->skipIfIntlExtensionNotLoaded();
-        $this->skipIfInsufficientIcuVersion();
 
         parent::setUp();
     }
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php
@@ -25,7 +25,6 @@ class IntlDateFormatterTest extends AbstractIntlDateFormatterTest
     protected function setUp()
     {
         $this->skipIfIntlExtensionNotLoaded();
-        $this->skipIfInsufficientIcuVersion();
 
         parent::setUp();
     }
diff --git a/src/Symfony/Component/Intl/Tests/Globals/Verification/IntlGlobalsTest.php b/src/Symfony/Component/Intl/Tests/Globals/Verification/IntlGlobalsTest.php
@@ -24,7 +24,6 @@ class IntlGlobalsTest extends AbstractIntlGlobalsTest
     protected function setUp()
     {
         $this->skipIfIntlExtensionNotLoaded();
-        $this->skipIfInsufficientIcuVersion();
 
         parent::setUp();
     }
diff --git a/src/Symfony/Component/Intl/Tests/IntlTestCase.php b/src/Symfony/Component/Intl/Tests/IntlTestCase.php
@@ -43,10 +43,7 @@ protected function skipIfIntlExtensionNotLoaded()
         if (!Intl::isExtensionLoaded()) {
             $this->markTestSkipped('The intl extension is not available.');
         }
-    }
 
-    protected function skipIfInsufficientIcuVersion()
-    {
         if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {
             $this->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion());
         }
diff --git a/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php b/src/Symfony/Component/Intl/Tests/Locale/Verification/LocaleTest.php
@@ -24,7 +24,6 @@ class LocaleTest extends AbstractLocaleTest
     protected function setUp()
     {
         $this->skipIfIntlExtensionNotLoaded();
-        $this->skipIfInsufficientIcuVersion();
 
         parent::setUp();
     }
diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/Verification/NumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/Verification/NumberFormatterTest.php
@@ -22,7 +22,6 @@ class NumberFormatterTest extends AbstractNumberFormatterTest
     protected function setUp()
     {
         $this->skipIfIntlExtensionNotLoaded();
-        $this->skipIfInsufficientIcuVersion();
 
         parent::setUp();
     }
diff --git a/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/BinaryBundleReaderTest.php b/src/Symfony/Component/Intl/Tests/ResourceBundle/Reader/BinaryBundleReaderTest.php
@@ -12,11 +12,12 @@
 namespace Symfony\Component\Intl\Tests\ResourceBundle\Reader;
 
 use Symfony\Component\Intl\ResourceBundle\Reader\BinaryBundleReader;
+use Symfony\Component\Intl\Tests\IntlTestCase;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
-class BinaryBundleReaderTest extends \PHPUnit_Framework_TestCase
+class BinaryBundleReaderTest extends IntlTestCase
 {
     /**
      * @var BinaryBundleReader
@@ -25,6 +26,8 @@ class BinaryBundleReaderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
+        $this->skipIfIntlExtensionNotLoaded();
+
         $this->reader = new BinaryBundleReader();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ class CollatorTest extends AbstractCollatorTest`
`25`	`25`	`protected function setUp()`
`26`	`26`	`{`
`27`	`27`	`$this->skipIfIntlExtensionNotLoaded();`
`28`		`- $this->skipIfInsufficientIcuVersion();`
`29`	`28`
`30`	`29`	`parent::setUp();`
`31`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ class IntlDateFormatterTest extends AbstractIntlDateFormatterTest`
`25`	`25`	`protected function setUp()`
`26`	`26`	`{`
`27`	`27`	`$this->skipIfIntlExtensionNotLoaded();`
`28`		`- $this->skipIfInsufficientIcuVersion();`
`29`	`28`
`30`	`29`	`parent::setUp();`
`31`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ class IntlGlobalsTest extends AbstractIntlGlobalsTest`
`24`	`24`	`protected function setUp()`
`25`	`25`	`{`
`26`	`26`	`$this->skipIfIntlExtensionNotLoaded();`
`27`		`- $this->skipIfInsufficientIcuVersion();`
`28`	`27`
`29`	`28`	`parent::setUp();`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,7 @@ protected function skipIfIntlExtensionNotLoaded()`
`43`	`43`	`if (!Intl::isExtensionLoaded()) {`
`44`	`44`	`$this->markTestSkipped('The intl extension is not available.');`
`45`	`45`	`}`
`46`		`- }`
`47`	`46`
`48`		`- protected function skipIfInsufficientIcuVersion()`
`49`		`- {`
`50`	`47`	`if (IcuVersion::compare(Intl::getIcuVersion(), Intl::getIcuStubVersion(), '!=', $precision = 1)) {`
`51`	`48`	`$this->markTestSkipped('Please change ICU version to ' . Intl::getIcuStubVersion());`
`52`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ class LocaleTest extends AbstractLocaleTest`
`24`	`24`	`protected function setUp()`
`25`	`25`	`{`
`26`	`26`	`$this->skipIfIntlExtensionNotLoaded();`
`27`		`- $this->skipIfInsufficientIcuVersion();`
`28`	`27`
`29`	`28`	`parent::setUp();`
`30`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ class NumberFormatterTest extends AbstractNumberFormatterTest`
`22`	`22`	`protected function setUp()`
`23`	`23`	`{`
`24`	`24`	`$this->skipIfIntlExtensionNotLoaded();`
`25`		`- $this->skipIfInsufficientIcuVersion();`
`26`	`25`
`27`	`26`	`parent::setUp();`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,12 @@`
`12`	`12`	`namespace Symfony\Component\Intl\Tests\ResourceBundle\Reader;`
`13`	`13`
`14`	`14`	`use Symfony\Component\Intl\ResourceBundle\Reader\BinaryBundleReader;`
	`15`	`+use Symfony\Component\Intl\Tests\IntlTestCase;`
`15`	`16`
`16`	`17`	`/**`
`17`	`18`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`18`	`19`	`*/`
`19`		`-class BinaryBundleReaderTest extends \PHPUnit_Framework_TestCase`
	`20`	`+class BinaryBundleReaderTest extends IntlTestCase`
`20`	`21`	`{`
`21`	`22`	`/**`
`22`	`23`	`* @var BinaryBundleReader`
`@@ -25,6 +26,8 @@ class BinaryBundleReaderTest extends \PHPUnit_Framework_TestCase`
`25`	`26`
`26`	`27`	`protected function setUp()`
`27`	`28`	`{`
	`29`	`+ $this->skipIfIntlExtensionNotLoaded();`
	`30`	`+`
`28`	`31`	`$this->reader = new BinaryBundleReader();`
`29`	`32`	`}`
`30`	`33`