Skip to content

Commit 9769925

Browse files
author
Stepan Zolotarev
committed
Fixed tests
1 parent 0e3bbdf commit 9769925

File tree

5 files changed

+19
-70
lines changed

5 files changed

+19
-70
lines changed

phpunit.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<php>
99
<ini name="error_reporting" value="-1"/>
1010
<env name="REDIS_CONNECTION_DSN" value="tcp://localhost:6379"/>
11-
<env name="TRANSPORT_CONNECTION_DSN" value="amqp://guest:guest@127.0.0.1:5672/?heartbeat=0"/>
11+
<env name="TRANSPORT_CONNECTION_DSN" value="amqp://guest:guest@127.0.0.1:5772/?heartbeat=0"/>
1212
<env name="NSQ_CONNECTION_DSN" value="tcp://localhost:4150"/>
13-
<env name="TEST_POSTGRES_DSN" value="pgsql://test:123456789@localhost:5432/test"/>
13+
<env name="TEST_POSTGRES_DSN" value="pgsql://test:123456789@localhost:5455/test"/>
1414
</php>
1515
<testsuites>
1616
<testsuite name="PHP Service Bus: Common component">

tests/Infrastructure/Alerting/TelegramAlertingProviderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function failedDelivery(): void
7777
$logHandler = new TestHandler();
7878
$logger = new Logger('tests', [$logHandler]);
7979

80-
$httpClient = new TestAlertingHttpClient(new Response(400));
80+
$httpClient = new TestAlertingHttpClient(new Response(400, [], '{}'));
8181
$alertingProvider = new TelegramAlertingProvider(
8282
new InteractionsProvider($httpClient),
8383
new TelegramCredentials('927366182:AAHsjMy7u13tvCTgzSP-fPlIR89lhWgCOvn'),
@@ -91,7 +91,7 @@ public function failedDelivery(): void
9191
self::assertNotNull($httpClient->requestData);
9292

9393
self::assertContains(
94-
'Delivery to Telegram failed: Incorrect server response code: 400',
94+
'Delivery to Telegram failed: Method sendMessage has invalid parameters',
9595
filterLogMessages($logHandler)
9696
);
9797
}

tests/Infrastructure/Logger/Handlers/Graylog/FormatterTest.php

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
namespace ServiceBus\Tests\Infrastructure\Logger\Handlers\Graylog;
1414

15+
use Monolog\JsonSerializableDateTimeImmutable;
16+
use Monolog\Logger;
17+
use Monolog\LogRecord;
1518
use PHPUnit\Framework\TestCase;
1619
use ServiceBus\Infrastructure\Logger\Handlers\Graylog\Formatter;
1720

@@ -30,21 +33,24 @@ public function format(): void
3033
{
3134
$message = \str_repeat('x', 40000);
3235

33-
$result = (new Formatter('test_host'))->format([
34-
'level' => 100,
35-
'datetime' => datetimeInstantiator('2019-02-15 15:32:19'),
36-
'message' => $message,
37-
'context' => [
36+
$record = new LogRecord(
37+
datetime: new \DateTimeImmutable('2019-02-15 15:32:19'),
38+
channel: 'test',
39+
level: Logger::toMonologLevel(100),
40+
message: $message,
41+
context: [
3842
'contextKey' => 'contextValue',
3943
'secondKey' => null,
4044
'largeKey' => \str_repeat('x', 40000),
4145
'key' => ['qwerty' => 'root'],
4246
],
43-
'extra' => [
47+
extra: [
4448
'file' => '/src/tests.php',
4549
'line' => __LINE__,
4650
],
47-
]);
51+
);
52+
53+
$result = (new Formatter('test_host'))->format($record);
4854

4955
self::assertSame(
5056
jsonDecode(\file_get_contents(__DIR__ . '/expected_format_result.json')),

tests/Infrastructure/Logger/Handlers/Graylog/expected_format_result.json

Lines changed: 2 additions & 1 deletion
Large diffs are not rendered by default.

tests/Infrastructure/Logger/Handlers/StdOut/StdOutFormatterTest.php

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)