Merge pull request #248 from dereuromark/bugfix/tests

Bugfix/tests

src/View/Helper/NumberHelper.php

@@ -7,15 +7,13 @@ use Cake\View\Helper\NumberHelper as CakeNumberHelper;
 use Cake\View\View;
 
 /**
- * Ovewrite to allow usage of own Number class.
+ * Overwrite to allow usage of own Number class.
  *
  * @mixin \Tools\Utility\Number
  */
 class NumberHelper extends CakeNumberHelper {
 
 	/**
-	 * NumberHelper::__construct()
-	 *
 	 * ### Settings:
 	 *
 	 * - `engine` Class name to use to replace Number functionality.

src/View/Helper/TextHelper.php

@@ -25,6 +25,7 @@ if (!defined('CHAR_HELLIP')) {
  * - maxLength (to shorten links in order to not mess up the layout in some cases - appends ...)
  * - escape (defaults to TRUE for security reasons regarding plain text)
  *
+ * @mixin \Tools\Utility\Text
  * @property \Cake\View\Helper\HtmlHelper $Html
  */
 class TextHelper extends CakeTextHelper {

tests/TestCase/Utility/NumberTest.php

@@ -10,7 +10,7 @@ class NumberTest extends TestCase {
 	/**
 	 * @var \Tools\Utility\Number
 	 */
-	public $Number;
+	protected $Number;
 
 	/**
 	 * @return void
@@ -22,8 +22,6 @@ class NumberTest extends TestCase {
 	}
 
 	/**
-	 * NumberTest::testAverage()
-	 *
 	 * @return void
 	 */
 	public function testAverage() {
@@ -136,27 +134,6 @@ class NumberTest extends TestCase {
 	/**
 	 * @return void
 	 */
-	public function testToPercentage() {
-		$is = Number::toPercentage(22.11, 2, ['decimals' => '.']);
-		$expected = '22,11%';
-		$this->assertSame($expected, $is);
-
-		$is = Number::toPercentage(22.11, 2, ['locale' => 'en']);
-		$expected = '22.11%';
-		$this->assertSame($expected, $is);
-
-		$is = Number::toPercentage(22.11, 0, ['decimals' => '.']);
-		$expected = '22%';
-		$this->assertSame($expected, $is);
-
-		$is = Number::toPercentage(0.2311, 0, ['multiply' => true, 'decimals' => '.']);
-		$expected = '23%';
-		$this->assertSame($expected, $is);
-	}
-
-	/**
-	 * @return void
-	 */
 	public function testRoundTo() {
 		//increment = 10
 		$values = [

tests/TestCase/View/Helper/MeterHelperTest.php

@@ -6,6 +6,7 @@ use Cake\View\View;
 use InvalidArgumentException;
 use Tools\TestSuite\TestCase;
 use Tools\TestSuite\ToolsTestTrait;
+use Tools\Utility\Number;
 use Tools\View\Helper\MeterHelper;
 
 class MeterHelperTest extends TestCase {
@@ -23,11 +24,20 @@ class MeterHelperTest extends TestCase {
 	protected $meterHelper;
 
 	/**
+	 * @var string
+	 */
+	protected $locale;
+
+	/**
 	 * @return void
 	 */
 	public function setUp() {
 		parent::setUp();
 
+		$this->locale = ini_get('intl.default_locale');
+		ini_set('intl.default_locale', 'en-US');
+		Number::config('en_EN');
+
 		$this->View = new View(null);
 		$this->meterHelper = new MeterHelper($this->View);
 	}
@@ -35,6 +45,15 @@ class MeterHelperTest extends TestCase {
 	/**
 	 * @return void
 	 */
+	public function tearDown() {
+		parent::tearDown();
+
+		ini_set('intl.default_locale', $this->locale);
+	}
+
+	/**
+	 * @return void
+	 */
 	public function testPrepareValue() {
 		$value = 11.1;
 		$max = 13.0;

tests/TestCase/View/Helper/NumberHelperTest.php

@@ -8,26 +8,47 @@ use Tools\TestSuite\TestCase;
 use Tools\Utility\Number;
 use Tools\View\Helper\NumberHelper;
 
-/**
- * Number Test Case
- */
 class NumberHelperTest extends TestCase {
 
 	/**
+	 * @var \Tools\View\Helper\NumberHelper
+	 */
+	protected $Number;
+
+	/**
+	 * @var string
+	 */
+	protected $locale;
+
+	/**
 	 * @return void
 	 */
 	public function setUp() {
 		parent::setUp();
 
+		$this->locale = ini_get('intl.default_locale');
+		ini_set('intl.default_locale', 'de-DE');
+
 		Configure::write('Localization', [
 			'decimals' => ',',
 			'thousands' => '.'
 		]);
-		Number::config('en_EN');
+		Number::config('de_DE');
 		$this->Number = new NumberHelper(new View(null));
 	}
 
 	/**
+	 * @return void
+	 */
+	public function tearDown() {
+		parent::tearDown();
+
+		ini_set('intl.default_locale', $this->locale);
+
+		unset($this->Number);
+	}
+
+	/**
 	 * Test calling Utility.Number class
 	 *
 	 * @return void
@@ -45,47 +66,47 @@ class NumberHelperTest extends TestCase {
 	public function testFormat() {
 		$is = $this->Number->format('22');
 		$expected = '22';
-		$this->assertEquals($expected, $is);
+		$this->assertSame($expected, $is);
 
 		$is = $this->Number->format('22.01');
 		$expected = '22,01';
-		$this->assertEquals($expected, $is);
+		$this->assertSame($expected, $is);
 
 		$is = $this->Number->format('22', ['places' => 2]);
 		$expected = '22,00';
-		$this->assertEquals($expected, $is);
+		$this->assertSame($expected, $is);
 
 		$is = $this->Number->format('22.30', ['places' => 1]);
 		$expected = '22,3';
-		$this->assertEquals($expected, $is);
+		$this->assertSame($expected, $is);
 
 		$is = $this->Number->format('22.30', ['precision' => -1]);
-		$expected = '22';
-		$this->assertEquals($expected, $is);
+		$expected = '22'; // Why 22,3 locally?
+		$this->assertSame($expected, $is);
 
 		$is = $this->Number->format('22.30', ['places' => 3]);
 		$expected = '22,300';
-		$this->assertEquals($expected, $is);
+		$this->assertSame($expected, $is);
 
 		$is = $this->Number->format('abc', ['places' => 2]);
 		$expected = '0,00';
-		$this->assertEquals($expected, $is);
+		$this->assertSame($expected, $is);
 
 		$is = $this->Number->format('22.3', ['places' => 2, 'before' => 'EUR ']);
 		$expected = 'EUR 22,30';
-		$this->assertEquals($expected, $is);
+		$this->assertSame($expected, $is);
 
 		$is = $this->Number->format('22.3', ['places' => 2, 'after' => ' EUR']);
 		$expected = '22,30 EUR';
-		$this->assertEquals($expected, $is);
+		$this->assertSame($expected, $is);
 
 		$is = $this->Number->format('22.3', ['places' => 2, 'after' => 'x', 'before' => 'v']);
 		$expected = 'v22,30x';
-		$this->assertEquals($expected, $is);
+		$this->assertSame($expected, $is);
 
 		$is = $this->Number->format('22.3', ['places' => 2, 'locale' => 'en-US']);
 		$expected = '22.30';
-		$this->assertEquals($expected, $is);
+		$this->assertSame($expected, $is);
 	}
 
 	/**
@@ -95,10 +116,10 @@ class NumberHelperTest extends TestCase {
 	 */
 	public function testCurrency() {
 		$is = Number::defaultCurrency();
-		$this->assertEquals('EUR', $is);
+		$this->assertSame('EUR', $is);
 
 		$is = $this->Number->currency(22.2);
-		$this->assertEquals('22,20 €', $is);
+		$this->assertSame('22,20 €', $is);
 	}
 
 	/**
@@ -108,22 +129,13 @@ class NumberHelperTest extends TestCase {
 	 */
 	public function testToReadableSize() {
 		$is = $this->Number->toReadableSize(1206);
-		$this->assertEquals('1,18 KB', $is);
+		$this->assertSame('1,18 KB', $is);
 
 		$is = $this->Number->toReadableSize(1024 * 1024 * 1024);
-		$this->assertEquals('1 GB', $is);
+		$this->assertSame('1 GB', $is);
 
 		$is = $this->Number->toReadableSize(1024 * 1024 * 1024 * 1024 * 2.5);
-		$this->assertEquals('2,5 TB', $is);
-	}
-
-	/**
-	 * @return void
-	 */
-	public function tearDown() {
-		parent::tearDown();
-
-		unset($this->Number);
+		$this->assertSame('2,5 TB', $is);
 	}
 
 }

tests/TestCase/View/Helper/ProgressHelperTest.php

@@ -4,6 +4,7 @@ namespace Tools\Test\TestCase\View\Helper;
 
 use Cake\View\View;
 use Tools\TestSuite\TestCase;
+use Tools\Utility\Number;
 use Tools\View\Helper\ProgressHelper;
 
 class ProgressHelperTest extends TestCase {
@@ -19,11 +20,20 @@ class ProgressHelperTest extends TestCase {
 	protected $progressHelper;
 
 	/**
+	 * @var string
+	 */
+	protected $locale;
+
+	/**
 	 * @return void
 	 */
 	public function setUp() {
 		parent::setUp();
 
+		$this->locale = ini_get('intl.default_locale');
+		ini_set('intl.default_locale', 'en-US');
+		Number::config('en_EN');
+
 		$this->View = new View(null);
 		$this->progressHelper = new ProgressHelper($this->View);
 	}
@@ -31,6 +41,15 @@ class ProgressHelperTest extends TestCase {
 	/**
 	 * @return void
 	 */
+	public function tearDown() {
+		parent::tearDown();
+
+		//ini_set('intl.default_locale', $this->locale);
+	}
+
+	/**
+	 * @return void
+	 */
 	public function testDraw() {
 		$result = $this->progressHelper->draw(0.00, 3);
 		$this->assertSame('░░░', $result);

tests/TestCase/View/Helper/TextHelperTest.php

@@ -10,7 +10,7 @@ use Tools\View\Helper\TextHelper;
 class TextHelperTest extends TestCase {
 
 	/**
-	 * @var \Tools\View\Helper\TextHelper|\Tools\Utility\Text
+	 * @var \Tools\View\Helper\TextHelper
 	 */
 	public $Text;
 

tests/TestCase/View/Helper/TimeHelperTest.php

@@ -13,6 +13,11 @@ use Tools\View\Helper\TimeHelper;
 class TimeHelperTest extends TestCase {
 
 	/**
+	 * @var \Tools\View\Helper\TimeHelper
+	 */
+	protected $Time;
+
+	/**
 	 * @return void
 	 */
 	public function setUp() {

tests/TestCase/View/Helper/TimelineHelperTest.php

@@ -13,7 +13,7 @@ use Tools\TestSuite\TestCase;
 class TimelineHelperTest extends TestCase {
 
 	/**
-	 * @var \Tools\View\Helper\TimelineHelper|\App\View\Helper\TimelineHelper
+	 * @var \App\View\Helper\TimelineHelper
 	 */
 	public $Timeline;