Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Testsuite improvements #471

Open
wants to merge 3 commits into
base: 1.x
Choose a base branch
from
Open

Testsuite improvements #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c98447e
Factory method for streaming server test
WyriHaximus Aug 27, 2022
3079a77
Factory method for request header parser test
WyriHaximus Sep 13, 2022
7afdc64
Typo
WyriHaximus Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
76 changes: 41 additions & 35 deletions tests/Io/RequestHeaderParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace React\Tests\Http\Io;

use Psr\Http\Message\ServerRequestInterface;
use React\Http\Io\Clock;
use React\Http\Io\RequestHeaderParser;
use React\Tests\Http\TestCase;

Expand All @@ -12,7 +13,7 @@ public function testSplitShouldHappenOnDoubleCrlf()
{
$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());

$connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(null)->getMock();
Expand All @@ -33,7 +34,7 @@ public function testFeedInOneGo()
{
$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableOnce());

$connection = $this->getMockBuilder('React\Socket\Connection')->disableOriginalConstructor()->setMethods(null)->getMock();
Expand All @@ -47,7 +48,7 @@ public function testFeedTwoRequestsOnSeparateConnections()
{
$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);

$called = 0;
$parser->on('headers', function () use (&$called) {
Expand All @@ -73,7 +74,7 @@ public function testHeadersEventShouldEmitRequestAndConnection()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', function ($parsedRequest, $connection) use (&$request, &$conn) {
$request = $parsedRequest;
$conn = $connection;
Expand All @@ -98,7 +99,7 @@ public function testHeadersEventShouldEmitRequestWhichShouldEmitEndForStreamingB
{
$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);

$ended = false;
$that = $this;
Expand All @@ -124,7 +125,7 @@ public function testHeadersEventShouldEmitRequestWhichShouldEmitStreamingBodyDat
{
$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);

$buffer = '';
$that = $this;
Expand Down Expand Up @@ -154,7 +155,7 @@ public function testHeadersEventShouldEmitRequestWhichShouldEmitStreamingBodyWit
{
$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);

$buffer = '';
$that = $this;
Expand Down Expand Up @@ -182,7 +183,7 @@ public function testHeadersEventShouldEmitRequestWhichShouldNotEmitStreamingBody
{
$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);

$buffer = '';
$that = $this;
Expand All @@ -209,7 +210,7 @@ public function testHeadersEventShouldEmitRequestWhichShouldEmitStreamingBodyDat
{
$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);

$buffer = '';
$that = $this;
Expand Down Expand Up @@ -238,7 +239,7 @@ public function testHeadersEventShouldParsePathAndQueryString()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', function ($parsedRequest) use (&$request) {
$request = $parsedRequest;
});
Expand Down Expand Up @@ -267,7 +268,7 @@ public function testHeaderEventWithShouldApplyDefaultAddressFromLocalConnectionA

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', function ($parsedRequest) use (&$request) {
$request = $parsedRequest;
});
Expand All @@ -288,7 +289,7 @@ public function testHeaderEventViaHttpsShouldApplyHttpsSchemeFromLocalTlsConnect

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', function ($parsedRequest) use (&$request) {
$request = $parsedRequest;
});
Expand All @@ -310,7 +311,7 @@ public function testHeaderOverflowShouldEmitError()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message, $connection) use (&$error, &$passedConnection) {
$error = $message;
Expand All @@ -334,7 +335,7 @@ public function testInvalidEmptyRequestHeadersParseException()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -355,7 +356,7 @@ public function testInvalidMalformedRequestLineParseException()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -376,7 +377,7 @@ public function testInvalidMalformedRequestHeadersThrowsParseException()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -397,7 +398,7 @@ public function testInvalidMalformedRequestHeadersWhitespaceThrowsParseException

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -418,7 +419,7 @@ public function testInvalidAbsoluteFormSchemeEmitsError()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -439,7 +440,7 @@ public function testOriginFormWithSchemeSeparatorInParam()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('error', $this->expectCallableNever());
$parser->on('headers', function ($parsedRequest, $parsedBodyBuffer) use (&$request) {
$request = $parsedRequest;
Expand All @@ -466,7 +467,7 @@ public function testUriStartingWithColonSlashSlashFails()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -487,7 +488,7 @@ public function testInvalidAbsoluteFormWithFragmentEmitsError()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -508,7 +509,7 @@ public function testInvalidHeaderContainsFullUri()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -529,7 +530,7 @@ public function testInvalidAbsoluteFormWithHostHeaderEmpty()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -550,7 +551,7 @@ public function testInvalidConnectRequestWithNonAuthorityForm()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -571,7 +572,7 @@ public function testInvalidHttpVersion()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -593,7 +594,7 @@ public function testInvalidContentLengthRequestHeaderWillEmitError()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -615,7 +616,7 @@ public function testInvalidRequestWithMultipleContentLengthRequestHeadersWillEmi

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -637,7 +638,7 @@ public function testInvalidTransferEncodingRequestHeaderWillEmitError()

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -659,7 +660,7 @@ public function testInvalidRequestWithBothTransferEncodingAndContentLengthWillEm

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);
$parser->on('headers', $this->expectCallableNever());
$parser->on('error', function ($message) use (&$error) {
$error = $message;
Expand All @@ -682,7 +683,7 @@ public function testServerParamsWillBeSetOnHttpsRequest()
$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();
$clock->expects($this->once())->method('now')->willReturn(1652972091.3958);

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);

$parser->on('headers', function ($parsedRequest) use (&$request) {
$request = $parsedRequest;
Expand Down Expand Up @@ -715,7 +716,7 @@ public function testServerParamsWillBeSetOnHttpRequest()
$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();
$clock->expects($this->once())->method('now')->willReturn(1652972091.3958);

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);

$parser->on('headers', function ($parsedRequest) use (&$request) {
$request = $parsedRequest;
Expand Down Expand Up @@ -748,7 +749,7 @@ public function testServerParamsWillNotSetRemoteAddressForUnixDomainSockets()
$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();
$clock->expects($this->once())->method('now')->willReturn(1652972091.3958);

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);

$parser->on('headers', function ($parsedRequest) use (&$request) {
$request = $parsedRequest;
Expand Down Expand Up @@ -785,7 +786,7 @@ public function testServerParamsWontBeSetOnMissingUrls()
$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();
$clock->expects($this->once())->method('now')->willReturn(1652972091.3958);

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);

$parser->on('headers', function ($parsedRequest) use (&$request) {
$request = $parsedRequest;
Expand Down Expand Up @@ -864,13 +865,13 @@ public function testServerParamsWillBeRememberedUntilConnectionIsClosed()
$this->assertEquals(array(), $ref->getValue($parser));
}

public function testQueryParmetersWillBeSet()
public function testQueryParametersWillBeSet()
{
$request = null;

$clock = $this->getMockBuilder('React\Http\Io\Clock')->disableOriginalConstructor()->getMock();

$parser = new RequestHeaderParser($clock);
$parser = $this->createRequestHeaderParser($clock);

$parser->on('headers', function ($parsedRequest) use (&$request) {
$request = $parsedRequest;
Expand Down Expand Up @@ -907,4 +908,9 @@ private function createAdvancedPostRequest()

return $data;
}

private function createRequestHeaderParser(Clock $clock)
{
return new RequestHeaderParser($clock);
}
}