Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add message spec test case #102

Merged
merged 4 commits into from
May 25, 2017
Merged

Add message spec test case #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20be1c2
[psr] add message trait, add get\set dest to message interface
makasim May 24, 2017
0bf1b27
Add message spec
makasim May 25, 2017
2dfef3b
php cs fixes
makasim May 25, 2017
7dbc9fd
Add body, properties and headers to client's message constructor.
makasim May 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkg/amqp-ext/AmqpMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class AmqpMessage implements PsrMessage
* @param array $properties
* @param array $headers
*/
public function __construct($body = null, array $properties = [], array $headers = [])
public function __construct($body = '', array $properties = [], array $headers = [])
{
$this->body = $body;
$this->properties = $properties;
Expand Down Expand Up @@ -189,7 +189,9 @@ public function getMessageId()
*/
public function getTimestamp()
{
return $this->getHeader('timestamp');
$value = $this->getHeader('timestamp');

return $value === null ? null : (int) $value;
}

/**
Expand Down
99 changes: 5 additions & 94 deletions pkg/amqp-ext/Tests/AmqpMessageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function testCouldBeConstructedWithoutArguments()
{
$message = new AmqpMessage();

$this->assertNull($message->getBody());
$this->assertSame('', $message->getBody());
$this->assertSame([], $message->getProperties());
$this->assertSame([], $message->getHeaders());
}
Expand All @@ -34,131 +34,42 @@ public function testCouldBeConstructedWithOptionalArguments()
$this->assertSame(['fooHeader' => 'fooHeaderVal'], $message->getHeaders());
}

public function testShouldSetRedeliveredToFalseInConstructor()
{
$message = new AmqpMessage();

$this->assertSame(false, $message->isRedelivered());
}

public function testShouldSetNoParamFlagInConstructor()
{
$message = new AmqpMessage();

$this->assertSame(\AMQP_NOPARAM, $message->getFlags());
}

public function testShouldReturnPreviouslySetBody()
{
$message = new AmqpMessage();

$message->setBody('theBody');

$this->assertSame('theBody', $message->getBody());
}

public function testShouldReturnPreviouslySetProperties()
{
$message = new AmqpMessage();

$message->setProperties(['foo' => 'fooVal', 'bar' => 'barVal']);

$this->assertSame(['foo' => 'fooVal', 'bar' => 'barVal'], $message->getProperties());
}

public function testShouldReturnPreviouslySetProperty()
{
$message = new AmqpMessage(null, ['foo' => 'fooVal']);

$message->setProperty('bar', 'barVal');

$this->assertSame(['foo' => 'fooVal', 'bar' => 'barVal'], $message->getProperties());
}

public function testShouldReturnSinglePreviouslySetProperty()
{
$message = new AmqpMessage();

$this->assertSame(null, $message->getProperty('bar'));
$this->assertSame('default', $message->getProperty('bar', 'default'));

$message->setProperty('bar', 'barVal');
$this->assertSame('barVal', $message->getProperty('bar'));
}

public function testShouldReturnPreviouslySetHeaders()
{
$message = new AmqpMessage();

$message->setHeaders(['foo' => 'fooVal', 'bar' => 'barVal']);

$this->assertSame(['foo' => 'fooVal', 'bar' => 'barVal'], $message->getHeaders());
}

public function testShouldReturnPreviouslySetHeader()
{
$message = new AmqpMessage(null, [], ['foo' => 'fooVal']);

$message->setHeader('bar', 'barVal');

$this->assertSame(['foo' => 'fooVal', 'bar' => 'barVal'], $message->getHeaders());
}

public function testShouldReturnSinglePreviouslySetHeader()
{
$message = new AmqpMessage();

$this->assertSame(null, $message->getHeader('bar'));
$this->assertSame('default', $message->getHeader('bar', 'default'));

$message->setHeader('bar', 'barVal');
$this->assertSame('barVal', $message->getHeader('bar'));
}

public function testShouldReturnPreviouslySetRedelivered()
{
$message = new AmqpMessage();

$message->setRedelivered(true);
$this->assertSame(true, $message->isRedelivered());

$message->setRedelivered(false);
$this->assertSame(false, $message->isRedelivered());
}

public function testShouldReturnPreviouslySetCorrelationId()
public function testShouldSetCorrelationIdAsHeader()
{
$message = new AmqpMessage();
$message->setCorrelationId('theCorrelationId');

$this->assertSame('theCorrelationId', $message->getCorrelationId());
$this->assertSame(['correlation_id' => 'theCorrelationId'], $message->getHeaders());
}

public function testShouldReturnPreviouslySetMessageId()
public function testShouldSetSetMessageIdAsHeader()
{
$message = new AmqpMessage();
$message->setMessageId('theMessageId');

$this->assertSame('theMessageId', $message->getMessageId());
$this->assertSame(['message_id' => 'theMessageId'], $message->getHeaders());
}

public function testShouldReturnPreviouslySetTimestamp()
public function testShouldSetTimestampAsHeader()
{
$message = new AmqpMessage();
$message->setTimestamp('theTimestamp');

$this->assertSame('theTimestamp', $message->getTimestamp());
$this->assertSame(['timestamp' => 'theTimestamp'], $message->getHeaders());
}

public function testShouldReturnPreviouslySetReplyTo()
public function testShouldSetReplyToAsHeader()
{
$message = new AmqpMessage();
$message->setReplyTo('theReply');

$this->assertSame('theReply', $message->getReplyTo());
$this->assertSame(['reply_to' => 'theReply'], $message->getHeaders());
}

Expand Down
17 changes: 17 additions & 0 deletions pkg/amqp-ext/Tests/Spec/AmqpMessageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

namespace Enqueue\AmqpExt\Tests\Spec;

use Enqueue\AmqpExt\AmqpMessage;
use Enqueue\Psr\Spec\PsrMessageSpec;

class AmqpMessageTest extends PsrMessageSpec
{
/**
* {@inheritdoc}
*/
protected function createMessage()
{
return new AmqpMessage();
}
}
12 changes: 7 additions & 5 deletions pkg/dbal/DbalMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class DbalMessage implements PsrMessage
* @param array $properties
* @param array $headers
*/
public function __construct($body = null, array $properties = [], array $headers = [])
public function __construct($body = '', array $properties = [], array $headers = [])
{
$this->body = $body;
$this->properties = $properties;
Expand Down Expand Up @@ -210,7 +210,7 @@ public function setCorrelationId($correlationId)
*/
public function getCorrelationId()
{
return $this->getHeader('correlation_id', '');
return $this->getHeader('correlation_id', null);
}

/**
Expand All @@ -226,22 +226,24 @@ public function setMessageId($messageId)
*/
public function getMessageId()
{
return $this->getHeader('message_id', '');
return $this->getHeader('message_id', null);
}

/**
* {@inheritdoc}
*/
public function getTimestamp()
{
return $this->getHeader('timestamp');
$value = $this->getHeader('timestamp');

return $value === null ? null : (int) $value;
}

/**
* {@inheritdoc}
*/
public function setTimestamp($timestamp)
{
$this->setHeader('timestamp', (int) $timestamp);
$this->setHeader('timestamp', $timestamp);
}
}
105 changes: 5 additions & 100 deletions pkg/dbal/Tests/DbalMessageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,17 @@
namespace Enqueue\Dbal\Tests;

use Enqueue\Dbal\DbalMessage;
use Enqueue\Psr\PsrMessage;
use Enqueue\Test\ClassExtensionTrait;

class DbalMessageTest extends \PHPUnit_Framework_TestCase
{
use ClassExtensionTrait;

public function testShouldImplementMessageInterface()
{
$this->assertClassImplements(PsrMessage::class, DbalMessage::class);
}

public function testCouldBeConstructedWithoutArguments()
{
$message = new DbalMessage();

$this->assertNull($message->getBody());
$this->assertSame('', $message->getBody());
$this->assertSame([], $message->getProperties());
$this->assertSame([], $message->getHeaders());
}
Expand All @@ -33,13 +27,6 @@ public function testCouldBeConstructedWithOptionalArguments()
$this->assertSame(['fooHeader' => 'fooHeaderVal'], $message->getHeaders());
}

public function testShouldSetRedeliveredToFalseInConstructor()
{
$message = new DbalMessage();

$this->assertSame(false, $message->isRedelivered());
}

public function testShouldSetPriorityToZeroInConstructor()
{
$message = new DbalMessage();
Expand All @@ -54,117 +41,35 @@ public function testShouldSetDelayToNullInConstructor()
$this->assertNull($message->getDelay());
}

public function testShouldReturnPreviouslySetBody()
{
$message = new DbalMessage();

$message->setBody('theBody');

$this->assertSame('theBody', $message->getBody());
}

public function testShouldReturnPreviouslySetProperties()
{
$message = new DbalMessage();

$message->setProperties(['foo' => 'fooVal', 'bar' => 'barVal']);

$this->assertSame(['foo' => 'fooVal', 'bar' => 'barVal'], $message->getProperties());
}

public function testShouldReturnPreviouslySetProperty()
{
$message = new DbalMessage(null, ['foo' => 'fooVal']);

$message->setProperty('bar', 'barVal');

$this->assertSame(['foo' => 'fooVal', 'bar' => 'barVal'], $message->getProperties());
}

public function testShouldReturnSinglePreviouslySetProperty()
{
$message = new DbalMessage();

$this->assertSame(null, $message->getProperty('bar'));
$this->assertSame('default', $message->getProperty('bar', 'default'));

$message->setProperty('bar', 'barVal');
$this->assertSame('barVal', $message->getProperty('bar'));
}

public function testShouldReturnPreviouslySetHeaders()
{
$message = new DbalMessage();

$message->setHeaders(['foo' => 'fooVal', 'bar' => 'barVal']);

$this->assertSame(['foo' => 'fooVal', 'bar' => 'barVal'], $message->getHeaders());
}

public function testShouldReturnPreviouslySetHeader()
{
$message = new DbalMessage(null, [], ['foo' => 'fooVal']);

$message->setHeader('bar', 'barVal');

$this->assertSame(['foo' => 'fooVal', 'bar' => 'barVal'], $message->getHeaders());
}

public function testShouldReturnSinglePreviouslySetHeader()
{
$message = new DbalMessage();

$this->assertSame(null, $message->getHeader('bar'));
$this->assertSame('default', $message->getHeader('bar', 'default'));

$message->setHeader('bar', 'barVal');
$this->assertSame('barVal', $message->getHeader('bar'));
}

public function testShouldReturnPreviouslySetRedelivered()
{
$message = new DbalMessage();

$message->setRedelivered(true);
$this->assertSame(true, $message->isRedelivered());

$message->setRedelivered(false);
$this->assertSame(false, $message->isRedelivered());
}

public function testShouldReturnPreviouslySetCorrelationId()
public function testShouldSetCorrelationIdAsHeader()
{
$message = new DbalMessage();
$message->setCorrelationId('theCorrelationId');

$this->assertSame('theCorrelationId', $message->getCorrelationId());
$this->assertSame(['correlation_id' => 'theCorrelationId'], $message->getHeaders());
}

public function testShouldReturnPreviouslySetMessageId()
public function testShouldSetMessageIdAsHeader()
{
$message = new DbalMessage();
$message->setMessageId('theMessageId');

$this->assertSame('theMessageId', $message->getMessageId());
$this->assertSame(['message_id' => 'theMessageId'], $message->getHeaders());
}

public function testShouldReturnPreviouslySetTimestamp()
public function testShouldSetTimestampAsHeader()
{
$message = new DbalMessage();
$message->setTimestamp(12345);

$this->assertSame(12345, $message->getTimestamp());
$this->assertSame(['timestamp' => 12345], $message->getHeaders());
}

public function testShouldReturnPreviouslySetReplyTo()
public function testShouldSetReplyToAsHeader()
{
$message = new DbalMessage();
$message->setReplyTo('theReply');

$this->assertSame('theReply', $message->getReplyTo());
$this->assertSame(['reply_to' => 'theReply'], $message->getHeaders());
}
}