1.x dev (#3)

* wip * added json based configuration, rabbitmq wip * fix travis
hrodic · Apr 25, 2020 · 8d96998 · 8d96998
1 parent 36389e0
commit 8d96998
Show file tree

Hide file tree

Showing 21 changed files with 1,015 additions and 127 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 /build/
 composer.lock
 .php_cs.cache
-phpunit.xml
+phpunit.xml
+.phpunit.result.cache
diff --git a/.integration-testing.json b/.integration-testing.json
@@ -0,0 +1,69 @@
+{
+  "pdo": {
+    "dsn": "mysql:host=localhost:3306;dbname=test;charset=utf8",
+    "user": "test",
+    "password": "test",
+    "fixtures": {
+      "beforeFirstTest": {
+        "path": "tests/fixtures/before-first-test",
+        "extension": "sql"
+      },
+      "beforeTest": {
+        "path": "tests/fixtures/before-test",
+        "extension": "sql"
+      },
+      "afterTest": {
+        "path": "tests/fixtures/after-test"
+      },
+      "afterLastTest": {
+        "path": "tests/fixtures/after-last-test"
+      }
+    }
+  },
+  "amqp": {
+    "host": "localhost",
+    "port": 5672,
+    "user": "test",
+    "password": "test",
+    "vhost": "test",
+    "fixtures": {
+      "beforeFirstTest": {
+        "purgeQueues": [
+          "test-queue"
+        ],
+        "publishMessages": [
+          {
+            "exchange": "test-exchange",
+            "queue": "test-queue",
+            "routing_key": "before-first-test",
+            "path": "tests/fixtures/before-first-test",
+            "extension": "json"
+          }
+        ]
+      },
+      "beforeTest": {
+        "purgeQueues": [
+          "test-queue"
+        ],
+        "publishMessages": [
+          {
+            "exchange": "test-exchange",
+            "queue": "test-queue",
+            "routing_key": "before-test",
+            "path": "tests/fixtures/before-test"
+          }
+        ]
+      },
+      "afterTest": {
+        "purgeQueues": [
+          "test-queue"
+        ]
+      },
+      "afterLastTest": {
+        "purgeQueues": [
+          "test-queue"
+        ]
+      }
+    }
+  }
+}
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,6 @@ cache:
   directories:
     - $HOME/.composer/cache
 
-env:
-  global:
-    - PHPUNIT_FLAGS='--testdox --verbose'
-
 sudo: false
 
 notifications:
@@ -21,6 +17,8 @@ matrix:
   fast_finish: true
 
 install:
-  - composer update
+  - make install
 
-script: vendor/bin/phpunit $PHPUNIT_FLAGS
+script:
+  - make test-unit
+  - make test-integration
diff --git a/Makefile b/Makefile
@@ -0,0 +1,19 @@
+.PHONY : install beautify up down test-unit test-integration debug-test-integration
+.DEFAULT : install
+
+install:
+	composer install -o
+beautify:
+	vendor/bin/phpcbf --standard=PSR2 src tests
+up:
+	docker-compose up -d --build
+down:
+	docker-compose down --remove-orphans
+test-unit:
+	vendor/bin/phpunit --testdox --verbose --color
+test-integration: up
+	sleep 20
+	@-vendor/bin/phpunit --color --testdox --verbose -c phpunit-integration.xml.dist
+	make down
+debug-test-integration:
+	php -dxdebug.remote_mode=jit vendor/bin/phpunit --no-coverage --color --testdox --group debug -c phpunit-integration.xml.dist
diff --git a/README.md b/README.md
@@ -34,78 +34,56 @@ composer require --dev hrodic/php-integration-testing
 
 On PHPUnit configuration XML file you must specify the extension with its configuration.
 
-If you need help with PHPUnit extensions, please refer to the [Official Documentation](https://phpunit.readthedocs.io/en/9.1/configuration.html#the-extensions-element)
-
-As an example, look into phpunit-integration.xml.dist.
-
-
-### PDO Driver
-
-If you need to test the integration of MySQL or MariaDB, use the PDO driver extension.
+You are able to specify the configuration filename that you will be using. Defaults to .integration-testing.json
 
 ```
 <extensions>
-    <extension class="IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtension">
+    <extension class="IntegrationTesting\PHPUnit\Runner\Extension\Handler">
         <arguments>
-            <object class="IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtensionConfig">
-                <arguments>
-                    <array>
-                        <element key="BEFORE_FIRST_TEST_PDO_FIXTURES_PATH">
-                            <string>tests/fixtures/before-first-test</string>
-                        </element>
-                        <element key="BEFORE_TEST_PDO_FIXTURES_PATH">
-                            <string>tests/fixtures/before-test</string>
-                        </element>
-                        <element key="AFTER_TEST_PDO_FIXTURES_PATH">
-                            <string>tests/fixtures/after-test</string>
-                        </element>
-                        <element key="AFTER_LAST_TEST_PDO_FIXTURES_PATH">
-                            <string>tests/fixtures/after-last-test</string>
-                        </element>
-                    </array>
-                </arguments>
-            </object>
-            <object class="IntegrationTesting\Driver\PDOConnection">
-                <arguments>
-                    <string>mysql:host=localhost:3306;dbname=test;charset=utf8</string>
-                    <string>test</string>
-                    <string>test</string>
-                </arguments>
-            </object>
+            <string>.integration-testing.json</string>
         </arguments>
     </extension>
 </extensions>
 ```
 
-The extension class is
-```
-IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtension
-```
+You also check phpunit-integration.xml.dist example
 
-which requires a configuration and a PDO connection as arguments via XML config
-
-The configuration class allows you to define in which paths your fixtures will be located
+If you need help with PHPUnit extensions, please refer to the [Official Documentation](https://phpunit.readthedocs.io/en/9.1/configuration.html#the-extensions-element)
 
-```
-IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtensionConfig
-```
+### PDO Fixtures
 
-The config keys to define each hook type are:
+If you need to test the integration of MySQL or MariaDB, use the PDO driver extension.
 
-* BEFORE_FIRST_TEST_PDO_FIXTURES_PATH
-* BEFORE_TEST_PDO_FIXTURES_PATH
-* AFTER_TEST_PDO_FIXTURES_PATH
-* AFTER_LAST_TEST_PDO_FIXTURES_PATH
+It requires configuration parameters that can be found in the json config file.
 
-The PDOConnection class is just a wrapper of the PDO PHP class.
+The most important parameters are DSN, username and password of your database + some fixture path definitions.
 
+Example: 
 ```
-IntegrationTesting\Driver\PDOConnection
+"pdo": {
+    "dsn": "mysql:host=localhost:3306;dbname=test;charset=utf8",
+    "user": "test",
+    "password": "test",
+    "fixtures": {
+      "beforeFirstTest": {
+        "path": "tests/fixtures/before-first-test",
+        "extension": "sql"
+      },
+      "beforeTest": {
+        "path": "tests/fixtures/before-test",
+        "extension": "sql"
+      },
+      "afterTest": {
+        "path": "tests/fixtures/after-test"
+      },
+      "afterLastTest": {
+        "path": "tests/fixtures/after-last-test"
+      }
+    }
+},
 ```
 
-It requires DSN, username and password of your database.
-
-### RabbitMQ driver
+### RabbitMQ fixtures
 
 @todo
 

diff --git a/phpunit-integration.xml.dist b/phpunit-integration.xml.dist
@@ -20,33 +20,9 @@
         </testsuite>
     </testsuites>
     <extensions>
-        <extension class="IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtension">
+        <extension class="IntegrationTesting\PHPUnit\Runner\Extension\Handler">
             <arguments>
-                <object class="IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtensionConfig">
-                    <arguments>
-                        <array>
-                            <element key="BEFORE_FIRST_TEST_PDO_FIXTURES_PATH">
-                                <string>tests/fixtures/before-first-test</string>
-                            </element>
-                            <element key="BEFORE_TEST_PDO_FIXTURES_PATH">
-                                <string>tests/fixtures/before-test</string>
-                            </element>
-                            <element key="AFTER_TEST_PDO_FIXTURES_PATH">
-                                <string>tests/fixtures/after-test</string>
-                            </element>
-                            <element key="AFTER_LAST_TEST_PDO_FIXTURES_PATH">
-                                <string>tests/fixtures/after-last-test</string>
-                            </element>
-                        </array>
-                    </arguments>
-                </object>
-                <object class="IntegrationTesting\Driver\PDOConnection">
-                    <arguments>
-                        <string>mysql:host=localhost:3306;dbname=test;charset=utf8</string>
-                        <string>test</string>
-                        <string>test</string>
-                    </arguments>
-                </object>
+                <string>.integration-testing.json</string>
             </arguments>
         </extension>
     </extensions>