Refactor tests (#296)

Refactor tests and solve a few uncovered problems * Refactor tests for calculators * Refactor tests for currencies * Applied fixes from StyleCI * Refactor exception tests * division precision for gmp * Refactor exchange tests * Refactor formatter tests * Refactor parser tests * Applied fixes from StyleCI * Refactor converter tests * Refactor currency pair tests * Refactor money tests * Refactor currency tests * Refactor number tests * Tweak phpspec configuration Changelogs summary: - coduo/phpspec-data-provider-extension removed (installed version was 1.0.3) * Applied fixes from StyleCI
moneyphp · Oct 19, 2016 · c8bb277 · c8bb277
1 parent 2707d45
commit c8bb277
Show file tree

Hide file tree

Showing 68 changed files with 1,324 additions and 715 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,8 +1,11 @@
-tests/           export-ignore
-.editorconfig    export-ignore
-.gitattributes   export-ignore
-.gitignore       export-ignore
-.php_cs          export-ignore
-.styleci.yml     export-ignore
-.travis.yml      export-ignore
-phpunit.xml.dist export-ignore
+/spec/            export-ignore
+/tests/           export-ignore
+/.editorconfig    export-ignore
+/.gitattributes   export-ignore
+/.gitignore       export-ignore
+/.php_cs          export-ignore
+/.styleci.yml     export-ignore
+/.travis.yml      export-ignore
+/phpspec.ci.yml   export-ignore
+/phpspec.yml.dist export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,13 +3,16 @@
 
 ## Unreleased
 
+### Added
+
+- DecimalMoneyFormatter: returns locale-independent raw decimal string
+
 ### Changed
 
 - **[BC break]** Replaced StringToUnitsParser with DecimalMoneyParser
+- **[BC break]** Moved `Money\Exception\Exception` to `Money\Exception`
+- **[BC break]** UnkownCurrencyException is now DomainException instead of RuntimeException
 
-### Added
-
-- DecimalMoneyFormatter: returns locale-independent raw decimal string
 
 ## 3.0.0-beta.3 - 2016-10-04
 

diff --git a/composer.json b/composer.json
@@ -32,7 +32,6 @@
         "cache/taggable-cache": "^0.4.0",
         "phpspec/phpspec": "^2.5",
         "henrikbjorn/phpspec-code-coverage": "^2.0.2",
-        "coduo/phpspec-data-provider-extension": "^1.0.3",
         "moneyphp/iso-currencies": "dev-master",
         "sllh/php-cs-fixer-styleci-bridge": "^2.1"
     },
@@ -56,7 +55,7 @@
     },
     "scripts": {
         "test": "vendor/bin/phpspec run && vendor/bin/phpunit",
-        "test-ci": "vendor/bin/phpspec run -c phpspec.yml.ci && vendor/bin/phpunit --coverage-text",
+        "test-ci": "vendor/bin/phpspec run -c phpspec.ci.yml && vendor/bin/phpunit --coverage-text",
         "update-currencies": "cp vendor/moneyphp/iso-currencies/resources/current.php resources/currency.php"
     },
     "extra": {

diff --git a/phpspec.yml.ci → phpspec.ci.yml b/phpspec.yml.ci → phpspec.ci.yml
@@ -4,7 +4,6 @@ suites:
         psr4_prefix: Money
 formatter.name: pretty
 extensions:
-    - Coduo\PhpSpec\DataProvider\DataProviderExtension
     - PhpSpec\Extension\CodeCoverageExtension
 code_coverage:
     format: clover

diff --git a/phpspec.yml.dist b/phpspec.yml.dist
@@ -3,5 +3,3 @@ suites:
         namespace: Money
         psr4_prefix: Money
 formatter.name: pretty
-extensions:
-    - Coduo\PhpSpec\DataProvider\DataProviderExtension
diff --git a/spec/Calculator/BcMathCalculatorSpec.php b/spec/Calculator/BcMathCalculatorSpec.php
@@ -2,6 +2,7 @@
 
 namespace spec\Money\Calculator;
 
+use Money\Calculator\BcMathCalculator;
 use PhpSpec\ObjectBehavior;
 
 class BcMathCalculatorSpec extends ObjectBehavior
@@ -10,6 +11,6 @@ class BcMathCalculatorSpec extends ObjectBehavior
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('Money\Calculator\BcMathCalculator');
+        $this->shouldHaveType(BcMathCalculator::class);
     }
 }
diff --git a/spec/Calculator/CalculatorBehavior.php b/spec/Calculator/CalculatorBehavior.php
@@ -3,7 +3,6 @@
 namespace spec\Money\Calculator;
 
 use Money\Calculator;
-use spec\Money\RoundExamples;
 
 /**
  * Mocking with typehints usage won't work here as the trait is autoloaded.
@@ -12,8 +11,6 @@
  */
 trait CalculatorBehavior
 {
-    use RoundExamples;
-
     function it_is_a_calculator()
     {
         $this->shouldImplement(Calculator::class);
@@ -26,67 +23,61 @@ function it_compares_two_values()
         $this->compare(1, 1)->shouldReturn(0);
     }
 
-    function it_adds_a_value()
+    function it_adds_two_values()
     {
-        $this->add(1, 1)->shouldReturn('2');
+        $this->add(rand(-100, 100), rand(-100, 100))->shouldBeString();
     }
 
-    function it_subtracts_a_value()
+    function it_subtracts_a_value_from_another()
     {
-        $this->subtract(2, 1)->shouldReturn('1');
+        $this->subtract(rand(-100, 100), rand(-100, 100))->shouldBeString();
     }
 
-    // TODO Examine comparison
-    function it_multiplies_a_value()
+    function it_multiplies_a_value_by_another()
     {
-        $this->multiply(1, 1.5)->shouldReturn('1.5');
-        $this->multiply(10, 1.2500)->shouldBeLike('12.50');
-        $this->multiply(100, 0.29)->shouldBeLike('29');
-        $this->multiply(100, 0.029)->shouldBeLike('2.9');
-        $this->multiply(100, 0.0029)->shouldBeLike('0.29');
-        $this->multiply(1000, 0.29)->shouldBeLike('290');
-        $this->multiply(1000, 0.029)->shouldBeLike('29');
-        $this->multiply(1000, 0.0029)->shouldBeLike('2.9');
-        $this->multiply(2000, 0.0029)->shouldBeLike('5.8');
+        $this->multiply(rand(-100, 100), rand(-100, 100))->shouldBeString();
     }
 
-    // TODO Examine comparison
-    function it_divides_a_value()
+    function it_divides_a_value_by_another()
     {
-        $this->divide(3, 2)->shouldBeLike('1.5');
-        $this->divide(10, 4)->shouldBeLike('2.5');
+        $this->divide(rand(-100, 100), rand(-100, 100))->shouldBeString();
     }
 
     function it_ceils_a_value()
     {
-        $this->ceil(1.2)->shouldReturn('2');
-        $this->ceil(-1.2)->shouldReturn('-1');
-        $this->ceil('2.00')->shouldReturn('2');
+        $this->ceil(rand(-100, 100) / 100)->shouldBeString();
     }
 
     function it_floors_a_value()
     {
-        $this->floor(2.7)->shouldReturn('2');
-        $this->floor(-2.7)->shouldReturn('-3');
-        $this->floor('2.00')->shouldReturn('2');
+        $this->floor(rand(-100, 100) / 100)->shouldBeString();
     }
 
     function it_calculates_the_absolute_value()
     {
-        $this->absolute(2)->shouldReturn('2');
-        $this->absolute(-2)->shouldReturn('2');
+        $result = $this->absolute(rand(1, 100));
+
+        $result->shouldBeGreaterThanZero();
+        $result->shouldBeString();
+
+
+        $result = $this->absolute(rand(-100, -1));
+
+        $result->shouldBeGreaterThanZero();
+        $result->shouldBeString();
     }
 
-    function testShare()
+    function it_shares_a_value()
     {
-        $this->share(10, 2, 4)->shouldReturn('5');
+        $this->share(10, 2, 4)->shouldBeString();
     }
 
-    /**
-     *  @dataProvider roundExamples
-     */
-    function it_rounds_a_value($input, $mode, $expected)
+    public function getMatchers()
     {
-        $this->round($input, $mode)->shouldReturn($expected);
+        return [
+            'beGreaterThanZero' => function ($subject) {
+                return $subject > 0;
+            },
+        ];
     }
 }
diff --git a/spec/Calculator/GmpCalculatorSpec.php b/spec/Calculator/GmpCalculatorSpec.php
@@ -2,6 +2,7 @@
 
 namespace spec\Money\Calculator;
 
+use Money\Calculator\GmpCalculator;
 use PhpSpec\ObjectBehavior;
 
 class GmpCalculatorSpec extends ObjectBehavior
@@ -10,28 +11,6 @@ class GmpCalculatorSpec extends ObjectBehavior
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('Money\Calculator\GmpCalculator');
-    }
-
-    function it_adds_with_scale_set()
-    {
-        $defaultScale = ini_get('bcmath.scale');
-
-        bcscale(1);
-
-        $this->add(1, 1)->shouldReturn('2');
-
-        bcscale($defaultScale);
-    }
-
-    function it_subtracts_with_scale_set()
-    {
-        $defaultScale = ini_get('bcmath.scale');
-
-        bcscale(1);
-
-        $this->subtract(2, 1)->shouldReturn('1');
-
-        bcscale($defaultScale);
+        $this->shouldHaveType(GmpCalculator::class);
     }
 }
diff --git a/spec/Calculator/PhpCalculatorSpec.php b/spec/Calculator/PhpCalculatorSpec.php
@@ -2,6 +2,7 @@
 
 namespace spec\Money\Calculator;
 
+use Money\Calculator\PhpCalculator;
 use PhpSpec\ObjectBehavior;
 
 class PhpCalculatorSpec extends ObjectBehavior
@@ -10,7 +11,7 @@ class PhpCalculatorSpec extends ObjectBehavior
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('Money\Calculator\PhpCalculator');
+        $this->shouldHaveType(PhpCalculator::class);
     }
 
     function it_throws_an_exception_when_overflown()

diff --git a/spec/ConverterSpec.php b/spec/ConverterSpec.php
@@ -2,14 +2,13 @@
 
 namespace spec\Money;
 
-use Money\Calculator;
+use Money\Converter;
 use Money\Currencies;
 use Money\Currency;
 use Money\CurrencyPair;
 use Money\Exchange;
 use Money\Money;
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 class ConverterSpec extends ObjectBehavior
 {
@@ -18,37 +17,29 @@ function let(Currencies $currencies, Exchange $exchange)
         $this->beConstructedWith($currencies, $exchange);
     }
 
-    /**
-     * @dataProvider convertExamples
-     */
-    function it_converts_to_a_different_currency(
-        $baseCurrencyCode,
-        $counterCurrencyCode,
-        $subunitBase,
-        $subunitCounter,
-        $ratio,
-        $amount,
-        $expectedAmount,
-        Currencies $currencies,
-        Exchange $exchange
-    ) {
-        $baseCurrency = new Currency($baseCurrencyCode);
-        $counterCurrency = new Currency($counterCurrencyCode);
-        $pair = new CurrencyPair($baseCurrency, $counterCurrency, $ratio);
-
-        $currencies->subunitFor($baseCurrency)->willReturn($subunitBase);
-        $currencies->subunitFor($counterCurrency)->willReturn($subunitCounter);
+    function it_is_initializable()
+    {
+        $this->shouldHaveType(Converter::class);
+    }
+
+    function it_converts_to_a_different_currency(Currencies $currencies, Exchange $exchange) {
+        $baseCurrency = new Currency($baseCurrencyCode = 'ABC');
+        $counterCurrency = new Currency($counterCurrencyCode = 'XYZ');
+        $pair = new CurrencyPair($baseCurrency, $counterCurrency, 0.5);
+
+        $currencies->subunitFor($baseCurrency)->willReturn(100);
+        $currencies->subunitFor($counterCurrency)->willReturn(100);
 
         $exchange->quote($baseCurrency, $counterCurrency)->willReturn($pair);
 
         $money = $this->convert(
-            new Money($amount, new Currency($baseCurrencyCode)),
+            new Money(2, new Currency($baseCurrencyCode)),
             $counterCurrency
         );
 
         $money->shouldHaveType(Money::class);
-        $money->getAmount()->shouldBeLike($expectedAmount);
-        $money->getCurrency()->shouldBeLike($counterCurrencyCode);
+        $money->getAmount()->shouldBe('1');
+        $money->getCurrency()->getCode()->shouldBe($counterCurrencyCode);
     }
 
     function it_converts_using_rounding_modes(Currencies $currencies, Exchange $exchange)
@@ -75,14 +66,4 @@ function it_converts_using_rounding_modes(Currencies $currencies, Exchange $exch
         $resultMoney->getAmount()->shouldBeLike(12);
         $resultMoney->getCurrency()->getCode()->shouldReturn('USD');
     }
-
-    public function convertExamples()
-    {
-        return [
-            ['USD', 'JPY', 2, 0, 101, 100, 101],
-            ['JPY', 'USD', 0, 2, 0.0099, 1000, 990],
-            ['USD', 'EUR', 2, 2, 0.89, 100, 89],
-            ['EUR', 'USD', 2, 2, 1.12, 100, 112],
-        ];
-    }
 }