Skip to content

Commit 59059f7

Browse files
devanychdevanych
committed
Change assertEquals method to assertSame in tests
1 parent 4e91f53 commit 59059f7

File tree

5 files changed

+195
-195
lines changed

5 files changed

+195
-195
lines changed

‎tests/RequestFactoryTest.php‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ class RequestFactoryTest extends TestCase
1717
public function testCreate(): void
1818
{
1919
$request = RequestFactory::create($method = 'GET', $uri = 'http://example.com');
20-
self::assertEquals($method, $request->getMethod());
21-
self::assertEquals($uri, (string) $request->getUri());
22-
self::assertEquals(['Host' => ['example.com']], $request->getHeaders());
23-
self::assertEquals($this->defaultProtocolVersion, $request->getProtocolVersion());
24-
self::assertInstanceOf(StreamInterface::class, $request->getBody());
25-
self::assertInstanceOf(RequestInterface::class, $request);
26-
self::assertInstanceOf(Request::class, $request);
20+
$this->assertSame($method, $request->getMethod());
21+
$this->assertSame($uri, (string) $request->getUri());
22+
$this->assertSame(['Host' => ['example.com']], $request->getHeaders());
23+
$this->assertSame($this->defaultProtocolVersion, $request->getProtocolVersion());
24+
$this->assertInstanceOf(StreamInterface::class, $request->getBody());
25+
$this->assertInstanceOf(RequestInterface::class, $request);
26+
$this->assertInstanceOf(Request::class, $request);
2727

2828
$request = RequestFactory::create(
2929
$method = 'POST',
@@ -32,26 +32,26 @@ public function testCreate(): void
3232
['Content-Type' => 'text/html'],
3333
$protocol = '1.0'
3434
);
35-
self::assertEquals($method, $request->getMethod());
36-
self::assertEquals($uri, (string) $request->getUri());
37-
self::assertEquals(['Host' => ['example.com'], 'Content-Type' => ['text/html']], $request->getHeaders());
38-
self::assertEquals($protocol, $request->getProtocolVersion());
39-
self::assertInstanceOf(StreamInterface::class, $request->getBody());
40-
self::assertEquals('Content', $request->getBody()->getContents());
41-
self::assertInstanceOf(RequestInterface::class, $request);
42-
self::assertInstanceOf(Request::class, $request);
35+
$this->assertSame($method, $request->getMethod());
36+
$this->assertSame($uri, (string) $request->getUri());
37+
$this->assertSame(['Host' => ['example.com'], 'Content-Type' => ['text/html']], $request->getHeaders());
38+
$this->assertSame($protocol, $request->getProtocolVersion());
39+
$this->assertInstanceOf(StreamInterface::class, $request->getBody());
40+
$this->assertSame('Content', $request->getBody()->getContents());
41+
$this->assertInstanceOf(RequestInterface::class, $request);
42+
$this->assertInstanceOf(Request::class, $request);
4343
}
4444

4545
public function testCreateRequest(): void
4646
{
4747
$factory = new RequestFactory();
4848
$request = $factory->createRequest($method = 'GET', $uri = 'http://example.com');
49-
self::assertEquals($method, $request->getMethod());
50-
self::assertEquals($uri, (string) $request->getUri());
51-
self::assertEquals(['Host' => ['example.com']], $request->getHeaders());
52-
self::assertEquals($this->defaultProtocolVersion, $request->getProtocolVersion());
53-
self::assertInstanceOf(StreamInterface::class, $request->getBody());
54-
self::assertInstanceOf(RequestInterface::class, $request);
55-
self::assertInstanceOf(Request::class, $request);
49+
$this->assertSame($method, $request->getMethod());
50+
$this->assertSame($uri, (string) $request->getUri());
51+
$this->assertSame(['Host' => ['example.com']], $request->getHeaders());
52+
$this->assertSame($this->defaultProtocolVersion, $request->getProtocolVersion());
53+
$this->assertInstanceOf(StreamInterface::class, $request->getBody());
54+
$this->assertInstanceOf(RequestInterface::class, $request);
55+
$this->assertInstanceOf(Request::class, $request);
5656
}
5757
}

‎tests/RequestTest.php‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@ public function setUp(): void
2626

2727
public function testGetDefault(): void
2828
{
29-
self::assertEquals('/', $this->request->getRequestTarget());
30-
self::assertEquals(Request::METHOD_GET, $this->request->getMethod());
31-
self::assertInstanceOf(UriInterface::class, $this->request->getUri());
29+
$this->assertSame('/', $this->request->getRequestTarget());
30+
$this->assertSame(Request::METHOD_GET, $this->request->getMethod());
31+
$this->assertInstanceOf(UriInterface::class, $this->request->getUri());
3232
}
3333

3434
public function testWithRequestTarget(): void
3535
{
3636
$request = $this->request->withRequestTarget('*');
37-
self::assertNotEquals($this->request, $request);
38-
self::assertEquals('*', $request->getRequestTarget());
37+
$this->assertNotSame($this->request, $request);
38+
$this->assertSame('*', $request->getRequestTarget());
3939
}
4040

4141
public function testWithRequestTargetHasNotBeenChangedNotClone(): void
4242
{
4343
$request = $this->request->withRequestTarget(null);
44-
self::assertEquals($this->request, $request);
45-
self::assertEquals('/', $request->getRequestTarget());
44+
$this->assertSame($this->request, $request);
45+
$this->assertSame('/', $request->getRequestTarget());
4646
}
4747

4848
/**
@@ -66,19 +66,19 @@ public function testWithRequestTargetThrowExceptionInvalidRequestTarget($request
6666
public function testWithMethod(): void
6767
{
6868
$request = $this->request->withMethod(Request::METHOD_POST);
69-
self::assertNotEquals($this->request, $request);
70-
self::assertEquals(Request::METHOD_POST, $request->getMethod());
69+
$this->assertNotSame($this->request, $request);
70+
$this->assertSame(Request::METHOD_POST, $request->getMethod());
7171

7272
$request = $this->request->withMethod($method = 'PoSt');
73-
self::assertNotEquals($this->request, $request);
74-
self::assertEquals($method, $request->getMethod());
73+
$this->assertNotSame($this->request, $request);
74+
$this->assertSame($method, $request->getMethod());
7575
}
7676

7777
public function testWithMethodHasNotBeenChangedNotClone(): void
7878
{
7979
$request = $this->request->withMethod(Request::METHOD_GET);
80-
self::assertEquals($this->request, $request);
81-
self::assertEquals(Request::METHOD_GET, $request->getMethod());
80+
$this->assertSame($this->request, $request);
81+
$this->assertSame(Request::METHOD_GET, $request->getMethod());
8282
}
8383

8484
/**
@@ -103,29 +103,29 @@ public function testWithUri(): void
103103
{
104104
$uri = $this->createMock(UriInterface::class);
105105
$request = $this->request->withUri($uri);
106-
self::assertNotEquals($this->request, $request);
107-
self::assertEquals($uri, $request->getUri());
106+
$this->assertNotSame($this->request, $request);
107+
$this->assertSame($uri, $request->getUri());
108108
}
109109

110110
public function testWithUriUpdateHostHeaderFromUri(): void
111111
{
112112
$request = new Request('GET', 'http://example.com/path/to/action');
113-
self::assertEquals(['Host' => ['example.com']], $request->getHeaders());
114-
self::assertEquals(['example.com'], $request->getHeader('host'));
113+
$this->assertSame(['Host' => ['example.com']], $request->getHeaders());
114+
$this->assertSame(['example.com'], $request->getHeader('host'));
115115

116116
$newUri = $request->getUri()->withHost('example.org');
117117

118118
$newRequest = $request->withUri($newUri);
119-
self::assertEquals(['Host' => ['example.org']], $newRequest->getHeaders());
120-
self::assertEquals(['example.org'], $newRequest->getHeader('host'));
119+
$this->assertSame(['Host' => ['example.org']], $newRequest->getHeaders());
120+
$this->assertSame(['example.org'], $newRequest->getHeader('host'));
121121

122122
$newRequestWithUriPort = $request->withUri($newUri->withPort(8080));
123-
self::assertEquals(['Host' => ['example.org:8080']], $newRequestWithUriPort->getHeaders());
124-
self::assertEquals(['example.org:8080'], $newRequestWithUriPort->getHeader('host'));
123+
$this->assertSame(['Host' => ['example.org:8080']], $newRequestWithUriPort->getHeaders());
124+
$this->assertSame(['example.org:8080'], $newRequestWithUriPort->getHeader('host'));
125125

126126
$newRequestWithUriStandardPort = $request->withUri($newUri->withPort(80));
127-
self::assertEquals(['Host' => ['example.org']], $newRequestWithUriStandardPort->getHeaders());
128-
self::assertEquals(['example.org'], $newRequestWithUriStandardPort->getHeader('host'));
127+
$this->assertSame(['Host' => ['example.org']], $newRequestWithUriStandardPort->getHeaders());
128+
$this->assertSame(['example.org'], $newRequestWithUriStandardPort->getHeader('host'));
129129
}
130130

131131
/**

‎tests/SapiNormalizerTest.php‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function setUp(): void
4040
public function testNormalizeMethod(): void
4141
{
4242
$method = $this->normalizer->normalizeMethod($this->server);
43-
self::assertEquals($this->server['REQUEST_METHOD'], $method);
43+
$this->assertSame($this->server['REQUEST_METHOD'], $method);
4444
}
4545

4646
public function testNormalizeMethodIfRequestMethodHeaderIsEmptyOrNotExist(): void
@@ -50,21 +50,21 @@ public function testNormalizeMethodIfRequestMethodHeaderIsEmptyOrNotExist(): voi
5050

5151
$server['REQUEST_METHOD'] = null;
5252
$method = $this->normalizer->normalizeMethod($server);
53-
self::assertEquals($defaultMethod, $method);
53+
$this->assertSame($defaultMethod, $method);
5454

5555
$server['REQUEST_METHOD'] = '';
5656
$method = $this->normalizer->normalizeMethod($server);
57-
self::assertEquals($defaultMethod, $method);
57+
$this->assertSame($defaultMethod, $method);
5858

5959
unset($server['REQUEST_METHOD']);
6060
$method = $this->normalizer->normalizeMethod($server);
61-
self::assertEquals($defaultMethod, $method);
61+
$this->assertSame($defaultMethod, $method);
6262
}
6363

6464
public function testNormalizeProtocolVersion(): void
6565
{
6666
$version = $this->normalizer->normalizeProtocolVersion($this->server);
67-
self::assertEquals($this->server['SERVER_PROTOCOL'], 'HTTP/' . $version);
67+
$this->assertSame($this->server['SERVER_PROTOCOL'], 'HTTP/' . $version);
6868
}
6969

7070
public function testNormalizeProtocolVersionIfServerProtocolHeaderIsEmptyOrNotExist(): void
@@ -74,65 +74,65 @@ public function testNormalizeProtocolVersionIfServerProtocolHeaderIsEmptyOrNotEx
7474

7575
$server['SERVER_PROTOCOL'] = null;
7676
$version = $this->normalizer->normalizeProtocolVersion($server);
77-
self::assertEquals($defaultVersion, $version);
77+
$this->assertSame($defaultVersion, $version);
7878

7979
$server['SERVER_PROTOCOL'] = '';
8080
$version = $this->normalizer->normalizeProtocolVersion($server);
81-
self::assertEquals($defaultVersion, $version);
81+
$this->assertSame($defaultVersion, $version);
8282

8383
unset($server['SERVER_PROTOCOL']);
8484
$version = $this->normalizer->normalizeProtocolVersion($server);
85-
self::assertEquals($defaultVersion, $version);
85+
$this->assertSame($defaultVersion, $version);
8686
}
8787

8888
public function testNormalizeUri(): void
8989
{
9090
$uri = $this->normalizer->normalizeUri($this->server);
91-
self::assertInstanceOf(UriInterface::class, $uri);
92-
self::assertEquals($this->server['HTTP_X_FORWARDED_PROTO'], $uri->getScheme());
93-
self::assertEquals($this->server['HTTP_HOST'], $uri->getAuthority());
94-
self::assertEquals('', $uri->getUserInfo());
95-
self::assertEquals($this->server['HTTP_HOST'], $uri->getHost());
96-
self::assertEquals(null, $uri->getPort());
97-
self::assertEquals('/path', $uri->getPath());
98-
self::assertEquals($this->server['QUERY_STRING'], $uri->getQuery());
99-
self::assertEquals('https://example.com/path?name=value', (string) $uri);
91+
$this->assertInstanceOf(UriInterface::class, $uri);
92+
$this->assertSame($this->server['HTTP_X_FORWARDED_PROTO'], $uri->getScheme());
93+
$this->assertSame($this->server['HTTP_HOST'], $uri->getAuthority());
94+
$this->assertSame('', $uri->getUserInfo());
95+
$this->assertSame($this->server['HTTP_HOST'], $uri->getHost());
96+
$this->assertSame(null, $uri->getPort());
97+
$this->assertSame('/path', $uri->getPath());
98+
$this->assertSame($this->server['QUERY_STRING'], $uri->getQuery());
99+
$this->assertSame('https://example.com/path?name=value', (string) $uri);
100100
}
101101

102102
public function testNormalizeUriIfServerIsEmpty(): void
103103
{
104104
$uri = $this->normalizer->normalizeUri([]);
105-
self::assertInstanceOf(UriInterface::class, $uri);
106-
self::assertEquals('', $uri->getScheme());
107-
self::assertEquals('', $uri->getAuthority());
108-
self::assertEquals('', $uri->getUserInfo());
109-
self::assertEquals('', $uri->getHost());
110-
self::assertEquals(null, $uri->getPort());
111-
self::assertEquals('', $uri->getPath());
112-
self::assertEquals('', $uri->getQuery());
113-
self::assertEquals('', (string) $uri);
105+
$this->assertInstanceOf(UriInterface::class, $uri);
106+
$this->assertSame('', $uri->getScheme());
107+
$this->assertSame('', $uri->getAuthority());
108+
$this->assertSame('', $uri->getUserInfo());
109+
$this->assertSame('', $uri->getHost());
110+
$this->assertSame(null, $uri->getPort());
111+
$this->assertSame('', $uri->getPath());
112+
$this->assertSame('', $uri->getQuery());
113+
$this->assertSame('', (string) $uri);
114114
}
115115

116116
public function testNormalizeHeaders(): void
117117
{
118118
$headers = $this->normalizer->normalizeHeaders($this->server);
119119

120-
self::assertEquals($this->server['HTTP_HOST'], $headers['Host']);
121-
self::assertEquals($this->server['HTTP_CACHE_CONTROL'], $headers['Cache-Control']);
122-
self::assertEquals($this->server['HTTP_X_FORWARDED_PROTO'], $headers['X-Forwarded-Proto']);
123-
self::assertEquals($this->server['CONTENT_TYPE'], $headers['Content-Type']);
124-
125-
self::assertFalse(isset($headers['HTTPS']));
126-
self::assertFalse(isset($headers['SERVER_PORT']));
127-
self::assertFalse(isset($headers['REQUEST_METHOD']));
128-
self::assertFalse(isset($headers['SERVER_PROTOCOL']));
129-
self::assertFalse(isset($headers['REQUEST_URI']));
130-
self::assertFalse(isset($headers['QUERY_STRING']));
120+
$this->assertSame($this->server['HTTP_HOST'], $headers['Host']);
121+
$this->assertSame($this->server['HTTP_CACHE_CONTROL'], $headers['Cache-Control']);
122+
$this->assertSame($this->server['HTTP_X_FORWARDED_PROTO'], $headers['X-Forwarded-Proto']);
123+
$this->assertSame($this->server['CONTENT_TYPE'], $headers['Content-Type']);
124+
125+
$this->assertFalse(isset($headers['HTTPS']));
126+
$this->assertFalse(isset($headers['SERVER_PORT']));
127+
$this->assertFalse(isset($headers['REQUEST_METHOD']));
128+
$this->assertFalse(isset($headers['SERVER_PROTOCOL']));
129+
$this->assertFalse(isset($headers['REQUEST_URI']));
130+
$this->assertFalse(isset($headers['QUERY_STRING']));
131131
}
132132

133133
public function testNormalizeHeadersIfServerIsEmpty(): void
134134
{
135135
$headers = $this->normalizer->normalizeHeaders([]);
136-
self::assertEquals([], $headers);
136+
$this->assertSame([], $headers);
137137
}
138138
}

0 commit comments

Comments
 (0)