Skip to content

Commit 0a917f9

Browse files
committed
Clean up impossible test conditions from the RequestFetcherTest class
1 parent cde3e91 commit 0a917f9

File tree

1 file changed

+18
-23
lines changed

1 file changed

+18
-23
lines changed

tests/Integration/RequestFetcherTest.php

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace Sentry\SentryBundle\Tests\Integration;
66

7-
use GuzzleHttp\Psr7\ServerRequest;
87
use PHPUnit\Framework\MockObject\MockObject;
98
use PHPUnit\Framework\TestCase;
109
use Psr\Http\Message\ServerRequestInterface;
@@ -37,24 +36,36 @@ protected function setUp(): void
3736
$this->requestFetcher = new RequestFetcher($this->requestStack, $this->httpMessageFactory);
3837
}
3938

40-
/**
41-
* @dataProvider fetchRequestDataProvider
42-
*/
43-
public function testFetchRequest(?Request $request, ?ServerRequestInterface $expectedRequest): void
39+
public function testFetchRequest(): void
4440
{
41+
$request = Request::create('https://www.example.com');
42+
$expectedRequest = $this->createMock(ServerRequestInterface::class);
43+
4544
$this->requestStack->expects($this->once())
4645
->method('getCurrentRequest')
4746
->willReturn($request);
4847

49-
$this->httpMessageFactory->expects(null !== $expectedRequest ? $this->once() : $this->never())
48+
$this->httpMessageFactory->expects($this->once())
5049
->method('createRequest')
5150
->with($request)
5251
->willReturn($expectedRequest);
5352

5453
$this->assertSame($expectedRequest, $this->requestFetcher->fetchRequest());
5554
}
5655

57-
public function testFetchRequestFailsSilently(): void
56+
public function testFetchRequestReturnsNullIfTheRequestStackIsEmpty(): void
57+
{
58+
$this->requestStack->expects($this->once())
59+
->method('getCurrentRequest')
60+
->willReturn(null);
61+
62+
$this->httpMessageFactory->expects($this->never())
63+
->method('createRequest');
64+
65+
$this->assertNull($this->requestFetcher->fetchRequest());
66+
}
67+
68+
public function testFetchRequestReturnsNullIfTheRequestFactoryThrowsAnException(): void
5869
{
5970
$this->requestStack->expects($this->once())
6071
->method('getCurrentRequest')
@@ -66,20 +77,4 @@ public function testFetchRequestFailsSilently(): void
6677

6778
$this->assertNull($this->requestFetcher->fetchRequest());
6879
}
69-
70-
/**
71-
* @return \Generator<array{Request|null,ServerRequest|null}>
72-
*/
73-
public function fetchRequestDataProvider(): \Generator
74-
{
75-
yield [
76-
null,
77-
null,
78-
];
79-
80-
yield [
81-
Request::create('http://www.example.com'),
82-
new ServerRequest('GET', 'http://www.example.com'),
83-
];
84-
}
8580
}

0 commit comments

Comments
 (0)