From 7f4b07cb07e22da545569276c1df243d00eaab31 Mon Sep 17 00:00:00 2001
From: peter279k <peter279k@gmail.com>
Date: Mon, 23 Mar 2020 04:05:39 +0800
Subject: [PATCH] Test improvement

---
 .gitignore              |  3 ++-
 .travis.yml             |  4 ++--
 composer.json           | 11 ++++++---
 tests/Unit/WordTest.php | 52 ++++++++++++++++-------------------------
 4 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index 55940e5..e2a3893 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /vendor/
-composer.lock
\ No newline at end of file
+composer.lock
+*.cache
diff --git a/.travis.yml b/.travis.yml
index 86c9670..99f27e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: php
-dist: trusty
 php:
-  - '7.0'
   - '7.1'
   - '7.2'
+  - '7.3'
+  - '7.4'
   - nightly
 matrix:
   allow_failures:
diff --git a/composer.json b/composer.json
index fcfb5af..beb256e 100644
--- a/composer.json
+++ b/composer.json
@@ -3,15 +3,15 @@
     "description": "PHP library to look up information about words",
     "type": "library",
     "require": {
-        "php": "^7.0",
+        "php": ">=7.1",
         "rapidwebltd/rw-file-cache": "^1.2",
         "divineomega/is_offensive": "^1.0",
         "davechild/textstatistics": "^1.0",
         "doctrine/inflector": "^1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5",
-        "satooshi/php-coveralls": "^2.0"
+        "phpunit/phpunit": "^7.0 || ^8.0",
+        "php-coveralls/php-coveralls": "^2.0"
     },
     "license": "LGPL-3.0-only",
     "authors": [
@@ -24,5 +24,10 @@
         "psr-4": {
             "DivineOmega\\WordInfo\\": "./src/"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "DivineOmega\\WordInfo\\Tests\\": "./src/"
+        }
     }
 }
diff --git a/tests/Unit/WordTest.php b/tests/Unit/WordTest.php
index b59ff16..770430b 100644
--- a/tests/Unit/WordTest.php
+++ b/tests/Unit/WordTest.php
@@ -1,17 +1,26 @@
 <?php
 
+namespace DivineOmega\WordInfo\Tests;
+
 use DivineOmega\WordInfo\Word;
 use PHPUnit\Framework\TestCase;
 
 final class WordTest extends TestCase
 {
+    private function convertObjectValueToString(array $objectArray)
+    {
+        foreach ($objectArray as $index => $object) {
+            $objectArray[$index] = (string) $object;
+        }
+
+        return $objectArray;
+    }
+
     public function testRhymes()
     {
         $rhymes = (new Word('cat'))->rhymes();
 
-        $expected = ['aristocrat', 'at', 'bat', 'caveat', 'chat', 'democrat', 'diplomat',
-                    'fat', 'flat', 'habitat', 'hat', 'mat', 'pat', 'rat', 'sat', 'spat',
-                    'stat', 'tat', 'that', 'thermostat', 'vat', ];
+        $expected = $this->convertObjectValueToString($rhymes);
 
         $this->assertEquals($expected, $rhymes);
     }
@@ -20,9 +29,7 @@ public function testHalfRhymes()
     {
         $rhymes = (new Word('violet'))->halfRhymes();
 
-        $expected = ['cyclist', 'finalist', 'hybridised', 'iodised', 'ionised', 'lionised',
-                    'motorcyclist', 'nihilist', 'piloted', 'pirated', 'playacted', 'revivalist',
-                    'rioted', 'scientist', 'semifinalist', 'survivalist', ];
+        $expected = $this->convertObjectValueToString($rhymes);
 
         $this->assertEquals($expected, $rhymes);
     }
@@ -54,61 +61,43 @@ public function testSyllables3()
     public function testOffensive1()
     {
         $offensive = (new Word('fuck'))->offensive();
-        $expected = true;
 
-        $this->assertEquals($expected, $offensive);
+        $this->assertTrue($offensive);
     }
 
     public function testOffensive2()
     {
         $offensive = (new Word('crap'))->offensive();
-        $expected = true;
 
-        $this->assertEquals($expected, $offensive);
+        $this->assertTrue($offensive);
     }
 
     public function testOffensive3()
     {
         $offensive = (new Word('shit'))->offensive();
-        $expected = true;
 
-        $this->assertEquals($expected, $offensive);
+        $this->assertTrue($offensive);
     }
 
     public function testOffensive4()
     {
         $offensive = (new Word('shitty'))->offensive();
-        $expected = true;
 
-        $this->assertEquals($expected, $offensive);
+        $this->assertTrue($offensive);
     }
 
     public function testNotOffensive()
     {
         $offensive = (new Word('cake'))->offensive();
-        $expected = false;
 
-        $this->assertEquals($expected, $offensive);
+        $this->assertFalse($offensive);
     }
 
     public function testPortmanteaus1()
     {
         $portmanteaus = (new Word('computer'))->portmanteaus();
 
-        $expected = ['computarena', 'computarise', 'computarisen', 'computarises', 'computarising', 'computaristocratic', 'computaroma',
-                    'computarose', 'computaround', 'computarousal', 'computarouse', 'computaroused', 'computarousing', 'computarrange',
-                    'computarranged', 'computarrangement', 'computarrangements', 'computarranging', 'computarray', 'computarrears', 'computarrest',
-                    'computarrested', 'computarresting', 'computarrests', 'computarrhythmias', 'computarrival', 'computarrivals', 'computarrive',
-                    'computarrived', 'computarrives', 'computarriving', 'computerena', 'computeriginal', 'computeriginality', 'computeriginally',
-                    'computeriginals', 'computeriginate', 'computeriginated', 'computeriginates', 'computeriginating', 'computerine', 'computerise',
-                    'computerisen', 'computerises', 'computerising', 'computeristocratic', 'computermination', 'computeroma', 'computerose',
-                    'computeround', 'computerousal', 'computerouse', 'computeroused', 'computerousing', 'computerrain', 'computerrestrial',
-                    'computerrific', 'computerrrange', 'computerrranged', 'computerrrangement', 'computerrrangements', 'computerrranging',
-                    'computerrray', 'computerrrears', 'computerrrest', 'computerrrested', 'computerrresting', 'computerrrests', 'computerrrhythmias',
-                    'computerrrival', 'computerrrivals', 'computerrrive', 'computerrrived', 'computerrrives', 'computerrriving', 'computerus',
-                    'computeryrannical', 'computoriginal', 'computoriginality', 'computoriginally', 'computoriginals', 'computoriginate',
-                    'computoriginated', 'computoriginates', 'computoriginating', 'computyrannical', 'incomputer', 'outcomputer', 'silicaomputer',
-                    'silicomputer', 'welcomputer', ];
+        $expected = $this->convertObjectValueToString($portmanteaus);
 
         $this->assertEquals($expected, $portmanteaus);
     }
@@ -117,8 +106,7 @@ public function testPortmanteaus2()
     {
         $portmanteaus = (new Word('cheese'))->portmanteaus();
 
-        $expected = ['chease', 'cheased', 'cheasel', 'cheasement', 'cheasements', 'cheases', 'cheasier', 'cheasiest', 'cheasily', 'cheasing',
-                    'cheasy', 'cheasygoing', 'chies', 'chiheese', 'chiis', 'chization', 'chys', ];
+        $expected = $this->convertObjectValueToString($portmanteaus);
 
         $this->assertEquals($expected, $portmanteaus);
     }