From 083fbb1dab7b9ed8393e83ed8b548aa1732f71e1 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Sat, 7 Nov 2015 15:29:32 -0500 Subject: [PATCH] Increase coverage in NumberHelper test. --- .../TestCase/View/Helper/NumberHelperTest.php | 67 +++++++++---------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/tests/TestCase/View/Helper/NumberHelperTest.php b/tests/TestCase/View/Helper/NumberHelperTest.php index 3948c583e9d..6903150f6d3 100644 --- a/tests/TestCase/View/Helper/NumberHelperTest.php +++ b/tests/TestCase/View/Helper/NumberHelperTest.php @@ -81,49 +81,46 @@ public function tearDown() } /** - * test CakeNumber class methods are called correctly + * Provider for method proxying. + * + * @return array */ - public function testNumberHelperProxyMethodCalls() + public function methodProvider() { - $methods = [ - 'precision', 'toReadableSize', + return [ + ['precision'], + ['toReadableSize'], + ['toPercentage'], + ['currency'], + ['format'], + ['addFormat'], + ['formatDelta'], + ['defaultCurrency'], + ['ordinal'], ]; - $CakeNumber = $this->getMock(__NAMESPACE__ . '\NumberMock', $methods); - $Number = new NumberHelperTestObject($this->View, ['engine' => __NAMESPACE__ . '\NumberMock']); - $Number->attach($CakeNumber); - - foreach ($methods as $method) { - $CakeNumber->expects($this->at(0))->method($method); - $Number->{$method}('who', 'what', 'when', 'where', 'how'); - } - - $CakeNumber = $this->getMock(__NAMESPACE__ . '\NumberMock', ['toPercentage']); - $Number = new NumberHelperTestObject($this->View, ['engine' => __NAMESPACE__ . '\NumberMock']); - $Number->attach($CakeNumber); - $CakeNumber->expects($this->at(0))->method('toPercentage'); - $Number->toPercentage('who', 'what', ['when']); - - $CakeNumber = $this->getMock(__NAMESPACE__ . '\NumberMock', ['currency']); - $Number = new NumberHelperTestObject($this->View, ['engine' => __NAMESPACE__ . '\NumberMock']); - $Number->attach($CakeNumber); - $CakeNumber->expects($this->at(0))->method('currency'); - $Number->currency('who', 'what', ['when']); - - $CakeNumber = $this->getMock(__NAMESPACE__ . '\NumberMock', ['format']); - $Number = new NumberHelperTestObject($this->View, ['engine' => __NAMESPACE__ . '\NumberMock']); - $Number->attach($CakeNumber); - $CakeNumber->expects($this->at(0))->method('format'); - $Number->format('who', ['when']); + } - $CakeNumber = $this->getMock(__NAMESPACE__ . '\NumberMock', ['addFormat']); - $Number = new NumberHelperTestObject($this->View, ['engine' => __NAMESPACE__ . '\NumberMock']); - $Number->attach($CakeNumber); - $CakeNumber->expects($this->at(0))->method('addFormat'); - $Number->addFormat('who', ['when']); + /** + * test CakeNumber class methods are called correctly + * + * @dataProvider methodProvider + * @return void + */ + public function testNumberHelperProxyMethodCalls($method) + { + $number = $this->getMock(__NAMESPACE__ . '\NumberMock', [$method]); + $helper = new NumberHelperTestObject($this->View, ['engine' => __NAMESPACE__ . '\NumberMock']); + $helper->attach($number); + $number->expects($this->at(0)) + ->method($method) + ->with(12.3); + $helper->{$method}(12.3, ['options']); } /** * test engine override + * + * @return void */ public function testEngineOverride() {