Skip to content

Commit b362ee6

Browse files
author
Anton Shabouta
authored
Merge pull request #23 from phpinnacle/test_coverage
Test coverage
2 parents ed105cd + 1a4bfc3 commit b362ee6

File tree

3 files changed

+37
-68
lines changed

3 files changed

+37
-68
lines changed

‎.github/workflows/continuous-integration.yml‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -80,35 +80,4 @@ jobs:
8080
uses: jakejarvis/wait-action@master
8181

8282
- name: Run tests with phpunit
83-
run: XDEBUG_MODE=coverage php ./vendor/bin/phpunit --configuration ./phpunit.xml --coverage-clover=coverage.clover
84-
85-
- name: Upload coverage file
86-
uses: actions/upload-artifact@v2
87-
with:
88-
name: phpunit.coverage
89-
path: coverage.clover
90-
91-
upload_coverage:
92-
name: Upload coverage
93-
runs-on: ubuntu-latest
94-
needs: phpunit
95-
steps:
96-
- name: Checkout
97-
uses: actions/checkout@v2
98-
99-
- name: Install PHP
100-
uses: shivammathur/setup-php@v2
101-
with:
102-
php-version: 7.4
103-
coverage: none
104-
tools: composer
105-
106-
- name: Download coverage files
107-
uses: actions/download-artifact@v2
108-
with:
109-
path: reports
110-
111-
- name: Send code coverage report to Scrutinizer
112-
run: |
113-
wget https://scrutinizer-ci.com/ocular.phar
114-
php ocular.phar code-coverage:upload --format=php-clover ./reports/phpunit.coverage/coverage.clover
83+
run: php ./vendor/bin/phpunit --configuration ./phpunit.xml

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Latest Version on Packagist][ico-version]][link-packagist]
44
[![Software License][ico-license]](LICENSE.md)
5-
[![Coverage Status][ico-scrutinizer]][link-scrutinizer]
6-
[![Quality Score][ico-code-quality]][link-code-quality]
5+
![Continuous Integration](https://github.com/phpinnacle/ridge/workflows/Continuous%20Integration/badge.svg)
6+
[![Shepherd](https://shepherd.dev/github/phpinnacle/ridge/coverage.svg)](https://shepherd.dev/github/phpinnacle/ridge)
77
[![Total Downloads][ico-downloads]][link-downloads]
88

99
This library is a pure asynchronous PHP implementation of the AMQP 0-9-1 protocol.

‎tests/ChannelTest.php‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,14 @@ public function testMandatoryPublish(Client $client)
211211
});
212212

213213
$channel->events()->onReturn(function (Message $message) use ($deferred, $watcher) {
214-
self::assertSame($message->content(), '.');
215-
self::assertSame($message->exchange(), '');
216-
self::assertSame($message->routingKey(), '404');
217-
self::assertSame($message->headers(), []);
218-
self::assertNull($message->consumerTag());
219-
self::assertNull($message->deliveryTag());
220-
self::assertFalse($message->redelivered());
221-
self::assertTrue($message->returned());
214+
self::assertSame($message->content, '.');
215+
self::assertSame($message->exchange, '');
216+
self::assertSame($message->routingKey, '404');
217+
self::assertSame($message->headers, []);
218+
self::assertNull($message->consumerTag);
219+
self::assertNull($message->deliveryTag);
220+
self::assertFalse($message->redelivered);
221+
self::assertTrue($message->returned);
222222

223223
Loop::cancel($watcher);
224224

@@ -252,7 +252,7 @@ public function testImmediatePublish(Client $client)
252252
});
253253

254254
$channel->events()->onReturn(function (Message $message) use ($deferred, $watcher) {
255-
self::assertTrue($message->returned());
255+
self::assertTrue($message->returned);
256256

257257
Loop::cancel($watcher);
258258

@@ -277,8 +277,8 @@ public function testConsume(Client $client)
277277

278278
/** @noinspection PhpUnusedLocalVariableInspection */
279279
$tag = yield $channel->consume(function (Message $message) use ($client, &$tag) {
280-
self::assertEquals('hi', $message->content());
281-
self::assertEquals($tag, $message->consumerTag());
280+
self::assertEquals('hi', $message->content);
281+
self::assertEquals($tag, $message->consumerTag);
282282

283283
yield $client->disconnect();
284284
}, 'test_queue', false, true);
@@ -318,7 +318,7 @@ public function testHeaders(Client $client)
318318
yield $channel->consume(function (Message $message) use ($client) {
319319
self::assertEquals('text/html', $message->header('content-type'));
320320
self::assertEquals('value', $message->header('custom'));
321-
self::assertEquals('<b>hi html</b>', $message->content());
321+
self::assertEquals('<b>hi html</b>', $message->content);
322322

323323
yield $client->disconnect();
324324
}, 'test_queue', false, true);
@@ -338,13 +338,13 @@ public function testGet(Client $client)
338338

339339
self::assertNotNull($message1);
340340
self::assertInstanceOf(Message::class, $message1);
341-
self::assertEquals('', $message1->exchange());
342-
self::assertEquals('.', $message1->content());
343-
self::assertEquals('get_test', $message1->routingKey());
344-
self::assertEquals(1, $message1->deliveryTag());
345-
self::assertNull($message1->consumerTag());
346-
self::assertFalse($message1->redelivered());
347-
self::assertIsArray($message1->headers());
341+
self::assertEquals('', $message1->exchange);
342+
self::assertEquals('.', $message1->content);
343+
self::assertEquals('get_test', $message1->routingKey);
344+
self::assertEquals(1, $message1->deliveryTag);
345+
self::assertNull($message1->consumerTag);
346+
self::assertFalse($message1->redelivered);
347+
self::assertIsArray($message1->headers);
348348

349349
self::assertNull(yield $channel->get('get_test', true));
350350

@@ -354,8 +354,8 @@ public function testGet(Client $client)
354354
$message2 = yield $channel->get('get_test');
355355

356356
self::assertNotNull($message2);
357-
self::assertEquals(2, $message2->deliveryTag());
358-
self::assertFalse($message2->redelivered());
357+
self::assertEquals(2, $message2->deliveryTag);
358+
self::assertFalse($message2->redelivered);
359359

360360
$client->disconnect()->onResolve(function () use ($client) {
361361
yield $client->connect();
@@ -368,9 +368,9 @@ public function testGet(Client $client)
368368

369369
self::assertNotNull($message3);
370370
self::assertInstanceOf(Message::class, $message3);
371-
self::assertEquals('', $message3->exchange());
372-
self::assertEquals('..', $message3->content());
373-
self::assertTrue($message3->redelivered());
371+
self::assertEquals('', $message3->exchange);
372+
self::assertEquals('..', $message3->content);
373+
self::assertTrue($message3->redelivered);
374374

375375
yield $channel->ack($message3);
376376

@@ -409,7 +409,7 @@ public function testNack(Client $client)
409409
$message = yield $channel->get('test_queue');
410410

411411
self::assertNotNull($message);
412-
self::assertFalse($message->redelivered());
412+
self::assertFalse($message->redelivered);
413413

414414
$promise = $channel->nack($message);
415415

@@ -421,7 +421,7 @@ public function testNack(Client $client)
421421
$message = yield $channel->get('test_queue');
422422

423423
self::assertNotNull($message);
424-
self::assertTrue($message->redelivered());
424+
self::assertTrue($message->redelivered);
425425

426426
yield $channel->nack($message, false, false);
427427

@@ -442,7 +442,7 @@ public function testReject(Client $client)
442442
$message = yield $channel->get('test_queue');
443443

444444
self::assertNotNull($message);
445-
self::assertFalse($message->redelivered());
445+
self::assertFalse($message->redelivered);
446446

447447
$promise = $channel->reject($message);
448448

@@ -454,7 +454,7 @@ public function testReject(Client $client)
454454
$message = yield $channel->get('test_queue');
455455

456456
self::assertNotNull($message);
457-
self::assertTrue($message->redelivered());
457+
self::assertTrue($message->redelivered);
458458

459459
yield $channel->reject($message, false);
460460

@@ -475,7 +475,7 @@ public function testRecover(Client $client)
475475
$message = yield $channel->get('test_queue');
476476

477477
self::assertNotNull($message);
478-
self::assertFalse($message->redelivered());
478+
self::assertFalse($message->redelivered);
479479

480480
$promise = $channel->recover(true);
481481

@@ -487,7 +487,7 @@ public function testRecover(Client $client)
487487
$message = yield $channel->get('test_queue');
488488

489489
self::assertNotNull($message);
490-
self::assertTrue($message->redelivered());
490+
self::assertTrue($message->redelivered);
491491

492492
yield $channel->ack($message);
493493

@@ -506,7 +506,7 @@ public function testBigMessage(Client $client)
506506
yield $channel->publish($body, '', 'test_queue');
507507

508508
yield $channel->consume(function (Message $message, Channel $channel) use ($body, $client) {
509-
self::assertEquals(\strlen($body), \strlen($message->content()));
509+
self::assertEquals(\strlen($body), \strlen($message->content));
510510

511511
yield $channel->ack($message);
512512
yield $client->disconnect();
@@ -547,12 +547,12 @@ public function testEmptyMessage(Client $client)
547547
$message = yield $channel->get('empty_body_message_test', true);
548548

549549
self::assertNotNull($message);
550-
self::assertEquals('', $message->content());
550+
self::assertEquals('', $message->content);
551551

552552
$count = 0;
553553

554554
yield $channel->consume(function (Message $message, Channel $channel) use ($client, &$count) {
555-
self::assertEmpty($message->content());
555+
self::assertEmpty($message->content);
556556

557557
yield $channel->ack($message);
558558

@@ -581,7 +581,7 @@ public function testTxs(Client $client)
581581

582582
self::assertNotNull($message);
583583
self::assertInstanceOf(Message::class, $message);
584-
self::assertEquals('.', $message->content());
584+
self::assertEquals('.', $message->content);
585585

586586
$channel->publish('..', '', 'tx_test');
587587
$channel->txRollback();

0 commit comments

Comments
 (0)