From 6f74e1958b116ad032fc8e5c5a7181148f0ae9bd Mon Sep 17 00:00:00 2001 From: Phally Date: Wed, 14 Aug 2013 21:00:31 +0200 Subject: [PATCH] Makes the locale test not always pass, be verbose when it is skipped. --- lib/Cake/Test/Case/Utility/CakeNumberTest.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Cake/Test/Case/Utility/CakeNumberTest.php b/lib/Cake/Test/Case/Utility/CakeNumberTest.php index 2635a754b..d634134ba 100644 --- a/lib/Cake/Test/Case/Utility/CakeNumberTest.php +++ b/lib/Cake/Test/Case/Utility/CakeNumberTest.php @@ -587,12 +587,14 @@ class CakeNumberTest extends CakeTestCase { */ public function testReadableSizeLocalized() { $restore = setlocale(LC_NUMERIC, 0); - setlocale(LC_NUMERIC, 'de_DE'); + + $this->skipIf(setlocale(LC_NUMERIC, 'de_DE') === false, "The German locale isn't available."); + $result = $this->Number->toReadableSize(1321205); - $this->assertRegExp('/1[,.]26 MB/', $result); + $this->assertEquals('1,26 MB', $result); $result = $this->Number->toReadableSize(1024 * 1024 * 1024 * 512); - $this->assertRegExp('/512[,.]00 GB/', $result); + $this->assertEquals('512,00 GB', $result); setlocale(LC_NUMERIC, $restore); }