refactor: Replace @ExpectedException annotation for expectException method

Author: DannyvdSluijs

tests/Constraints/FactoryTest.php

@@ -96,19 +96,17 @@ public function invalidConstraintNameProvider()
         );
     }
 
-    /**
-     * @expectedException \JsonSchema\Exception\InvalidArgumentException
-     */
     public function testSetConstraintClassExistsCondition()
     {
+        $this->expectException(\JsonSchema\Exception\InvalidArgumentException::class);
+
         $this->factory->setConstraintClass('string', 'SomeConstraint');
     }
 
-    /**
-     * @expectedException \JsonSchema\Exception\InvalidArgumentException
-     */
     public function testSetConstraintClassImplementsCondition()
     {
+        $this->expectException(\JsonSchema\Exception\InvalidArgumentException::class);
+
         $this->factory->setConstraintClass('string', 'JsonSchema\Tests\Constraints\MyBadConstraint');
     }
 

tests/Uri/Retrievers/FileGetContentsTest.php

@@ -10,12 +10,12 @@
  */
 class FileGetContentsTest extends TestCase
 {
-    /**
-     * @expectedException \JsonSchema\Exception\ResourceNotFoundException
-     */
     public function testFetchMissingFile()
     {
         $res = new FileGetContents();
+
+        $this->expectException(\JsonSchema\Exception\ResourceNotFoundException::class);
+
         $res->retrieve(__DIR__ . '/Fixture/missing.json');
     }
 

tests/Uri/Retrievers/PredefinedArrayTest.php

@@ -29,11 +29,9 @@ public function testRetrieve()
         $this->assertEquals('THE_ADDRESS_SCHEMA', $this->retriever->retrieve('http://acme.com/schemas/address#'));
     }
 
-    /**
-     * @expectedException \JsonSchema\Exception\ResourceNotFoundException
-     */
     public function testRetrieveNonExistsingSchema()
     {
+        $this->expectException(\JsonSchema\Exception\ResourceNotFoundException::class);
         $this->retriever->retrieve('http://acme.com/schemas/plop#');
     }
 

tests/Uri/UriResolverTest.php

@@ -96,18 +96,11 @@ public function testResolveAbsoluteUri()
         );
     }
 
-    /**
-     * @expectedException \JsonSchema\Exception\UriResolverException
-     */
+
     public function testResolveRelativeUriNoBase()
     {
-        $this->assertEquals(
-            'http://example.org/foo/bar.json',
-            $this->resolver->resolve(
-                'bar.json',
-                null
-            )
-        );
+        $this->expectException(\JsonSchema\Exception\UriResolverException::class);
+        $this->resolver->resolve('bar.json', null);
     }
 
     public function testResolveRelativeUriBaseDir()

tests/Uri/UriRetrieverTest.php

@@ -182,9 +182,6 @@ public function testResolvePointerFragment()
         );
     }
 
-    /**
-     * @expectedException \JsonSchema\Exception\ResourceNotFoundException
-     */
     public function testResolvePointerFragmentNotFound()
     {
         $schema = (object) array(
@@ -197,14 +194,13 @@ public function testResolvePointerFragmentNotFound()
         );
 
         $retriever = new UriRetriever();
+
+        $this->expectException(ResourceNotFoundException::class);
         $retriever->resolvePointer(
             $schema, 'http://example.org/schema.json#/definitions/bar'
         );
     }
 
-    /**
-     * @expectedException \JsonSchema\Exception\ResourceNotFoundException
-     */
     public function testResolvePointerFragmentNoArray()
     {
         $schema = (object) array(
@@ -217,17 +213,18 @@ public function testResolvePointerFragmentNoArray()
         );
 
         $retriever = new UriRetriever();
+
+        $this->expectException(ResourceNotFoundException::class);
         $retriever->resolvePointer(
             $schema, 'http://example.org/schema.json#/definitions/foo'
         );
     }
 
-    /**
-     * @expectedException \JsonSchema\Exception\UriResolverException
-     */
     public function testResolveExcessLevelUp()
     {
         $retriever = new UriRetriever();
+
+        $this->expectException(UriResolverException::class);
         $retriever->resolve(
             '../schema.json#', 'http://example.org/schema.json#'
         );
@@ -257,9 +254,6 @@ public function testConfirmMediaTypeAcceptsJsonType()
         $this->assertEquals(null, $retriever->confirmMediaType($uriRetriever, null));
     }
 
-    /**
-     * @expectedException \JsonSchema\Exception\InvalidSchemaMediaTypeException
-     */
     public function testConfirmMediaTypeThrowsExceptionForUnsupportedTypes()
     {
         $uriRetriever = $this->getMock('JsonSchema\Uri\Retrievers\UriRetrieverInterface');
@@ -269,7 +263,9 @@ public function testConfirmMediaTypeThrowsExceptionForUnsupportedTypes()
                 ->method('getContentType')
                 ->willReturn('text/html');
 
-        $this->assertEquals(null, $retriever->confirmMediaType($uriRetriever, null));
+        $this->expectException(InvalidSchemaMediaTypeException::class);
+
+        $retriever->confirmMediaType($uriRetriever, null);
     }
 
     private function mockRetriever($schema)
@@ -343,15 +339,13 @@ public function testInvalidContentTypeEndpointsDefault()
         $this->assertTrue($retriever->confirmMediaType($mock, 'https://json-schema.org/'));
     }
 
-    /**
-     * @expectedException \JsonSchema\Exception\InvalidSchemaMediaTypeException
-     */
     public function testInvalidContentTypeEndpointsUnknown()
     {
         $mock = $this->getMock('JsonSchema\Uri\Retrievers\UriRetrieverInterface');
         $mock->method('getContentType')->willReturn('Application/X-Fake-Type');
         $retriever = new UriRetriever();
 
+        $this->expectException(InvalidSchemaMediaTypeException::class);
         $retriever->confirmMediaType($mock, 'http://example.com');
     }