Merge pull request #23 from phpinnacle/test_coverage

Test coverage
phpinnacle · Jan 3, 2021 · b362ee6 · b362ee6
2 parents ed105cd + 1a4bfc3
commit b362ee6
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 68 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -80,35 +80,4 @@ jobs:
         uses: jakejarvis/wait-action@master
 
       - name: Run tests with phpunit
-        run: XDEBUG_MODE=coverage php ./vendor/bin/phpunit --configuration ./phpunit.xml --coverage-clover=coverage.clover
-
-      - name: Upload coverage file
-        uses: actions/upload-artifact@v2
-        with:
-          name: phpunit.coverage
-          path: coverage.clover
-
-  upload_coverage:
-    name: Upload coverage
-    runs-on: ubuntu-latest
-    needs: phpunit
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Install PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 7.4
-          coverage: none
-          tools: composer
-
-      - name: Download coverage files
-        uses: actions/download-artifact@v2
-        with:
-          path: reports
-
-      - name: Send code coverage report to Scrutinizer
-        run: |
-          wget https://scrutinizer-ci.com/ocular.phar
-          php ocular.phar code-coverage:upload --format=php-clover ./reports/phpunit.coverage/coverage.clover
+        run: php ./vendor/bin/phpunit --configuration ./phpunit.xml
diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@
 
 [![Latest Version on Packagist][ico-version]][link-packagist]
 [![Software License][ico-license]](LICENSE.md)
-[![Coverage Status][ico-scrutinizer]][link-scrutinizer]
-[![Quality Score][ico-code-quality]][link-code-quality]
+![Continuous Integration](https://github.com/phpinnacle/ridge/workflows/Continuous%20Integration/badge.svg)
+[![Shepherd](https://shepherd.dev/github/phpinnacle/ridge/coverage.svg)](https://shepherd.dev/github/phpinnacle/ridge)
 [![Total Downloads][ico-downloads]][link-downloads]
 
 This library is a pure asynchronous PHP implementation of the AMQP 0-9-1 protocol.

diff --git a/tests/ChannelTest.php b/tests/ChannelTest.php
@@ -211,14 +211,14 @@ public function testMandatoryPublish(Client $client)
         });
 
         $channel->events()->onReturn(function (Message $message) use ($deferred, $watcher) {
-            self::assertSame($message->content(), '.');
-            self::assertSame($message->exchange(), '');
-            self::assertSame($message->routingKey(), '404');
-            self::assertSame($message->headers(), []);
-            self::assertNull($message->consumerTag());
-            self::assertNull($message->deliveryTag());
-            self::assertFalse($message->redelivered());
-            self::assertTrue($message->returned());
+            self::assertSame($message->content, '.');
+            self::assertSame($message->exchange, '');
+            self::assertSame($message->routingKey, '404');
+            self::assertSame($message->headers, []);
+            self::assertNull($message->consumerTag);
+            self::assertNull($message->deliveryTag);
+            self::assertFalse($message->redelivered);
+            self::assertTrue($message->returned);
 
             Loop::cancel($watcher);
 
@@ -252,7 +252,7 @@ public function testImmediatePublish(Client $client)
         });
 
         $channel->events()->onReturn(function (Message $message) use ($deferred, $watcher) {
-            self::assertTrue($message->returned());
+            self::assertTrue($message->returned);
 
             Loop::cancel($watcher);
 
@@ -277,8 +277,8 @@ public function testConsume(Client $client)
 
         /** @noinspection PhpUnusedLocalVariableInspection */
         $tag = yield $channel->consume(function (Message $message) use ($client, &$tag) {
-            self::assertEquals('hi', $message->content());
-            self::assertEquals($tag, $message->consumerTag());
+            self::assertEquals('hi', $message->content);
+            self::assertEquals($tag, $message->consumerTag);
 
             yield $client->disconnect();
         }, 'test_queue', false, true);
@@ -318,7 +318,7 @@ public function testHeaders(Client $client)
         yield $channel->consume(function (Message $message) use ($client) {
             self::assertEquals('text/html', $message->header('content-type'));
             self::assertEquals('value', $message->header('custom'));
-            self::assertEquals('<b>hi html</b>', $message->content());
+            self::assertEquals('<b>hi html</b>', $message->content);
 
             yield $client->disconnect();
         }, 'test_queue', false, true);
@@ -338,13 +338,13 @@ public function testGet(Client $client)
 
         self::assertNotNull($message1);
         self::assertInstanceOf(Message::class, $message1);
-        self::assertEquals('', $message1->exchange());
-        self::assertEquals('.', $message1->content());
-        self::assertEquals('get_test', $message1->routingKey());
-        self::assertEquals(1, $message1->deliveryTag());
-        self::assertNull($message1->consumerTag());
-        self::assertFalse($message1->redelivered());
-        self::assertIsArray($message1->headers());
+        self::assertEquals('', $message1->exchange);
+        self::assertEquals('.', $message1->content);
+        self::assertEquals('get_test', $message1->routingKey);
+        self::assertEquals(1, $message1->deliveryTag);
+        self::assertNull($message1->consumerTag);
+        self::assertFalse($message1->redelivered);
+        self::assertIsArray($message1->headers);
 
         self::assertNull(yield $channel->get('get_test', true));
 
@@ -354,8 +354,8 @@ public function testGet(Client $client)
         $message2 = yield $channel->get('get_test');
 
         self::assertNotNull($message2);
-        self::assertEquals(2, $message2->deliveryTag());
-        self::assertFalse($message2->redelivered());
+        self::assertEquals(2, $message2->deliveryTag);
+        self::assertFalse($message2->redelivered);
 
         $client->disconnect()->onResolve(function () use ($client) {
             yield $client->connect();
@@ -368,9 +368,9 @@ public function testGet(Client $client)
 
             self::assertNotNull($message3);
             self::assertInstanceOf(Message::class, $message3);
-            self::assertEquals('', $message3->exchange());
-            self::assertEquals('..', $message3->content());
-            self::assertTrue($message3->redelivered());
+            self::assertEquals('', $message3->exchange);
+            self::assertEquals('..', $message3->content);
+            self::assertTrue($message3->redelivered);
 
             yield $channel->ack($message3);
 
@@ -409,7 +409,7 @@ public function testNack(Client $client)
         $message = yield $channel->get('test_queue');
 
         self::assertNotNull($message);
-        self::assertFalse($message->redelivered());
+        self::assertFalse($message->redelivered);
 
         $promise = $channel->nack($message);
 
@@ -421,7 +421,7 @@ public function testNack(Client $client)
         $message = yield $channel->get('test_queue');
 
         self::assertNotNull($message);
-        self::assertTrue($message->redelivered());
+        self::assertTrue($message->redelivered);
 
         yield $channel->nack($message, false, false);
 
@@ -442,7 +442,7 @@ public function testReject(Client $client)
         $message = yield $channel->get('test_queue');
 
         self::assertNotNull($message);
-        self::assertFalse($message->redelivered());
+        self::assertFalse($message->redelivered);
 
         $promise = $channel->reject($message);
 
@@ -454,7 +454,7 @@ public function testReject(Client $client)
         $message = yield $channel->get('test_queue');
 
         self::assertNotNull($message);
-        self::assertTrue($message->redelivered());
+        self::assertTrue($message->redelivered);
 
         yield $channel->reject($message, false);
 
@@ -475,7 +475,7 @@ public function testRecover(Client $client)
         $message = yield $channel->get('test_queue');
 
         self::assertNotNull($message);
-        self::assertFalse($message->redelivered());
+        self::assertFalse($message->redelivered);
 
         $promise = $channel->recover(true);
 
@@ -487,7 +487,7 @@ public function testRecover(Client $client)
         $message = yield $channel->get('test_queue');
 
         self::assertNotNull($message);
-        self::assertTrue($message->redelivered());
+        self::assertTrue($message->redelivered);
 
         yield $channel->ack($message);
 
@@ -506,7 +506,7 @@ public function testBigMessage(Client $client)
         yield $channel->publish($body, '', 'test_queue');
 
         yield $channel->consume(function (Message $message, Channel $channel) use ($body, $client) {
-            self::assertEquals(\strlen($body), \strlen($message->content()));
+            self::assertEquals(\strlen($body), \strlen($message->content));
 
             yield $channel->ack($message);
             yield $client->disconnect();
@@ -547,12 +547,12 @@ public function testEmptyMessage(Client $client)
         $message = yield $channel->get('empty_body_message_test', true);
 
         self::assertNotNull($message);
-        self::assertEquals('', $message->content());
+        self::assertEquals('', $message->content);
 
         $count = 0;
 
         yield $channel->consume(function (Message $message, Channel $channel) use ($client, &$count) {
-            self::assertEmpty($message->content());
+            self::assertEmpty($message->content);
 
             yield $channel->ack($message);
 
@@ -581,7 +581,7 @@ public function testTxs(Client $client)
 
         self::assertNotNull($message);
         self::assertInstanceOf(Message::class, $message);
-        self::assertEquals('.', $message->content());
+        self::assertEquals('.', $message->content);
 
         $channel->publish('..', '', 'tx_test');
         $channel->txRollback();