Merge pull request #2 from peter279k/test_enhancement

Test enhancement

Author: DivineOmega

.travis.yml

@@ -3,9 +3,14 @@ dist: trusty
 php:
   - '7.0'
   - '7.1'
+  - '7.2'
+  - nightly
+matrix:
+  allow_failures:
+    - php: nightly
 install:
-  - composer update
+  - composer install
 script:
  - ./vendor/bin/phpunit --coverage-clover ./tests/Logs/clover.xml
 after_script:
-- php vendor/bin/php-coveralls -v
+- php vendor/bin/php-coveralls -v

composer.json

@@ -10,7 +10,7 @@
         "doctrine/inflector": "^1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^6.5",
         "satooshi/php-coveralls": "^2.0"
     },
     "license": "LGPL-3.0-only",

tests/Unit/WordTest.php

@@ -123,48 +123,48 @@ public function testPortmanteaus2()
         $this->assertEquals($expected, $portmanteaus);
     }
 
-    private function getSingularToPluralData()
+    public function pluraliseProvider()
     {
         return [
-            'cat'         => 'cats',
-            'mitten'      => 'mittens',
-            'sausage'     => 'sausages',
-            'child'       => 'children',
-            'goose'       => 'geese',
-            'person'      => 'people',
-            'woman'       => 'women',
-            'man'         => 'men',
-            'audio'       => 'audio',
-            'education'   => 'education',
-            'rice'        => 'rice',
-            'love'        => 'love',
-            'pokemon'     => 'pokemon',
-            'sheep'       => 'sheep',
-            'sex'         => 'sexes',
-            'mouse'       => 'mice',
-            'mathematics' => 'mathematics',
-            'information' => 'information',
-            'tooth'       => 'teeth',
+            ['cat', 'cats'],
+            ['mitten', 'mittens'],
+            ['sausage', 'sausages'],
+            ['child', 'children'],
+            ['goose', 'geese'],
+            ['person', 'people'],
+            ['woman', 'women'],
+            ['man', 'men'],
+            ['audio', 'audio'],
+            ['education', 'education'],
+            ['rice', 'rice'],
+            ['love', 'love'],
+            ['pokemon', 'pokemon'],
+            ['sheep', 'sheep'],
+            ['sex', 'sexes'],
+            ['mouse', 'mice'],
+            ['mathematics', 'mathematics'],
+            ['information', 'information'],
+            ['tooth', 'teeth'],
         ];
     }
 
-    public function testPluralise()
+    /**
+     * @dataProvider pluraliseProvider
+     */
+    public function testPluralise($singular, $plural)
     {
-        $data = $this->getSingularToPluralData();
+        $word = new Word($singular);
 
-        foreach ($data as $singular => $plural) {
-            $word = new Word($singular);
-            $this->assertEquals($plural, $word->plural());
-        }
+        $this->assertEquals($plural, $word->plural());
     }
 
-    public function testSingularise()
+    /**
+     * @dataProvider pluraliseProvider
+     */
+    public function testSingularise($singular, $plural)
     {
-        $data = $this->getSingularToPluralData();
+        $word = new Word($plural);
 
-        foreach ($data as $singular => $plural) {
-            $word = new Word($plural);
-            $this->assertEquals($singular, $word->singular());
-        }
+        $this->assertEquals($singular, $word->singular());
     }
 }