Skip to content

Commit b5a922d

Browse files
committed
add tests.
1 parent c660920 commit b5a922d

14 files changed

Lines changed: 523 additions & 111 deletions

‎composer.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"enqueue/rdkafka": "*@dev",
1818
"kwn/php-rdkafka-stubs": "^1.0.2",
1919
"enqueue/enqueue-bundle": "*@dev",
20+
"enqueue/laravel-queue": "*@dev",
2021
"enqueue/job-queue": "*@dev",
2122
"enqueue/simple-client": "*@dev",
2223
"enqueue/test": "*@dev",
@@ -76,6 +77,10 @@
7677
"type": "path",
7778
"url": "pkg/enqueue-bundle"
7879
},
80+
{
81+
"type": "path",
82+
"url": "pkg/laravel-queue"
83+
},
7984
{
8085
"type": "path",
8186
"url": "pkg/job-queue"

‎phpunit.xml.dist‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@
6161
<directory>pkg/enqueue-bundle/Tests</directory>
6262
</testsuite>
6363

64+
<testsuite name="laravel-queue">
65+
<directory>pkg/laravel-queue/Tests</directory>
66+
</testsuite>
67+
6468
<testsuite name="job-queue">
6569
<directory>pkg/job-queue/Tests</directory>
6670
</testsuite>

‎pkg/laravel-queue/.travis.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
sudo: false
2+
3+
git:
4+
depth: 1
5+
6+
language: php
7+
8+
php:
9+
- '5.6'
10+
- '7.0'
11+
12+
cache:
13+
directories:
14+
- $HOME/.composer/cache
15+
16+
install:
17+
- composer self-update
18+
- composer install --prefer-source --ignore-platform-reqs
19+
20+
script:
21+
- vendor/bin/phpunit --exclude-group=functional

pkg/laravel-queue/DsnToPsrQueueConnector.php renamed to pkg/laravel-queue/Connector.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
use Illuminate\Queue\Connectors\ConnectorInterface;
66
use function Enqueue\dsn_to_context;
77

8-
class DsnToPsrQueueConnector implements ConnectorInterface
8+
class Connector implements ConnectorInterface
99
{
1010
/**
1111
* {@inheritdoc}
1212
*/
1313
public function connect(array $config)
1414
{
15-
return new PsrQueue(
15+
return new Queue(
1616
dsn_to_context($config['dsn']),
17-
isset($config['default']) ? $config['default'] : 'default',
17+
isset($config['queue']) ? $config['queue'] : 'default',
1818
isset($config['time_to_run']) ? $config['time_to_run'] : 0
1919
);
2020
}

‎pkg/laravel-queue/EnqueueBundle.php‎

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

pkg/laravel-queue/QueueServiceProvider.php renamed to pkg/laravel-queue/EnqueueServiceProvider.php

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

33
namespace Enqueue\LaravelQueue;
44

5+
use Illuminate\Queue\QueueManager;
56
use Illuminate\Support\ServiceProvider;
67

7-
class QueueServiceProvider extends ServiceProvider
8+
class EnqueueServiceProvider extends ServiceProvider
89
{
910
/**
1011
* {@inheritdoc}
1112
*/
1213
public function boot()
1314
{
15+
/** @var QueueManager $manager */
1416
$manager = $this->app['queue'];
1517

1618
$manager->addConnector('enqueue', function () {
17-
return new DsnToPsrQueueConnector();
19+
return new Connector();
1820
});
1921
}
2022

‎pkg/laravel-queue/Job.php‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
use Illuminate\Contracts\Queue\Job as JobContract;
77
use Illuminate\Queue\Jobs\Job as BaseJob;
88
use Interop\Queue\PsrConsumer;
9+
use Interop\Queue\PsrContext;
910
use Interop\Queue\PsrMessage;
1011

1112
class Job extends BaseJob implements JobContract
1213
{
14+
/**
15+
* @var PsrContext
16+
*/
17+
private $psrContext;
18+
1319
/**
1420
* @var PsrConsumer
1521
*/
@@ -22,28 +28,20 @@ class Job extends BaseJob implements JobContract
2228

2329
/**
2430
* @param Container $container
31+
* @param PsrContext $psrContext
2532
* @param PsrConsumer $psrConsumer
2633
* @param PsrMessage $psrMessage
2734
* @param string $connectionName
2835
*/
29-
public function __construct(Container $container, PsrConsumer $psrConsumer, PsrMessage $psrMessage, $connectionName)
36+
public function __construct(Container $container, PsrContext $psrContext, PsrConsumer $psrConsumer, PsrMessage $psrMessage, $connectionName)
3037
{
3138
$this->container = $container;
39+
$this->psrContext = $psrContext;
3240
$this->psrConsumer = $psrConsumer;
3341
$this->psrMessage = $psrMessage;
3442
$this->connectionName = $connectionName;
3543
}
3644

37-
/**
38-
* {@inheritdoc}
39-
*/
40-
public function fire()
41-
{
42-
$this->psrMessage->setProperty('x-attempts', $this->attempts() + 1);
43-
44-
parent::fire();
45-
}
46-
4745
/**
4846
* {@inheritdoc}
4947
*/
@@ -59,7 +57,16 @@ public function delete()
5957
*/
6058
public function release($delay = 0)
6159
{
62-
$this->psrConsumer->reject($this->psrMessage, true);
60+
if ($delay) {
61+
throw new \LogicException('To be implemented');
62+
}
63+
64+
$requeueMessage = clone $this->psrMessage;
65+
$requeueMessage->setProperty('x-attempts', $this->attempts() + 1);
66+
67+
$this->psrContext->createProducer()->send($this->psrConsumer->getQueue(), $requeueMessage);
68+
69+
$this->psrConsumer->acknowledge($this->psrMessage);
6370
}
6471

6572
/**
Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,17 @@
33
namespace Enqueue\LaravelQueue;
44

55
use Illuminate\Contracts\Queue\Queue as QueueContract;
6-
use Illuminate\Queue\Queue;
6+
use Illuminate\Queue\Queue as BaseQueue;
77
use Interop\Queue\PsrContext;
88

9-
class PsrQueue extends Queue implements QueueContract
9+
class Queue extends BaseQueue implements QueueContract
1010
{
1111
/**
12-
* The name of the default queue.
13-
*
1412
* @var string
1513
*/
16-
protected $default;
14+
protected $queueName;
1715

1816
/**
19-
* The "time to run" for all pushed jobs.
20-
*
2117
* @var int
2218
*/
2319
protected $timeToRun;
@@ -28,13 +24,13 @@ class PsrQueue extends Queue implements QueueContract
2824

2925
/**
3026
* @param PsrContext $psrContext
31-
* @param string $default
27+
* @param string $queueName
3228
* @param int $timeToRun
3329
*/
34-
public function __construct(PsrContext $psrContext, $default, $timeToRun)
30+
public function __construct(PsrContext $psrContext, $queueName, $timeToRun)
3531
{
3632
$this->psrContext = $psrContext;
37-
$this->default = $default;
33+
$this->queueName = $queueName;
3834
$this->timeToRun = $timeToRun;
3935
}
4036

@@ -65,6 +61,7 @@ public function push($job, $data = '', $queue = null)
6561
*/
6662
public function pushOn($queue, $job, $data = '')
6763
{
64+
new \LogicException('to be implemented');
6865
}
6966

7067
/**
@@ -97,6 +94,7 @@ public function pop($queue = null)
9794
if ($psrMessage = $psrConsumer->receive(1000)) { // 1 sec
9895
return new Job(
9996
$this->container,
97+
$this->psrContext,
10098
$psrConsumer,
10199
$psrMessage,
102100
$this->connectionName
@@ -111,8 +109,24 @@ public function pop($queue = null)
111109
*
112110
* @return \Interop\Queue\PsrQueue
113111
*/
114-
public function getQueue($queue)
112+
public function getQueue($queue = null)
113+
{
114+
return $this->psrContext->createQueue($queue ?: $this->queueName);
115+
}
116+
117+
/**
118+
* @return PsrContext
119+
*/
120+
public function getPsrContext()
121+
{
122+
return $this->psrContext;
123+
}
124+
125+
/**
126+
* @return int
127+
*/
128+
public function getTimeToRun()
115129
{
116-
return $this->psrContext->createQueue($queue ?: $this->default);
130+
return $this->timeToRun;
117131
}
118132
}
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?php
2+
3+
namespace Enqueue\LaravelQueue\Tests;
4+
5+
use Enqueue\LaravelQueue\Connector;
6+
use Enqueue\LaravelQueue\Queue;
7+
use Enqueue\Null\NullContext;
8+
use Enqueue\Test\ClassExtensionTrait;
9+
use Illuminate\Queue\Connectors\ConnectorInterface;
10+
use Interop\Queue\PsrQueue;
11+
use PHPUnit\Framework\TestCase;
12+
13+
class ConnectorTest extends TestCase
14+
{
15+
use ClassExtensionTrait;
16+
17+
public function testShouldImplementConnectorInterface()
18+
{
19+
$this->assertClassImplements(ConnectorInterface::class, Connector::class);
20+
}
21+
22+
public function testCouldBeConstructedWithoutAnyArguments()
23+
{
24+
new Connector();
25+
}
26+
27+
public function testShouldReturnQueueOnConnectMethodCall()
28+
{
29+
$connector = new Connector();
30+
31+
$this->assertInstanceOf(Queue::class, $connector->connect(['dsn' => 'null://']));
32+
}
33+
34+
public function testShouldSetExpectedOptionsIfNotProvidedOnConnectMethodCall()
35+
{
36+
$connector = new Connector();
37+
38+
$queue = $connector->connect(['dsn' => 'null://']);
39+
40+
$this->assertInstanceOf(NullContext::class, $queue->getPsrContext());
41+
42+
$this->assertInstanceOf(PsrQueue::class, $queue->getQueue());
43+
$this->assertSame('default', $queue->getQueue()->getQueueName());
44+
45+
$this->assertSame(0, $queue->getTimeToRun());
46+
}
47+
48+
public function testShouldSetExpectedCustomOptionsIfProvidedOnConnectMethodCall()
49+
{
50+
$connector = new Connector();
51+
52+
$queue = $connector->connect([
53+
'dsn' => 'null://',
54+
'queue' => 'theCustomQueue',
55+
'time_to_run' => 123,
56+
]);
57+
58+
$this->assertInstanceOf(NullContext::class, $queue->getPsrContext());
59+
60+
$this->assertInstanceOf(PsrQueue::class, $queue->getQueue());
61+
$this->assertSame('theCustomQueue', $queue->getQueue()->getQueueName());
62+
63+
$this->assertSame(123, $queue->getTimeToRun());
64+
}
65+
}

0 commit comments

Comments
 (0)