From 196d797cb72e981e95dc30c6d99b2c78882222f5 Mon Sep 17 00:00:00 2001
From: hrodic <hrodicus@gmail.com>
Date: Thu, 23 Apr 2020 12:55:09 +0200
Subject: [PATCH] allow phpunit8, fix namespaces and tests

---
 .phpunit.result.cache                            |  1 +
 composer.json                                    |  2 +-
 src/Driver/FileSystem.php                        |  1 +
 src/Exception/TestingException.php               |  2 +-
 .../Runner/Extension/PDODatabaseExtension.php    |  2 +-
 .../Extension/PDODatabaseExtensionConfig.php     |  2 +-
 tests/fixtures/before-first-test/01.sql          |  3 ++-
 tests/fixtures/before-test/01.sql                |  2 +-
 tests/integration/MariaDB/PDOIntegrationTest.php | 16 +++++++++++++++-
 .../PDOWithoutBeforeOrAfterTestFixturesTest.php  |  9 +++++----
 10 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 .phpunit.result.cache

diff --git a/.phpunit.result.cache b/.phpunit.result.cache
new file mode 100644
index 0000000..b99eaf6
--- /dev/null
+++ b/.phpunit.result.cache
@@ -0,0 +1 @@
+C:37:"PHPUnit\Runner\DefaultTestResultCache":1962:{a:2:{s:7:"defects";a:7:{s:98:"IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtensionTest::testBeforeFirstTestBehaviour";i:5;s:93:"IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtensionTest::testBeforeTestBehaviour";i:5;s:92:"IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtensionTest::testAfterTestBehaviour";i:5;s:96:"IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtensionTest::testAfterLastTestBehaviour";i:5;s:92:"IntegrationTesting\Tests\Integration\MariaDB\PDOIntegrationTest::testReadFixtureFromDatabase";i:5;s:124:"IntegrationTesting\Tests\Integration\MariaDB\PDOWithoutBeforeOrAfterTestFixturesTest::testReadingEphemeralTableHasNoContents";i:5;s:137:"IntegrationTesting\Tests\Integration\MariaDB\PDOWithoutBeforeOrAfterTestFixturesTest::testPersistentTableHasRowCountEqualsToTestsExecuted";i:3;}s:5:"times";a:9:{s:98:"IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtensionTest::testBeforeFirstTestBehaviour";d:0.005;s:93:"IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtensionTest::testBeforeTestBehaviour";d:0.005;s:92:"IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtensionTest::testAfterTestBehaviour";d:0.02;s:96:"IntegrationTesting\PHPUnit\Runner\Extension\PDODatabaseExtensionTest::testAfterLastTestBehaviour";d:0.005;s:92:"IntegrationTesting\Tests\Integration\MariaDB\PDOIntegrationTest::testReadFixtureFromDatabase";d:0.006;s:124:"IntegrationTesting\Tests\Integration\MariaDB\PDOWithoutBeforeOrAfterTestFixturesTest::testReadingEphemeralTableHasNoContents";d:0.002;s:137:"IntegrationTesting\Tests\Integration\MariaDB\PDOWithoutBeforeOrAfterTestFixturesTest::testPersistentTableHasRowCountEqualsToTestsExecuted";d:0.011;s:121:"IntegrationTesting\Tests\Integration\MariaDB\PDOWithoutBeforeOrAfterTestFixturesTest::testPersistentTableHasAtLeastOneRow";d:0.002;s:100:"IntegrationTesting\Tests\Integration\MariaDB\PDOIntegrationTest::testPersistentTableHasAtLeastOneRow";d:0.002;}}}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 7940bff..de8675b 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
     "ext-mbstring": "*",
     "ext-pdo_mysql": "*",
     "ext-xml": "*",
-    "phpunit/phpunit": "^9.0",
+    "phpunit/phpunit": "^8.5",
     "friendsofphp/php-cs-fixer": "^2.16",
     "squizlabs/php_codesniffer": "^3.5"
   },
diff --git a/src/Driver/FileSystem.php b/src/Driver/FileSystem.php
index 41be84d..2b36bea 100644
--- a/src/Driver/FileSystem.php
+++ b/src/Driver/FileSystem.php
@@ -4,6 +4,7 @@
 
 use ArrayIterator;
 use FilesystemIterator;
+use IntegrationTesting\Exception\TestingException;
 use Iterator;
 
 class FileSystem
diff --git a/src/Exception/TestingException.php b/src/Exception/TestingException.php
index 209acc5..442e4f2 100644
--- a/src/Exception/TestingException.php
+++ b/src/Exception/TestingException.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace IntegrationTesting\Driver;
+namespace IntegrationTesting\Exception;
 
 class TestingException extends \Exception
 {
diff --git a/src/PHPUnit/Runner/Extension/PDODatabaseExtension.php b/src/PHPUnit/Runner/Extension/PDODatabaseExtension.php
index d3267d1..0822851 100644
--- a/src/PHPUnit/Runner/Extension/PDODatabaseExtension.php
+++ b/src/PHPUnit/Runner/Extension/PDODatabaseExtension.php
@@ -4,7 +4,7 @@
 
 use IntegrationTesting\Driver\FileSystem;
 use IntegrationTesting\Driver\PDOConnection;
-use IntegrationTesting\Driver\TestingException;
+use IntegrationTesting\Exception\TestingException;
 use PHPUnit\Runner\BeforeFirstTestHook;
 use PHPUnit\Runner\BeforeTestHook;
 use PHPUnit\Runner\AfterTestHook;
diff --git a/src/PHPUnit/Runner/Extension/PDODatabaseExtensionConfig.php b/src/PHPUnit/Runner/Extension/PDODatabaseExtensionConfig.php
index 0a4993e..e03e025 100644
--- a/src/PHPUnit/Runner/Extension/PDODatabaseExtensionConfig.php
+++ b/src/PHPUnit/Runner/Extension/PDODatabaseExtensionConfig.php
@@ -2,7 +2,7 @@
 
 namespace IntegrationTesting\PHPUnit\Runner\Extension;
 
-use IntegrationTesting\Driver\TestingException;
+use IntegrationTesting\Exception\TestingException;
 
 class PDODatabaseExtensionConfig
 {
diff --git a/tests/fixtures/before-first-test/01.sql b/tests/fixtures/before-first-test/01.sql
index 27edf91..3a4c7da 100644
--- a/tests/fixtures/before-first-test/01.sql
+++ b/tests/fixtures/before-first-test/01.sql
@@ -9,6 +9,7 @@ CREATE TABLE IF NOT EXISTS `test`.`ephemeral_table`
 
 CREATE TABLE IF NOT EXISTS `test`.`persistent_table`
 (
-    `id`       INT         NOT NULL AUTO_INCREMENT,
+    `id`      INT         NOT NULL AUTO_INCREMENT,
+    `varchar` VARCHAR(45) NULL,
     PRIMARY KEY (`id`)
 );
\ No newline at end of file
diff --git a/tests/fixtures/before-test/01.sql b/tests/fixtures/before-test/01.sql
index 1f07471..af0f50f 100644
--- a/tests/fixtures/before-test/01.sql
+++ b/tests/fixtures/before-test/01.sql
@@ -1,4 +1,4 @@
 -- in this example we truncate also before each test
 TRUNCATE TABLE `test`.`ephemeral_table`;
 
-INSERT INTO `test`.`persistent_table` (`id`) VALUES (NULL);
\ No newline at end of file
+INSERT INTO `test`.`persistent_table` (`varchar`) VALUES ('example');
\ No newline at end of file
diff --git a/tests/integration/MariaDB/PDOIntegrationTest.php b/tests/integration/MariaDB/PDOIntegrationTest.php
index 28e7aa2..21e3b04 100644
--- a/tests/integration/MariaDB/PDOIntegrationTest.php
+++ b/tests/integration/MariaDB/PDOIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace IntegrationTesting\Tests\Integration;
+namespace IntegrationTesting\Tests\Integration\MariaDB;
 
 use IntegrationTesting\Driver\PDOConnection;
 use IntegrationTesting\WithAfterTestFixtureName;
@@ -39,4 +39,18 @@ public function testReadFixtureFromDatabase(): void
             $data
         );
     }
+
+    public function testPersistentTableHasAtLeastOneRow(): void
+    {
+        $conn = new PDOConnection(
+            constant('DB_DSN'),
+            constant('DB_USERNAME'),
+            constant('DB_PASSWORD')
+        );
+        $conn->PDO()->beginTransaction();
+        $statement = $conn->PDO()->query("SELECT * FROM  `test`.`persistent_table`");
+        $conn->PDO()->commit();
+        // this is the third test to run a beforeTest hook!
+        $this->assertTrue($statement->rowCount() >= 1);
+    }
 }
\ No newline at end of file
diff --git a/tests/integration/MariaDB/PDOWithoutBeforeOrAfterTestFixturesTest.php b/tests/integration/MariaDB/PDOWithoutBeforeOrAfterTestFixturesTest.php
index 859dd4b..7677ef8 100644
--- a/tests/integration/MariaDB/PDOWithoutBeforeOrAfterTestFixturesTest.php
+++ b/tests/integration/MariaDB/PDOWithoutBeforeOrAfterTestFixturesTest.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace IntegrationTesting\Tests\Integration;
+namespace IntegrationTesting\Tests\Integration\MariaDB;
 
 use IntegrationTesting\Driver\PDOConnection;
 use PHPUnit\Framework\TestCase;
@@ -11,7 +11,6 @@
  */
 final class PDOWithoutBeforeOrAfterTestFixturesTest extends TestCase
 {
-
     public function testReadingEphemeralTableHasNoContents(): void
     {
         $conn = new PDOConnection(
@@ -23,15 +22,17 @@ public function testReadingEphemeralTableHasNoContents(): void
         $this->assertSame(0, $statement->rowCount());
     }
 
-    public function testPersistentTableHasRowCountEqualsToTestsExecuted(): void
+    public function testPersistentTableHasAtLeastOneRow(): void
     {
         $conn = new PDOConnection(
             constant('DB_DSN'),
             constant('DB_USERNAME'),
             constant('DB_PASSWORD')
         );
+        $conn->PDO()->beginTransaction();
         $statement = $conn->PDO()->query("SELECT * FROM  `test`.`persistent_table`");
+        $conn->PDO()->commit();
         // this is the third test to run a beforeTest hook!
-        $this->assertSame(3, $statement->rowCount());
+        $this->assertTrue($statement->rowCount() >= 1);
     }
 }
\ No newline at end of file