Small adjustments

Author: eduard13

app/code/Magento/Csp/Test/Unit/Model/Mode/ConfigManagerTest.php

@@ -20,8 +20,6 @@
 use RuntimeException;
 
 /**
- * Class ConfigManagerTest
- *
  * Test for \Magento\Csp\Model\Mode\ConfigManager
  */
 class ConfigManagerTest extends TestCase
@@ -71,16 +69,16 @@ protected function setUp()
      * Test throwing an exception for non storefront or admin areas
      *
      * @return void
-     *
-     * @expectedExceptionMessage CSP can only be configured for storefront or admin area
-     * @expectedException RuntimeException
      */
     public function testThrownExceptionForCrontabArea()
     {
         $this->stateMock->expects($this->any())
             ->method('getAreaCode')
             ->willReturn(Area::AREA_CRONTAB);
 
+        $this->expectExceptionMessage('CSP can only be configured for storefront or admin area');
+        $this->expectException(RuntimeException::class);
+
         $this->model->getConfigured();
     }
 

app/code/Magento/Csp/Test/Unit/Model/PolicyRendererPoolTest.php

@@ -17,8 +17,6 @@
 use RuntimeException;
 
 /**
- * Class PolicyRendererPoolTest
- *
  * Test for \Magento\Csp\Model\PolicyRendererPool
  */
 class PolicyRendererPoolTest extends TestCase
@@ -66,16 +64,16 @@ protected function setUp()
      * Test throwing an exception for not found policy renders
      *
      * @return void
-     *
-     * @expectedExceptionMessage Failed to find a renderer for policy
-     * @expectedException RuntimeException
      */
     public function testThrownExceptionForNotFoundPolicyRenders()
     {
         $this->policyMock->expects($this->any())
             ->method('getId')
             ->willReturn(static::STUB_POLICY_ID);
 
+        $this->expectExceptionMessage('Failed to find a renderer for policy');
+        $this->expectException(RuntimeException::class);
+
         $this->model->getRenderer($this->policyMock);
     }