Refactoring tests

joelbutcher · Dec 6, 2017 · 7da6778 · 7da6778
1 parent 8875d3c
commit 7da6778
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/tests/BatchResponseTest.php b/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);
  }
  }

diff --git a/tests/FacebookTest.php b/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()

diff --git a/tests/GraphNode/CollectionTest.php b/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()

diff --git a/tests/GraphNode/GraphAchievementTest.php b/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()

diff --git a/tests/RequestTest.php b/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']);
  }
 }