[dbal] Run functional tests with PostgresSQL

Author: makasim

docker-compose.yml

@@ -6,6 +6,7 @@ services:
     depends_on:
       - rabbitmq
       - mysql
+      - postgres
       - redis
       - beanstalkd
       - gearmand
@@ -26,7 +27,9 @@ services:
       - RABITMQ_STOMP_DSN=stomp+rabbitmq://guest:guest@rabbitmq:61613/mqdev
       - RABBITMQ_MANAGMENT_DSN=http://guest:guest@rabbitmq:15672/mqdev
       - DOCTRINE_DSN=mysql://root:rootpass@mysql/mqdev
+      - DOCTRINE_POSTGRES_DSN=postgres://postgres:pass@postgres/template1
       - MYSQL_DSN=mysql://root:rootpass@mysql/mqdev
+      - POSTGRES_DSN=postgres://postgres:pass@postgres/postgres
       - PREDIS_DSN=redis+predis://redis
       - PHPREDIS_DSN=redis+phpredis://redis
       - GPS_DSN=gps:?projectId=mqdev&emulatorHost=http://google-pubsub:8085
@@ -77,6 +80,13 @@ services:
       MYSQL_ROOT_PASSWORD: rootpass
       MYSQL_DATABASE: mqdev
 
+  postgres:
+    image: postgres
+    environment:
+      POSTGRES_PASSWORD: pass
+    ports:
+      - "5432:5432"
+
   generate-changelog:
     image: enqueue/generate-changelog:latest
     # build: { context: docker, dockerfile: Dockerfile.generate-changelog }

docker/Dockerfile

@@ -3,7 +3,7 @@ FROM formapro/nginx-php-fpm:latest-all-exts
 ## libs
 RUN set -x && \
     apt-get update && \
-    apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php-dev php-redis git python
+    apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php-dev php-redis php-pgsql git python
 
 RUN set -x && \
     apt-get update && \

docker/bin/refresh-postgres-database.php

@@ -0,0 +1,14 @@
+<?php
+
+use Enqueue\Dbal\DbalConnectionFactory;
+
+require_once getcwd().'/vendor/autoload.php';
+
+$dsn = getenv('DOCTRINE_POSTGRES_DSN');
+
+$dbalContext = (new DbalConnectionFactory($dsn))->createContext();
+
+$dbalContext->getDbalConnection()->getSchemaManager()->dropAndCreateDatabase('postgres');
+$dbalContext->createDataBaseTable();
+
+echo 'Postgresql Database is updated'.PHP_EOL;

docker/bin/test.sh

@@ -32,6 +32,7 @@ trap "FORCE_EXIT=true" SIGTERM SIGINT
 waitForService rabbitmq 5672 50
 waitForService rabbitmqssl 5671 50
 waitForService mysql 3306 50
+waitForService postgres 5432 50
 waitForService redis 6379 50
 waitForService beanstalkd 11300 50
 waitForService gearmand 4730 50
@@ -40,9 +41,10 @@ waitForService mongo 27017 50
 waitForService thruway 9090 50
 waitForService localstack 4576 50
 
-php docker/bin/refresh-mysql-database.php
-php pkg/job-queue/Tests/Functional/app/console doctrine:database:create --if-not-exists
-php pkg/job-queue/Tests/Functional/app/console doctrine:schema:update --force
+php docker/bin/refresh-mysql-database.php || exit 1
+php docker/bin/refresh-postgres-database.php  || exit 1
+php pkg/job-queue/Tests/Functional/app/console doctrine:database:create --if-not-exists || exit 1
+php pkg/job-queue/Tests/Functional/app/console doctrine:schema:update --force || exit 1
 
 #php pkg/enqueue-bundle/Tests/Functional/app/console.php config:dump-reference  enqueue
 bin/phpunit "$@"

pkg/dbal/Tests/Functional/DbalConsumerTest.php

@@ -6,7 +6,7 @@
 
 use Enqueue\Dbal\DbalContext;
 use Enqueue\Dbal\DbalMessage;
-use Enqueue\Dbal\Tests\Spec\CreateDbalContextTrait;
+use Enqueue\Dbal\Tests\Spec\Mysql\CreateDbalContextTrait;
 use PHPUnit\Framework\TestCase;
 
 /**

pkg/dbal/Tests/Spec/CreateDbalContextTrait.php renamed to pkg/dbal/Tests/Spec/Mysql/CreateDbalContextTrait.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Enqueue\Dbal\DbalConnectionFactory;
 

pkg/dbal/Tests/Spec/DbalContextTest.php renamed to pkg/dbal/Tests/Spec/Mysql/DbalContextTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Interop\Queue\Spec\ContextSpec;
 

pkg/dbal/Tests/Spec/DbalProducerTest.php renamed to pkg/dbal/Tests/Spec/Mysql/DbalProducerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Interop\Queue\Spec\ProducerSpec;
 

pkg/dbal/Tests/Spec/DbalRequeueMessageTest.php renamed to pkg/dbal/Tests/Spec/Mysql/DbalRequeueMessageTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Interop\Queue\Spec\RequeueMessageSpec;
 

pkg/dbal/Tests/Spec/DbalSendAndReceiveDelayedMessageFromQueueTest.php renamed to pkg/dbal/Tests/Spec/Mysql/DbalSendAndReceiveDelayedMessageFromQueueTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Interop\Queue\Spec\SendAndReceiveDelayedMessageFromQueueSpec;
 

pkg/dbal/Tests/Spec/DbalSendAndReceivePriorityMessagesFromQueueTest.php renamed to pkg/dbal/Tests/Spec/Mysql/DbalSendAndReceivePriorityMessagesFromQueueTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Enqueue\Dbal\DbalContext;
 use Enqueue\Dbal\DbalMessage;

pkg/dbal/Tests/Spec/DbalSendAndReceiveTimeToLiveMessagesFromQueueTest.php renamed to pkg/dbal/Tests/Spec/Mysql/DbalSendAndReceiveTimeToLiveMessagesFromQueueTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Interop\Queue\Spec\SendAndReceiveTimeToLiveMessagesFromQueueSpec;
 

pkg/dbal/Tests/Spec/DbalSendToAndReceiveFromQueueTest.php renamed to pkg/dbal/Tests/Spec/Mysql/DbalSendToAndReceiveFromQueueTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec;
 

pkg/dbal/Tests/Spec/DbalSendToAndReceiveFromTopicTest.php renamed to pkg/dbal/Tests/Spec/Mysql/DbalSendToAndReceiveFromTopicTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Interop\Queue\Spec\SendToAndReceiveFromTopicSpec;
 

pkg/dbal/Tests/Spec/DbalSendToAndReceiveNoWaitFromQueueTest.php renamed to pkg/dbal/Tests/Spec/Mysql/DbalSendToAndReceiveNoWaitFromQueueTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Interop\Queue\Spec\SendToAndReceiveNoWaitFromQueueSpec;
 

pkg/dbal/Tests/Spec/DbalSendToAndReceiveNoWaitFromTopicTest.php renamed to pkg/dbal/Tests/Spec/Mysql/DbalSendToAndReceiveNoWaitFromTopicTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Interop\Queue\Spec\SendToAndReceiveNoWaitFromTopicSpec;
 

pkg/dbal/Tests/Spec/DbalSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php renamed to pkg/dbal/Tests/Spec/Mysql/DbalSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Enqueue\Dbal\DbalContext;
 use Interop\Queue\Context;

pkg/dbal/Tests/Spec/DbalSubscriptionConsumerConsumeUntilUnsubscribedTest.php renamed to pkg/dbal/Tests/Spec/Mysql/DbalSubscriptionConsumerConsumeUntilUnsubscribedTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Enqueue\Dbal\DbalContext;
 use Interop\Queue\Context;

pkg/dbal/Tests/Spec/DbalSubscriptionConsumerStopOnFalseTest.php renamed to pkg/dbal/Tests/Spec/Mysql/DbalSubscriptionConsumerStopOnFalseTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Enqueue\Dbal\Tests\Spec;
+namespace Enqueue\Dbal\Tests\Spec\Mysql;
 
 use Enqueue\Dbal\DbalContext;
 use Interop\Queue\Context;

pkg/dbal/Tests/Spec/Postgresql/CreateDbalContextTrait.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Enqueue\Dbal\Tests\Spec\Postgresql;
+
+use Enqueue\Dbal\DbalConnectionFactory;
+
+trait CreateDbalContextTrait
+{
+    protected function createDbalContext()
+    {
+        if (false == $env = getenv('POSTGRES_DSN')) {
+            $this->markTestSkipped('The POSTGRES_DSN env is not available. Skip tests');
+        }
+
+        $factory = new DbalConnectionFactory($env);
+
+        $context = $factory->createContext();
+
+        if ($context->getDbalConnection()->getSchemaManager()->tablesExist([$context->getTableName()])) {
+            $context->getDbalConnection()->getSchemaManager()->dropTable($context->getTableName());
+        }
+
+        $context->createDataBaseTable();
+
+        return $context;
+    }
+}

pkg/dbal/Tests/Spec/Postgresql/DbalContextTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Enqueue\Dbal\Tests\Spec\Postgresql;
+
+use Interop\Queue\Spec\ContextSpec;
+
+/**
+ * @group functional
+ */
+class DbalContextTest extends ContextSpec
+{
+    use CreateDbalContextTrait;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function createContext()
+    {
+        return $this->createDbalContext();
+    }
+}

pkg/dbal/Tests/Spec/Postgresql/DbalProducerTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Enqueue\Dbal\Tests\Spec\Postgresql;
+
+use Interop\Queue\Spec\ProducerSpec;
+
+/**
+ * @group functional
+ */
+class DbalProducerTest extends ProducerSpec
+{
+    use CreateDbalContextTrait;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function createProducer()
+    {
+        return $this->createDbalContext()->createProducer();
+    }
+}

pkg/dbal/Tests/Spec/Postgresql/DbalRequeueMessageTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Enqueue\Dbal\Tests\Spec\Postgresql;
+
+use Interop\Queue\Spec\RequeueMessageSpec;
+
+/**
+ * @group functional
+ */
+class DbalRequeueMessageTest extends RequeueMessageSpec
+{
+    use CreateDbalContextTrait;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function createContext()
+    {
+        return $this->createDbalContext();
+    }
+}

pkg/dbal/Tests/Spec/Postgresql/DbalSendAndReceiveDelayedMessageFromQueueTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Enqueue\Dbal\Tests\Spec\Postgresql;
+
+use Interop\Queue\Spec\SendAndReceiveDelayedMessageFromQueueSpec;
+
+/**
+ * @group functional
+ */
+class DbalSendAndReceiveDelayedMessageFromQueueTest extends SendAndReceiveDelayedMessageFromQueueSpec
+{
+    use CreateDbalContextTrait;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function createContext()
+    {
+        return $this->createDbalContext();
+    }
+}

pkg/dbal/Tests/Spec/Postgresql/DbalSendAndReceivePriorityMessagesFromQueueTest.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Enqueue\Dbal\Tests\Spec\Postgresql;
+
+use Enqueue\Dbal\DbalContext;
+use Enqueue\Dbal\DbalMessage;
+use Interop\Queue\Context;
+use Interop\Queue\Spec\SendAndReceivePriorityMessagesFromQueueSpec;
+
+/**
+ * @group functional
+ */
+class DbalSendAndReceivePriorityMessagesFromQueueTest extends SendAndReceivePriorityMessagesFromQueueSpec
+{
+    use CreateDbalContextTrait;
+
+    private $publishedAt;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->publishedAt = (int) (microtime(true) * 10000);
+    }
+
+    /**
+     * @return Context
+     */
+    protected function createContext()
+    {
+        return $this->createDbalContext();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param DbalContext $context
+     *
+     * @return DbalMessage
+     */
+    protected function createMessage(Context $context, $body)
+    {
+        /** @var DbalMessage $message */
+        $message = parent::createMessage($context, $body);
+
+        // in order to test priorities correctly we have to make sure the messages were sent in the same time.
+        $message->setPublishedAt($this->publishedAt);
+
+        return $message;
+    }
+}

pkg/dbal/Tests/Spec/Postgresql/DbalSendAndReceiveTimeToLiveMessagesFromQueueTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Enqueue\Dbal\Tests\Spec\Postgresql;
+
+use Interop\Queue\Spec\SendAndReceiveTimeToLiveMessagesFromQueueSpec;
+
+/**
+ * @group functional
+ */
+class DbalSendAndReceiveTimeToLiveMessagesFromQueueTest extends SendAndReceiveTimeToLiveMessagesFromQueueSpec
+{
+    use CreateDbalContextTrait;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function createContext()
+    {
+        return $this->createDbalContext();
+    }
+}