Various test case corrections and PHPUnit update

DaveChild · Aug 21, 2018 · 286a7df · 286a7df
1 parent ec1894c
commit 286a7df
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/tests/TextStatisticsCMULexTest.php b/tests/TextStatisticsCMULexTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class TextStatisticsTestCMULex extends PHPUnit_Framework_TestCase
+class TextStatisticsTestCMULex extends \PHPUnit\Framework\TestCase
 {
 
     /*

diff --git a/tests/TextStatisticsKiplingIfTest.php b/tests/TextStatisticsKiplingIfTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class TextStatisticsKiplingIf extends PHPUnit_Framework_TestCase
+class TextStatisticsKiplingIf extends \PHPUnit\Framework\TestCase
 {
 
     /*
@@ -456,7 +456,7 @@ public function testColemanLiauIndex()
     -------------------- */
     public function testSMOGIndex()
     {
-        $this->assertEquals(7.2, $this->TextStatistics->smog_index($this->strText));
+        $this->assertEquals(10.3, $this->TextStatistics->smog_index($this->strText));
     }
 
     /* Test Automated Readability Index

diff --git a/tests/TextStatisticsMaths.php b/tests/TextStatisticsMaths.php
@@ -1,6 +1,6 @@
 <?php
 
-class TextStatisticsMaths extends PHPUnit_Framework_TestCase
+class TextStatisticsMaths extends \PHPUnit\Framework\TestCase
 {
 
     /*
@@ -81,12 +81,12 @@ public function testCalc()
         $this->assertSame(3.0, DaveChild\TextStatistics\Maths::bcCalc(10, 'mod', 7, true, 1));
         $this->assertSame(3.0, DaveChild\TextStatistics\Maths::bcCalc(10, 'modulus', 7, true, 1));
         // Modulus can only be an integer and is rounded before calculation
-        $this->assertSame(0.0, DaveChild\TextStatistics\Maths::bcCalc(10, '%', 5.55, true, 1));
-        $this->assertSame(0.0, DaveChild\TextStatistics\Maths::bcCalc(10, 'mod', 5.55, true, 1));
-        $this->assertSame(0.0, DaveChild\TextStatistics\Maths::bcCalc(10, 'modulus', 5.55, true, 1));
-        $this->assertSame(3.0, DaveChild\TextStatistics\Maths::bcCalc(10, '%', 7.55, true, 1));
-        $this->assertSame(3.0, DaveChild\TextStatistics\Maths::bcCalc(10, 'mod', 7.55, true, 1));
-        $this->assertSame(3.0, DaveChild\TextStatistics\Maths::bcCalc(10, 'modulus', 7.55, true, 1));
+        $this->assertSame(4.0, DaveChild\TextStatistics\Maths::bcCalc(10, '%', 5.55, true, 1));
+        $this->assertSame(4.0, DaveChild\TextStatistics\Maths::bcCalc(10, 'mod', 5.55, true, 1));
+        $this->assertSame(4.0, DaveChild\TextStatistics\Maths::bcCalc(10, 'modulus', 5.55, true, 1));
+        $this->assertSame(2.0, DaveChild\TextStatistics\Maths::bcCalc(10, '%', 7.55, true, 1));
+        $this->assertSame(2.0, DaveChild\TextStatistics\Maths::bcCalc(10, 'mod', 7.55, true, 1));
+        $this->assertSame(2.0, DaveChild\TextStatistics\Maths::bcCalc(10, 'modulus', 7.55, true, 1));
 
         $this->assertSame(1, DaveChild\TextStatistics\Maths::bcCalc(10, '=', 5, true, 1));
         $this->assertSame(1, DaveChild\TextStatistics\Maths::bcCalc(10, 'comp', 5, true, 1));
@@ -139,12 +139,12 @@ public function testCalc()
         $this->assertSame(3, DaveChild\TextStatistics\Maths::bcCalc(10, 'mod', 7));
         $this->assertSame(3, DaveChild\TextStatistics\Maths::bcCalc(10, 'modulus', 7));
         // Modulus can only be an integer and is rounded before calculation
-        $this->assertSame(0, DaveChild\TextStatistics\Maths::bcCalc(10, '%', 5.55));
-        $this->assertSame(0, DaveChild\TextStatistics\Maths::bcCalc(10, 'mod', 5.55));
-        $this->assertSame(0, DaveChild\TextStatistics\Maths::bcCalc(10, 'modulus', 5.55));
-        $this->assertSame(3, DaveChild\TextStatistics\Maths::bcCalc(10, '%', 7.55));
-        $this->assertSame(3, DaveChild\TextStatistics\Maths::bcCalc(10, 'mod', 7.55));
-        $this->assertSame(3, DaveChild\TextStatistics\Maths::bcCalc(10, 'modulus', 7.55));
+        $this->assertSame(4, DaveChild\TextStatistics\Maths::bcCalc(10, '%', 5.55));
+        $this->assertSame(4, DaveChild\TextStatistics\Maths::bcCalc(10, 'mod', 5.55));
+        $this->assertSame(4, DaveChild\TextStatistics\Maths::bcCalc(10, 'modulus', 5.55));
+        $this->assertSame(2, DaveChild\TextStatistics\Maths::bcCalc(10, '%', 7.55));
+        $this->assertSame(2, DaveChild\TextStatistics\Maths::bcCalc(10, 'mod', 7.55));
+        $this->assertSame(2, DaveChild\TextStatistics\Maths::bcCalc(10, 'modulus', 7.55));
 
         $this->assertSame(1, DaveChild\TextStatistics\Maths::bcCalc(10, '=', 5));
         $this->assertSame(1, DaveChild\TextStatistics\Maths::bcCalc(10, 'comp', 5));

diff --git a/tests/TextStatisticsMelvilleMobyDickTest.php b/tests/TextStatisticsMelvilleMobyDickTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class TextStatisticsMelvilleMobyDick extends PHPUnit_Framework_TestCase
+class TextStatisticsMelvilleMobyDick extends \PHPUnit\Framework\TestCase
 {
 
     /*
@@ -325,7 +325,7 @@ public function testColemanLiauIndex()
     -------------------- */
     public function testSMOGIndex()
     {
-        $this->assertEquals(9.9, $this->TextStatistics->smog_index($this->strText));
+        $this->assertEquals(13.0, $this->TextStatistics->smog_index($this->strText));
     }
 
     /* Test Automated Readability Index
@@ -334,4 +334,4 @@ public function testAutomatedReadabilityIndex()
     {
         $this->assertEquals(11.8, $this->TextStatistics->automated_readability_index($this->strText));
     }
-    }
+}
diff --git a/tests/TextStatisticsPluralise.php b/tests/TextStatisticsPluralise.php
@@ -1,6 +1,6 @@
 <?php
 
-class TextStatisticsPluralise extends PHPUnit_Framework_TestCase
+class TextStatisticsPluralise extends \PHPUnit\Framework\TestCase
 {
 
     /*

diff --git a/tests/TextStatisticsTest.php b/tests/TextStatisticsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class TextStatisticsTest extends PHPUnit_Framework_TestCase
+class TextStatisticsTest extends \PHPUnit\Framework\TestCase
 {
 
     /*
@@ -300,12 +300,12 @@ public function testColemanLiauIndex()
 
     public function testSMOGIndex()
     {
-        $this->assertEquals(1.8, $this->TextStatistics->smog_index('This. Is. A. Nice. Set. Of. Small. Words. Of. One. Part. Each.')); // Should be 1.8 for any text with no words of 3+ syllables
-        $this->assertEquals(1.8, $this->TextStatistics->smog_index('The quick brown fox jumps over the lazy dog.'));
-        $this->assertEquals(1.8, $this->TextStatistics->smog_index('The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.'));
-        $this->assertEquals(1.8, $this->TextStatistics->smog_index("The quick brown fox jumps over the lazy dog. \n\n The quick brown fox jumps over the lazy dog."));
-        $this->assertEquals(1.8, $this->TextStatistics->smog_index('The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog'));
-        $this->assertEquals(10.1, $this->TextStatistics->smog_index('Now it is time for a more complicated sentence, including several longer words.'));
+        $this->assertEquals(3.3, $this->TextStatistics->smog_index('This. Is. A. Nice. Set. Of. Small. Words. Of. One. Part. Each.')); // Should be 1.8 for any text with no words of 3+ syllables
+        $this->assertEquals(3.3, $this->TextStatistics->smog_index('The quick brown fox jumps over the lazy dog.'));
+        $this->assertEquals(3.3, $this->TextStatistics->smog_index('The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.'));
+        $this->assertEquals(3.3, $this->TextStatistics->smog_index("The quick brown fox jumps over the lazy dog. \n\n The quick brown fox jumps over the lazy dog."));
+        $this->assertEquals(3.3, $this->TextStatistics->smog_index('The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog'));
+        $this->assertEquals(13.2, $this->TextStatistics->smog_index('Now it is time for a more complicated sentence, including several longer words.'));
     }
 
     public function testAutomatedReadabilityIndex()