From 7aad1f452243ac05b43664bc078a39ed30d5635d Mon Sep 17 00:00:00 2001 From: resurtm Date: Fri, 15 Jan 2016 20:59:18 +0600 Subject: [PATCH 1/9] Increase code coverage for SqsQueueStoreConnection --- tests/Queue/Sqs/SqsQueueStoreConnectionTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/Queue/Sqs/SqsQueueStoreConnectionTest.php b/tests/Queue/Sqs/SqsQueueStoreConnectionTest.php index 594afa2..b0df3ed 100644 --- a/tests/Queue/Sqs/SqsQueueStoreConnectionTest.php +++ b/tests/Queue/Sqs/SqsQueueStoreConnectionTest.php @@ -38,6 +38,9 @@ public function testConnect() 'region' => 'eu-north-99', ]); + $this->assertTrue($connection->getInstance() instanceof SqsClient); + $this->assertSame($connection, $connection->connect()); + $this->assertTrue($connection->getInstance() instanceof SqsClient); $this->assertSame($connection, $connection->connect()); $this->assertTrue($connection->getInstance() instanceof SqsClient); } From 9b507a6b8a2efd43f748d446f069fd3b0c282b5a Mon Sep 17 00:00:00 2001 From: resurtm Date: Fri, 15 Jan 2016 21:18:24 +0600 Subject: [PATCH 2/9] Adjust PDO mail job constructor --- tests/Fixture/FixtureHelper.php | 2 +- tests/Queue/Database/PdoQueueStoreAdapterTest.php | 6 +++--- tests/Queue/MailQueueTest.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Fixture/FixtureHelper.php b/tests/Fixture/FixtureHelper.php index 33185aa..4b9582e 100644 --- a/tests/Fixture/FixtureHelper.php +++ b/tests/Fixture/FixtureHelper.php @@ -12,7 +12,7 @@ public static function getMailMessage() return new MailMessage(self::getMailMessageSmtpConfigurationArray()); } - public static function getMailJob() + public static function getPdoMailJob() { return new PdoMailJob([ 'message' => json_encode(self::getMailMessage()) diff --git a/tests/Queue/Database/PdoQueueStoreAdapterTest.php b/tests/Queue/Database/PdoQueueStoreAdapterTest.php index 361a7af..fb06c74 100644 --- a/tests/Queue/Database/PdoQueueStoreAdapterTest.php +++ b/tests/Queue/Database/PdoQueueStoreAdapterTest.php @@ -22,7 +22,7 @@ protected function setUp() public function testEnqueueDequeueAndAcknowledge() { - $mailJob = FixtureHelper::getMailJob(); + $mailJob = FixtureHelper::getPdoMailJob(); $this->assertSame($this->pdoQueueStore, $this->pdoQueueStore->init()); @@ -48,7 +48,7 @@ public function testEnqueueDequeueAndAcknowledge() public function testAcknowledgementToUpdateMailJobs() { - $mailJob = FixtureHelper::getMailJob(); + $mailJob = FixtureHelper::getPdoMailJob(); $this->pdoQueueStore->enqueue($mailJob); $this->assertTrue($this->pdoQueueStore->isEmpty() === false); @@ -71,7 +71,7 @@ public function testAcknowledgementToUpdateMailJobs() */ public function testBadMethodCallExceptionOnAck() { - $mailJob = FixtureHelper::getMailJob(); + $mailJob = FixtureHelper::getPdoMailJob(); $this->pdoQueueStore->ack($mailJob); } } diff --git a/tests/Queue/MailQueueTest.php b/tests/Queue/MailQueueTest.php index 25b3f67..f01e92e 100644 --- a/tests/Queue/MailQueueTest.php +++ b/tests/Queue/MailQueueTest.php @@ -26,7 +26,7 @@ protected function setUp() public function testPdoEnqueDequeueAndAcknowledge() { - $mailJob = FixtureHelper::getMailJob(); + $mailJob = FixtureHelper::getPdoMailJob(); $this->assertSame($this->pdoQueueAdapter, $this->mailQueuePdo->init()); $this->assertTrue($this->mailQueuePdo->enqueue($mailJob)); From 981c312b2c122c4768e871b8c2ba8ba9970c6f4d Mon Sep 17 00:00:00 2001 From: resurtm Date: Fri, 15 Jan 2016 21:20:29 +0600 Subject: [PATCH 3/9] Add SQS mail job creator --- tests/Fixture/FixtureHelper.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/Fixture/FixtureHelper.php b/tests/Fixture/FixtureHelper.php index 4b9582e..4c955af 100644 --- a/tests/Fixture/FixtureHelper.php +++ b/tests/Fixture/FixtureHelper.php @@ -2,6 +2,7 @@ namespace Da\Mailer\Test\Fixture; use Da\Mailer\Queue\Backend\Pdo\PdoMailJob; +use Da\Mailer\Queue\Backend\Sqs\SqsMailJob; use Da\Mailer\Model\MailMessage; use Da\Mailer\Transport\TransportInterface; @@ -19,6 +20,13 @@ public static function getPdoMailJob() ]); } + public static function getSqsMailJob() + { + return new SqsMailJob([ + 'message' => json_encode(self::getMailMessage()) + ]); + } + public static function getMySqlConnectionConfiguration() { return [ From f62fb0bd73df655cfa864384fc3334ab256d31ff Mon Sep 17 00:00:00 2001 From: resurtm Date: Sat, 16 Jan 2016 01:11:21 +0600 Subject: [PATCH 4/9] Initial portion of SQS tests --- tests/Queue/Sqs/SqsQueueStoreAdapterTest.php | 144 +++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 tests/Queue/Sqs/SqsQueueStoreAdapterTest.php diff --git a/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php b/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php new file mode 100644 index 0000000..3911122 --- /dev/null +++ b/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php @@ -0,0 +1,144 @@ + 'createQueueResultId', + 'QueueUrl' => 'http://queue.url/path/', + ]); + + $sendMessageResult = new Collection([ + 'MessageId' => 'sendMessageResultId', + ]); + + $getQueueAttributesResult1 = new Collection([ + 'MessageId' => 'getQueueAttributesResult1Id', + 'Attributes' => [ + 'ApproximateNumberOfMessages' => 1, + ], + ]); + $getQueueAttributesResult2 = new Collection([ + 'MessageId' => 'getQueueAttributesResult2Id', + 'Attributes' => [ + 'ApproximateNumberOfMessages' => 0, + ], + ]); + + $receiveMessageResult1 = new Collection([ + 'Messages' => [ + [ + 'MessageId' => 'receiveMessageResult1Id', + 'ReceiptHandle' => 'receiveMessageResult1Handle', + 'Body' => json_encode(FixtureHelper::getMailMessage()), + ], + ], + ]); + $receiveMessageResult2 = new Collection([ + // no message(s) returned by Amazon SQS + ]); + + /** @var SqsClient $sqsClient */ + $sqsClient = Mockery::mock('\Aws\Sqs\SqsClient') + ->shouldReceive('createQueue') + ->with(Mockery::mustBe([ + 'QueueName' => 'testing_queue', + ])) + ->andReturn($createQueueResult) + ->shouldReceive('sendMessage') + ->with(Mockery::mustBe([ + 'QueueUrl' => 'http://queue.url/path/', + 'MessageBody' => json_encode(FixtureHelper::getMailMessage()), + 'DelaySeconds' => null, + ])) + ->andReturn($sendMessageResult) + ->shouldReceive('getQueueAttributes') + ->with(Mockery::mustBe([ + 'QueueUrl' => 'http://queue.url/path/', + 'AttributeNames' => ['ApproximateNumberOfMessages'], + ])) + ->andReturn($getQueueAttributesResult1, $getQueueAttributesResult2) + ->shouldReceive('receiveMessage') + ->with(Mockery::mustBe([ + 'QueueUrl' => 'http://queue.url/path/', + ])) + ->andReturn($receiveMessageResult1, $receiveMessageResult2) + ->shouldReceive('deleteMessage') + ->with(Mockery::mustBe([ + 'QueueUrl' => 'http://queue.url/path/', + 'ReceiptHandle' => 'receiveMessageResult1Handle', + ])) + ->getMock(); + + /** @var SqsQueueStoreConnection $sqsQueueStoreConnection */ + $sqsQueueStoreConnection = Mockery::mock('\Da\Mailer\Queue\Backend\Sqs\SqsQueueStoreConnection') + ->shouldReceive('connect') + ->andReturnSelf() + ->shouldReceive('getInstance') + ->andReturn($sqsClient) + ->getMock(); + + $this->sqsQueueStore = new SqsQueueStoreAdapter($sqsQueueStoreConnection, 'testing_queue'); + } + + public function tearDown() + { + parent::tearDown(); + + Mockery::close(); + } + + public function testEnqueueDequeueAndAcknowledge() + { + $mailJob = FixtureHelper::getSqsMailJob(); + + $this->assertSame($this->sqsQueueStore, $this->sqsQueueStore->init()); + + $this->assertTrue($this->sqsQueueStore->enqueue($mailJob)); + + $this->assertTrue($this->sqsQueueStore->isEmpty() === false); + + $mailJob = $this->sqsQueueStore->dequeue(); + $this->assertNull($this->sqsQueueStore->dequeue()); + + $this->assertTrue($this->sqsQueueStore->isEmpty() === true); + + $this->assertTrue(!empty($mailJob->getMessage())); + + $dequeuedMailMessage = MailMessage::fromArray(json_decode($mailJob->getMessage(), true)); + + $this->assertEquals(FixtureHelper::getMailMessage(), $dequeuedMailMessage); + + $mailJob->setDeleted(true); + $this->sqsQueueStore->ack($mailJob); + + $this->assertTrue($this->sqsQueueStore->dequeue() === null); + } + + /** + * @expectedException \BadMethodCallException + */ + public function testBadMethodCallExceptionOnAck() + { + $mailJob = FixtureHelper::getPdoMailJob(); + $this->sqsQueueStore->ack($mailJob); + } +} From fca25125e4d1bde176636dc2ad7f54fbb7e98763 Mon Sep 17 00:00:00 2001 From: resurtm Date: Sat, 16 Jan 2016 01:30:18 +0600 Subject: [PATCH 5/9] Fix minor SQS bug --- src/Queue/Backend/Sqs/SqsMailJob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Queue/Backend/Sqs/SqsMailJob.php b/src/Queue/Backend/Sqs/SqsMailJob.php index b1da3ae..a166860 100644 --- a/src/Queue/Backend/Sqs/SqsMailJob.php +++ b/src/Queue/Backend/Sqs/SqsMailJob.php @@ -124,7 +124,7 @@ public function setDelaySeconds($delaySeconds) */ public function getVisibilityTimeout() { - return $this->message; + return $this->visibilityTimeout; } /** From c598e5ce95d2e49d645e753ab22278387474eb86 Mon Sep 17 00:00:00 2001 From: resurtm Date: Sat, 16 Jan 2016 01:34:19 +0600 Subject: [PATCH 6/9] More SQS tests --- tests/Fixture/FixtureHelper.php | 2 +- tests/Queue/Sqs/SqsQueueStoreAdapterTest.php | 103 +++++++++++++++---- 2 files changed, 83 insertions(+), 22 deletions(-) diff --git a/tests/Fixture/FixtureHelper.php b/tests/Fixture/FixtureHelper.php index 4c955af..3487484 100644 --- a/tests/Fixture/FixtureHelper.php +++ b/tests/Fixture/FixtureHelper.php @@ -32,7 +32,7 @@ public static function getMySqlConnectionConfiguration() return [ 'connectionString' => 'mysql:host=localhost;dbname=mail_queue_test', 'username' => 'root', - 'password' => '' + 'password' => '123123' ]; } diff --git a/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php b/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php index 3911122..81b881b 100644 --- a/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php +++ b/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php @@ -15,12 +15,10 @@ class SqsQueueStoreAdapterTest extends PHPUnit_Framework_TestCase /** * @var SqsQueueStoreAdapter */ - private $sqsQueueStore; + private $sqsQueueStore1, $sqsQueueStore2; protected function setUp() { - parent::setUp(); - $createQueueResult = new Collection([ 'MessageId' => 'createQueueResultId', 'QueueUrl' => 'http://queue.url/path/', @@ -56,11 +54,12 @@ protected function setUp() // no message(s) returned by Amazon SQS ]); - /** @var SqsClient $sqsClient */ - $sqsClient = Mockery::mock('\Aws\Sqs\SqsClient') + // prepare queue store 1 - begin + /** @var SqsClient $sqsClient1 */ + $sqsClient1 = Mockery::mock('\Aws\Sqs\SqsClient') ->shouldReceive('createQueue') ->with(Mockery::mustBe([ - 'QueueName' => 'testing_queue', + 'QueueName' => 'testing_queue_1', ])) ->andReturn($createQueueResult) ->shouldReceive('sendMessage') @@ -88,38 +87,84 @@ protected function setUp() ])) ->getMock(); - /** @var SqsQueueStoreConnection $sqsQueueStoreConnection */ - $sqsQueueStoreConnection = Mockery::mock('\Da\Mailer\Queue\Backend\Sqs\SqsQueueStoreConnection') + /** @var SqsQueueStoreConnection $sqsQueueStoreConnection1 */ + $sqsQueueStoreConnection1 = Mockery::mock('\Da\Mailer\Queue\Backend\Sqs\SqsQueueStoreConnection') ->shouldReceive('connect') ->andReturnSelf() ->shouldReceive('getInstance') - ->andReturn($sqsClient) + ->andReturn($sqsClient1) ->getMock(); - $this->sqsQueueStore = new SqsQueueStoreAdapter($sqsQueueStoreConnection, 'testing_queue'); + $this->sqsQueueStore1 = new SqsQueueStoreAdapter($sqsQueueStoreConnection1, 'testing_queue_1'); + // prepare queue store 1 - end + + // prepare queue store 2 - begin + /** @var SqsClient $sqsClient1 */ + $sqsClient2 = Mockery::mock('\Aws\Sqs\SqsClient') + ->shouldReceive('createQueue') + ->with(Mockery::mustBe([ + 'QueueName' => 'testing_queue_2', + ])) + ->andReturn($createQueueResult) + ->shouldReceive('sendMessage') + ->with(Mockery::mustBe([ + 'QueueUrl' => 'http://queue.url/path/', + 'MessageBody' => json_encode(FixtureHelper::getMailMessage()), + 'DelaySeconds' => null, + ])) + ->andReturn($sendMessageResult) + ->shouldReceive('getQueueAttributes') + ->with(Mockery::mustBe([ + 'QueueUrl' => 'http://queue.url/path/', + 'AttributeNames' => ['ApproximateNumberOfMessages'], + ])) + ->andReturn($getQueueAttributesResult1, $getQueueAttributesResult2, $getQueueAttributesResult1) + ->shouldReceive('receiveMessage') + ->with(Mockery::mustBe([ + 'QueueUrl' => 'http://queue.url/path/', + ])) + ->andReturn($receiveMessageResult1, $receiveMessageResult2) + ->shouldReceive('changeMessageVisibility') + ->with(Mockery::mustBe([ + 'QueueUrl' => 'http://queue.url/path/', + 'ReceiptHandle' => 'receiveMessageResult1Handle', + 'VisibilityTimeout' => 5, + ])) + ->getMock(); + + /** @var SqsQueueStoreConnection $sqsQueueStoreConnection1 */ + $sqsQueueStoreConnection1 = Mockery::mock('\Da\Mailer\Queue\Backend\Sqs\SqsQueueStoreConnection') + ->shouldReceive('connect') + ->andReturnSelf() + ->shouldReceive('getInstance') + ->andReturn($sqsClient2) + ->getMock(); + + $this->sqsQueueStore2 = new SqsQueueStoreAdapter($sqsQueueStoreConnection1, 'testing_queue_2'); + // prepare queue store 2 - end } public function tearDown() { - parent::tearDown(); - Mockery::close(); + + parent::tearDown(); } public function testEnqueueDequeueAndAcknowledge() { $mailJob = FixtureHelper::getSqsMailJob(); - $this->assertSame($this->sqsQueueStore, $this->sqsQueueStore->init()); + $this->assertSame($this->sqsQueueStore1, $this->sqsQueueStore1->init()); - $this->assertTrue($this->sqsQueueStore->enqueue($mailJob)); + $this->assertTrue($this->sqsQueueStore1->enqueue($mailJob)); - $this->assertTrue($this->sqsQueueStore->isEmpty() === false); + $this->assertTrue($this->sqsQueueStore1->isEmpty() === false); - $mailJob = $this->sqsQueueStore->dequeue(); - $this->assertNull($this->sqsQueueStore->dequeue()); + $mailJob = $this->sqsQueueStore1->dequeue(); + $this->assertNull($this->sqsQueueStore1->dequeue()); - $this->assertTrue($this->sqsQueueStore->isEmpty() === true); + $this->assertTrue($this->sqsQueueStore1->isEmpty() === true); $this->assertTrue(!empty($mailJob->getMessage())); @@ -128,9 +173,25 @@ public function testEnqueueDequeueAndAcknowledge() $this->assertEquals(FixtureHelper::getMailMessage(), $dequeuedMailMessage); $mailJob->setDeleted(true); - $this->sqsQueueStore->ack($mailJob); + $this->sqsQueueStore1->ack($mailJob); + + $this->assertTrue($this->sqsQueueStore1->dequeue() === null); + } + + public function testAcknowledgementToUpdateMailJobs() + { + $mailJob = FixtureHelper::getSqsMailJob(); - $this->assertTrue($this->sqsQueueStore->dequeue() === null); + $this->sqsQueueStore2->enqueue($mailJob); + $this->assertTrue($this->sqsQueueStore2->isEmpty() === false); + $dequedMailJob = $this->sqsQueueStore2->dequeue(); + $this->assertNull($this->sqsQueueStore2->dequeue()); + $this->assertTrue($this->sqsQueueStore2->isEmpty() === true); + // set visibility timeout to five seconds + $dequedMailJob->setVisibilityTimeout(5); + $this->assertEquals(5, $dequedMailJob->getVisibilityTimeout()); + $this->sqsQueueStore2->ack($dequedMailJob); + $this->assertTrue($this->sqsQueueStore2->isEmpty() === false); } /** @@ -139,6 +200,6 @@ public function testEnqueueDequeueAndAcknowledge() public function testBadMethodCallExceptionOnAck() { $mailJob = FixtureHelper::getPdoMailJob(); - $this->sqsQueueStore->ack($mailJob); + $this->sqsQueueStore1->ack($mailJob); } } From ecbe4415affc02db6d74ada0afcca324a48f7acb Mon Sep 17 00:00:00 2001 From: resurtm Date: Sat, 16 Jan 2016 01:38:09 +0600 Subject: [PATCH 7/9] Full coverage for SQS --- tests/Queue/Sqs/SqsQueueStoreAdapterTest.php | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php b/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php index 81b881b..55391d8 100644 --- a/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php +++ b/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php @@ -163,6 +163,7 @@ public function testEnqueueDequeueAndAcknowledge() $mailJob = $this->sqsQueueStore1->dequeue(); $this->assertNull($this->sqsQueueStore1->dequeue()); + $this->assertEquals('receiveMessageResult1Id', $mailJob->getId()); $this->assertTrue($this->sqsQueueStore1->isEmpty() === true); @@ -194,6 +195,19 @@ public function testAcknowledgementToUpdateMailJobs() $this->assertTrue($this->sqsQueueStore2->isEmpty() === false); } + public function testDoNothingWithMailJob() + { + $mailJob = FixtureHelper::getSqsMailJob(); + + $this->sqsQueueStore2->enqueue($mailJob); + $this->assertTrue($this->sqsQueueStore2->isEmpty() === false); + $dequedMailJob = $this->sqsQueueStore2->dequeue(); + $this->assertNull($this->sqsQueueStore2->dequeue()); + $this->assertTrue($this->sqsQueueStore2->isEmpty() === true); + $this->assertFalse($this->sqsQueueStore2->ack($dequedMailJob)); + $this->assertTrue($this->sqsQueueStore2->isEmpty() === false); + } + /** * @expectedException \BadMethodCallException */ @@ -202,4 +216,15 @@ public function testBadMethodCallExceptionOnAck() $mailJob = FixtureHelper::getPdoMailJob(); $this->sqsQueueStore1->ack($mailJob); } + + /** + * @expectedException \BadMethodCallException + */ + public function testBadMethodCallExceptionOnSetDelaySeconds() + { + $mailJob = FixtureHelper::getSqsMailJob(); + $mailJob->setDelaySeconds(900); + $this->assertEquals(900, $mailJob->getDelaySeconds()); + $mailJob->setDelaySeconds(901); + } } From dcd18e4f3ac5110fbe8174d1402f8579855f8d19 Mon Sep 17 00:00:00 2001 From: resurtm Date: Sat, 16 Jan 2016 01:41:11 +0600 Subject: [PATCH 8/9] SQS tests cleanup --- tests/Queue/Sqs/SqsQueueStoreAdapterTest.php | 26 ++++++++++++-------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php b/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php index 55391d8..0161ec5 100644 --- a/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php +++ b/tests/Queue/Sqs/SqsQueueStoreAdapterTest.php @@ -19,6 +19,7 @@ class SqsQueueStoreAdapterTest extends PHPUnit_Framework_TestCase protected function setUp() { + // prepare sqs response collections - begin $createQueueResult = new Collection([ 'MessageId' => 'createQueueResultId', 'QueueUrl' => 'http://queue.url/path/', @@ -53,6 +54,9 @@ protected function setUp() $receiveMessageResult2 = new Collection([ // no message(s) returned by Amazon SQS ]); + // prepare sqs response collections - end + + // ------------------------------------------------------------ // prepare queue store 1 - begin /** @var SqsClient $sqsClient1 */ @@ -98,6 +102,8 @@ protected function setUp() $this->sqsQueueStore1 = new SqsQueueStoreAdapter($sqsQueueStoreConnection1, 'testing_queue_1'); // prepare queue store 1 - end + // ------------------------------------------------------------ + // prepare queue store 2 - begin /** @var SqsClient $sqsClient1 */ $sqsClient2 = Mockery::mock('\Aws\Sqs\SqsClient') @@ -159,13 +165,13 @@ public function testEnqueueDequeueAndAcknowledge() $this->assertTrue($this->sqsQueueStore1->enqueue($mailJob)); - $this->assertTrue($this->sqsQueueStore1->isEmpty() === false); + $this->assertFalse($this->sqsQueueStore1->isEmpty()); $mailJob = $this->sqsQueueStore1->dequeue(); $this->assertNull($this->sqsQueueStore1->dequeue()); - $this->assertEquals('receiveMessageResult1Id', $mailJob->getId()); + $this->assertSame('receiveMessageResult1Id', $mailJob->getId()); - $this->assertTrue($this->sqsQueueStore1->isEmpty() === true); + $this->assertTrue($this->sqsQueueStore1->isEmpty()); $this->assertTrue(!empty($mailJob->getMessage())); @@ -176,7 +182,7 @@ public function testEnqueueDequeueAndAcknowledge() $mailJob->setDeleted(true); $this->sqsQueueStore1->ack($mailJob); - $this->assertTrue($this->sqsQueueStore1->dequeue() === null); + $this->assertNull($this->sqsQueueStore1->dequeue()); } public function testAcknowledgementToUpdateMailJobs() @@ -184,15 +190,15 @@ public function testAcknowledgementToUpdateMailJobs() $mailJob = FixtureHelper::getSqsMailJob(); $this->sqsQueueStore2->enqueue($mailJob); - $this->assertTrue($this->sqsQueueStore2->isEmpty() === false); + $this->assertFalse($this->sqsQueueStore2->isEmpty()); $dequedMailJob = $this->sqsQueueStore2->dequeue(); $this->assertNull($this->sqsQueueStore2->dequeue()); - $this->assertTrue($this->sqsQueueStore2->isEmpty() === true); + $this->assertTrue($this->sqsQueueStore2->isEmpty()); // set visibility timeout to five seconds $dequedMailJob->setVisibilityTimeout(5); $this->assertEquals(5, $dequedMailJob->getVisibilityTimeout()); $this->sqsQueueStore2->ack($dequedMailJob); - $this->assertTrue($this->sqsQueueStore2->isEmpty() === false); + $this->assertFalse($this->sqsQueueStore2->isEmpty()); } public function testDoNothingWithMailJob() @@ -200,12 +206,12 @@ public function testDoNothingWithMailJob() $mailJob = FixtureHelper::getSqsMailJob(); $this->sqsQueueStore2->enqueue($mailJob); - $this->assertTrue($this->sqsQueueStore2->isEmpty() === false); + $this->assertFalse($this->sqsQueueStore2->isEmpty()); $dequedMailJob = $this->sqsQueueStore2->dequeue(); $this->assertNull($this->sqsQueueStore2->dequeue()); - $this->assertTrue($this->sqsQueueStore2->isEmpty() === true); + $this->assertTrue($this->sqsQueueStore2->isEmpty()); $this->assertFalse($this->sqsQueueStore2->ack($dequedMailJob)); - $this->assertTrue($this->sqsQueueStore2->isEmpty() === false); + $this->assertFalse($this->sqsQueueStore2->isEmpty()); } /** From bb66652f56844fe3cc2481d2627881ec499848cd Mon Sep 17 00:00:00 2001 From: resurtm Date: Sat, 16 Jan 2016 01:43:30 +0600 Subject: [PATCH 9/9] Remove invalid credentials --- tests/Fixture/FixtureHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Fixture/FixtureHelper.php b/tests/Fixture/FixtureHelper.php index 3487484..df90da7 100644 --- a/tests/Fixture/FixtureHelper.php +++ b/tests/Fixture/FixtureHelper.php @@ -32,7 +32,7 @@ public static function getMySqlConnectionConfiguration() return [ 'connectionString' => 'mysql:host=localhost;dbname=mail_queue_test', 'username' => 'root', - 'password' => '123123' + 'password' => '', ]; }