Upgrade to PHPUnit 6.x

phramework · Jun 19, 2017 · 498405b · 498405b
1 parent fb9f939
commit 498405b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 29 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     "phramework/operator": "dev-master"
   },
   "require-dev": {
-    "phpunit/phpunit": "5.*",
+    "phpunit/phpunit": "6.*",
     "squizlabs/php_codesniffer": "*",
     "satooshi/php-coveralls": "dev-master",
     "codacy/coverage": "^1.0",

diff --git a/tests/src/ExpressionParserTest.php b/tests/src/ExpressionParserTest.php
@@ -17,12 +17,14 @@
  */
 namespace Phramework\ExpressionParser;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @license https://www.apache.org/licenses/LICENSE-2.0 Apache-2.0
  * @author Xenofon Spafaridis <nohponex@gmail.com>
  * @coversDefaultClass  Phramework\ExpressionParser\ExpressionParser
  */
-class ExpressionParserTest extends \PHPUnit_Framework_TestCase
+class ExpressionParserTest extends TestCase
 {
     /**
      * @var ExpressionParser
@@ -42,15 +44,6 @@ public function setUp()
     }
 
     /**
-     * @covers ::__construct
-     */
-    public function testConstruct()
-    {
-        new ExpressionParser(Language::getDefault());
-    }
-
-    /**
-     * @covers ::evaluate
      */
     public function testEvaluateLiteral()
     {
@@ -74,7 +67,6 @@ public function testEvaluateLiteral()
     }
 
     /**
-     * @covers ::evaluate
      */
     public function testEvaluate()
     {
@@ -117,7 +109,6 @@ public function testEvaluate()
     }
 
     /**
-     * @covers ::evaluate
      */
     public function testEvaluateQuote()
     {
@@ -135,7 +126,6 @@ public function testEvaluateQuote()
     }
 
     /**
-     * @covers ::evaluate
      */
     public function testEvaluateInput()
     {
@@ -147,7 +137,6 @@ public function testEvaluateInput()
     }
 
     /**
-     * @covers ::evaluate
      */
     public function testCustomLanguage()
     {
@@ -189,7 +178,6 @@ function(bool $l, bool $r) {
     }
 
     /**
-     * @covers ::evaluate
      */
     public function testComplex()
     {

diff --git a/tests/src/LanguageTest.php b/tests/src/LanguageTest.php
@@ -17,19 +17,15 @@
  */
 namespace Phramework\ExpressionParser;
 
-use Phramework\Operator\Operator;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @license https://www.apache.org/licenses/LICENSE-2.0 Apache-2.0
  * @author Xenofon Spafaridis <nohponex@gmail.com>
  * @coversDefaultClass  Phramework\ExpressionParser\Language
  */
-class LanguageTest extends \PHPUnit_Framework_TestCase
+class LanguageTest extends TestCase
 {
-
-    /**
-     * @covers ::__construct
-     */
     public function testConstruct()
     {
         $l = (new Language());
@@ -39,19 +35,17 @@ public function testConstruct()
         );
     }
 
-    /**
-     * @covers ::set
-     */
-    public static function testSet()
+    public function testSet()
     {
         $l = (new Language())
             ->set('max', LanguageUtil::getMethod('max'));
 
+        $this->assertTrue($l->isset('max'));
+
         return $l;
     }
 
     /**
-     * @covers ::isset
      * @depends testSet
      */
     public function testIsset(Language $language)
@@ -66,7 +60,6 @@ public function testIsset(Language $language)
     }
 
     /**
-     * @covers ::get
      * @depends testSet
      */
     public function testGet(Language $language)

diff --git a/tests/src/LanguageUtilTest.php b/tests/src/LanguageUtilTest.php
@@ -17,14 +17,15 @@
  */
 namespace Phramework\ExpressionParser;
 
+use PHPUnit\Framework\TestCase;
 use Phramework\Operator\Operator;
 
 /**
  * @license https://www.apache.org/licenses/LICENSE-2.0 Apache-2.0
  * @author Xenofon Spafaridis <nohponex@gmail.com>
  * @coversDefaultClass  Phramework\ExpressionParser\LanguageUtil
  */
-class LanguageUtilTest extends \PHPUnit_Framework_TestCase
+class LanguageUtilTest extends TestCase
 {
     public function testMax()
     {