Refactor tests

zoonman · Jun 26, 2023 · 1f6ac4f · 1f6ac4f
1 parent 405cda0
commit 1f6ac4f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
  "ext-json": "*"
  },
  "require-dev": {
- "phpunit/phpunit": "^4.8|^5.5|^6.5|^7.0.0|^8.0.0|^9.0.0|^10.0.0"
+ "phpunit/phpunit": "^7.0.0|^8.0.0|^9.0.0|^10.0.0"
  },
  "autoload": {
  "psr-4": {

diff --git a/tests/PixabayClientTest.php → tests/Pixabay/Tests/PixabayClientTest.php b/tests/PixabayClientTest.php → tests/Pixabay/Tests/PixabayClientTest.php
@@ -42,29 +42,33 @@ public function setUp(): void
 
  /**
  * Run tests
- * @expectedException \Exception
-  * @expectedExceptionMessage You must specify "key" parameter in constructor options
-  */
+ *
+ *
+ */
  public function testConstructorOnNoKeyParameter()
  {
+ $this->expectException(\Exception::class);
+ $this->expectExceptionMessage("You must specify \"key\" parameter in constructor options");
  $this->object = new PixabayClient([]);
  }
 
  /**
  * Run tests
- * @expectedException GuzzleHttp\Exception\ClientException
+ *
  */
  public function testGetImages()
  {
- $this->assertInternalType('array', $this->object->getImages(['q' => 'test']));
+ $this->expectException(\GuzzleHttp\Exception\ClientException::class);
+ $this->assertIsArray($this->object->getImages(['q' => 'test']));
  }
 
  /**
  * Run tests
- * @expectedException GuzzleHttp\Exception\ClientException 
+ *
  */
  public function testGetVideos()
  {
- $this->assertInternalType('array', $this->object->getVideos(['q' => 'test']));
+ $this->expectException(\GuzzleHttp\Exception\ClientException::class);
+ $this->assertIsArray($this->object->getVideos(['q' => 'test']));
  }
 }