Merge pull request facebookarchive#900 from carusogabriel/refactoring-tests

Refactoring tests

Author: yguedidi

tests/BatchResponseTest.php

@@ -107,7 +107,7 @@ public function testABatchResponseCanBeIteratedOver()
         $this->assertInstanceOf(\IteratorAggregate::class, $batchResponse);
 
         foreach ($batchResponse as $key => $responseEntity) {
-            $this->assertTrue(in_array($key, ['req_one', 'req_two', 'req_three']));
+            $this->assertContains($key, ['req_one', 'req_two', 'req_three']);
             $this->assertInstanceOf(Response::class, $responseEntity);
         }
     }

tests/FacebookTest.php

@@ -220,7 +220,7 @@ public function testCreatingANewBatchRequestWillDefaultToTheProperConfig()
             $fb->getClient()->getBaseGraphUrl()
         );
         $this->assertInstanceOf('Facebook\BatchRequest', $batchRequest);
-        $this->assertEquals(0, count($batchRequest->getRequests()));
+        $this->assertCount(0, $batchRequest->getRequests());
     }
 
     public function testCanInjectCustomHandlers()

tests/GraphNode/CollectionTest.php

@@ -108,9 +108,7 @@ public function testACollectionCanBeCounted()
     {
         $collection = new Collection(['foo', 'bar', 'baz']);
 
-        $collectionCount = count($collection);
-
-        $this->assertEquals(3, $collectionCount);
+        $this->assertCount(3, $collection);
     }
 
     public function testACollectionCanBeAccessedAsAnArray()

tests/GraphNode/GraphAchievementTest.php

@@ -66,7 +66,7 @@ public function testNoFeedStoryIsBoolean()
 
         $isNoFeedStory = $graphNode->isNoFeedStory();
 
-        $this->assertTrue(is_bool($isNoFeedStory));
+        $this->assertInternalType('bool', $isNoFeedStory);
     }
 
     public function testDatesGetCastToDateTime()

tests/RequestTest.php

@@ -182,7 +182,7 @@ public function testAFileCanBeAddedToParams()
 
         $this->assertTrue($request->containsFileUploads());
         $this->assertFalse($request->containsVideoUploads());
-        $this->assertFalse(isset($actualParams['source']));
+        $this->assertArrayNotHasKey('source', $actualParams);
         $this->assertEquals('Foo Bar', $actualParams['name']);
     }
 
@@ -200,7 +200,7 @@ public function testAVideoCanBeAddedToParams()
 
         $this->assertTrue($request->containsFileUploads());
         $this->assertTrue($request->containsVideoUploads());
-        $this->assertFalse(isset($actualParams['source']));
+        $this->assertArrayNotHasKey('source', $actualParams);
         $this->assertEquals('Foo Bar', $actualParams['name']);
     }
 }