From aa14d775169ae8c3ec475e4319dfffdcf6956be7 Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Sun, 7 Jan 2018 23:55:53 -0200
Subject: [PATCH] Refactoring tests (#3291)

---
 tests/unit/backend/traits/WidgetMakerTest.php   |  2 +-
 tests/unit/cms/classes/RouterTest.php           | 10 +++++-----
 tests/unit/cms/classes/ThemeTest.php            |  2 +-
 tests/unit/system/classes/MarkupManagerTest.php | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/unit/backend/traits/WidgetMakerTest.php b/tests/unit/backend/traits/WidgetMakerTest.php
index a94cc773c..657384221 100644
--- a/tests/unit/backend/traits/WidgetMakerTest.php
+++ b/tests/unit/backend/traits/WidgetMakerTest.php
@@ -41,7 +41,7 @@ class WidgetMakerTest extends TestCase
         $maker = $this->traitObject;
 
         $widget = $maker->makeWidget('Backend\Widgets\Search');
-        $this->assertTrue($widget instanceof \Backend\Widgets\Search);
+        $this->assertInstanceOf('Backend\Widgets\Search', $widget);
     }
 
     public function testMakeWidget()
diff --git a/tests/unit/cms/classes/RouterTest.php b/tests/unit/cms/classes/RouterTest.php
index b0cbf4b52..eddc51a62 100644
--- a/tests/unit/cms/classes/RouterTest.php
+++ b/tests/unit/cms/classes/RouterTest.php
@@ -103,7 +103,7 @@ class RouterTest extends TestCase
         $parameters = $router->getParameters();
         $this->assertNotEmpty($page);
         $this->assertEquals('blog-post.htm', $page->getFileName());
-        $this->assertEquals(1, count($parameters));
+        $this->assertCount(1, $parameters);
         $this->assertArrayHasKey('url_title', $parameters);
         $this->assertEquals('my-post-title', $parameters['url_title']);
 
@@ -112,7 +112,7 @@ class RouterTest extends TestCase
         $parameters = $router->getParameters();
         $this->assertNotEmpty($page);
         $this->assertEquals('blog-post.htm', $page->getFileName());
-        $this->assertEquals(1, count($parameters));
+        $this->assertCount(1, $parameters);
         $this->assertArrayHasKey('url_title', $parameters);
         $this->assertEquals('my-post-title', $parameters['url_title']);
 
@@ -120,7 +120,7 @@ class RouterTest extends TestCase
         $parameters = $router->getParameters();
         $this->assertNotEmpty($page);
         $this->assertEquals('authors.htm', $page->getFileName());
-        $this->assertEquals(1, count($parameters));
+        $this->assertCount(1, $parameters);
         $this->assertArrayHasKey('author_id', $parameters);
         $this->assertEquals('no-author', $parameters['author_id']);
 
@@ -134,7 +134,7 @@ class RouterTest extends TestCase
         $parameters = $router->getParameters();
         $this->assertNotEmpty($page);
         $this->assertEquals('authors.htm', $page->getFileName());
-        $this->assertEquals(1, count($parameters));
+        $this->assertCount(1, $parameters);
         $this->assertArrayHasKey('author_id', $parameters);
         $this->assertEquals('44', $parameters['author_id']);
 
@@ -142,7 +142,7 @@ class RouterTest extends TestCase
         $parameters = $router->getParameters();
         $this->assertNotEmpty($page);
         $this->assertEquals('blog-archive.htm', $page->getFileName());
-        $this->assertEquals(1, count($parameters));
+        $this->assertCount(1, $parameters);
     }
 
     public function testFindPageFromSubdirectory()
diff --git a/tests/unit/cms/classes/ThemeTest.php b/tests/unit/cms/classes/ThemeTest.php
index 7fc919dc6..e7410bbc3 100644
--- a/tests/unit/cms/classes/ThemeTest.php
+++ b/tests/unit/cms/classes/ThemeTest.php
@@ -46,7 +46,7 @@ class ThemeTest extends TestCase
         $this->assertInternalType('array', $pages);
 
         $expectedPageNum = $this->countThemePages(base_path().'/tests/fixtures/themes/test/pages');
-        $this->assertEquals($expectedPageNum, count($pages));
+        $this->assertCount($expectedPageNum, $pages);
 
         $this->assertInstanceOf('\Cms\Classes\Page', $pages[0]);
         $this->assertNotEmpty($pages[0]->url);
diff --git a/tests/unit/system/classes/MarkupManagerTest.php b/tests/unit/system/classes/MarkupManagerTest.php
index 61f66a2cf..373d9a43a 100644
--- a/tests/unit/system/classes/MarkupManagerTest.php
+++ b/tests/unit/system/classes/MarkupManagerTest.php
@@ -84,8 +84,8 @@ class MarkupManagerTest extends TestCase
         $this->assertTrue($result);
 
         $result = self::callProtectedMethod($manager, 'isWildCallable', [$callable, 'bar']);
-        $this->assertTrue(isset($result[0]));
-        $this->assertTrue(isset($result[1]));
+        $this->assertArrayHasKey(0, $result);
+        $this->assertArrayHasKey(1, $result);
         $this->assertEquals('Class', $result[0]);
         $this->assertEquals('foo_bar', $result[1]);
 
@@ -94,8 +94,8 @@ class MarkupManagerTest extends TestCase
         $this->assertTrue($result);
 
         $result = self::callProtectedMethod($manager, 'isWildCallable', [$callable, 'Class']);
-        $this->assertTrue(isset($result[0]));
-        $this->assertTrue(isset($result[1]));
+        $this->assertArrayHasKey(0, $result);
+        $this->assertArrayHasKey(1, $result);
         $this->assertEquals('MyClass', $result[0]);
         $this->assertEquals('method', $result[1]);
 
@@ -104,8 +104,8 @@ class MarkupManagerTest extends TestCase
         $this->assertTrue($result);
 
         $result = self::callProtectedMethod($manager, 'isWildCallable', [$callable, 'Food']);
-        $this->assertTrue(isset($result[0]));
-        $this->assertTrue(isset($result[1]));
+        $this->assertArrayHasKey(0, $result);
+        $this->assertArrayHasKey(1, $result);
         $this->assertEquals('MyFood', $result[0]);
         $this->assertEquals('myFood', $result[1]);
     }