Fix tests

Author: snapshotpl

test/RequestIdMiddlewareTest.php

@@ -74,11 +74,12 @@ public function testNotEmmitRequestIdToResponse()
 
     public function testTryToGetRequestIdBeforeRunMiddleware()
     {
-        $this->setExpectedException(MissingRequestId::class);
-
         $requestIdProviderFactory = $this->createMock(RequestIdProviderFactoryInterface::class);
 
         $middleware = new RequestIdMiddleware($requestIdProviderFactory);
+
+        $this->expectException(MissingRequestId::class);
+
         $middleware->getRequestId();
     }
 }

test/RequestIdProviderTest.php

@@ -35,13 +35,13 @@ public function testGenerateIdBecauseNotExistInHeader()
      */
     public function testTryToGenerateEmptyRequestId($emptyValue)
     {
-        $this->setExpectedException(InvalidRequestId::class);
-
         $this->generator->expects($this->once())->method('generateRequestId')->willReturn($emptyValue);
 
         $request = new ServerRequest();
         $provider = new RequestIdProvider($request, $this->generator);
 
+        $this->expectException(InvalidRequestId::class);
+
         $provider->getRequestId();
     }
 
@@ -89,11 +89,13 @@ public function testDoNotGenerateBecouseHeaderExists()
 
     public function testDoNotGenerateBecauseHeaderExistsButEmpty()
     {
-        $this->setExpectedException(MissingRequestId::class);
         $this->generator->expects($this->never())->method('generateRequestId');
         $request = new ServerRequest([], [], 'https://github.com/php-middleware/request-id', 'GET', 'php://input', [RequestIdProvider::DEFAULT_REQUEST_HEADER => '']);
 
         $provider = new RequestIdProvider($request, $this->generator);
+
+        $this->expectException(MissingRequestId::class);
+
         $provider->getRequestId();
     }