From 5e75fc05654c6891622137e530b1d69903250272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Fri, 13 Jan 2023 13:46:39 +0100
Subject: [PATCH] Fix: Split test suite

---
 .github/workflows/integrate.yaml                       | 7 +++++--
 Makefile                                               | 5 +++--
 phpunit.xml.dist                                       | 7 +++++--
 tests/{ => Functional}/Console/LintCommandTest.php     | 6 +++---
 tests/{ => Functional}/CorpusTest.php                  | 2 +-
 tests/{ => Functional}/Twig2FunctionalTest.php         | 2 +-
 tests/{ => Functional}/Twig3FunctionalTest.php         | 2 +-
 tests/{ => Unit}/Config/ConfigResolverTest.php         | 4 ++--
 tests/{ => Unit}/ContainerTest.php                     | 2 +-
 tests/{ => Unit}/RegEngine/ExpressionNodeTest.php      | 2 +-
 tests/{ => Unit}/RegEngine/ScopedExpressionTest.php    | 2 +-
 tests/{ => Unit}/Reporter/CheckstyleReporterTest.php   | 2 +-
 tests/{ => Unit}/Reporter/ConsoleReporterTest.php      | 2 +-
 tests/{ => Unit}/Reporter/CsvReporterTest.php          | 2 +-
 tests/{ => Unit}/Reporter/GitLabReporterTest.php       | 2 +-
 tests/{ => Unit}/Reporter/GithubActionReporterTest.php | 2 +-
 tests/{ => Unit}/Reporter/JsonReporterTest.php         | 2 +-
 tests/{ => Unit}/Rule/ForbiddenFunctionsTest.php       | 2 +-
 18 files changed, 31 insertions(+), 24 deletions(-)
 rename tests/{ => Functional}/Console/LintCommandTest.php (98%)
 rename tests/{ => Functional}/CorpusTest.php (94%)
 rename tests/{ => Functional}/Twig2FunctionalTest.php (97%)
 rename tests/{ => Functional}/Twig3FunctionalTest.php (99%)
 rename tests/{ => Unit}/Config/ConfigResolverTest.php (98%)
 rename tests/{ => Unit}/ContainerTest.php (93%)
 rename tests/{ => Unit}/RegEngine/ExpressionNodeTest.php (94%)
 rename tests/{ => Unit}/RegEngine/ScopedExpressionTest.php (96%)
 rename tests/{ => Unit}/Reporter/CheckstyleReporterTest.php (95%)
 rename tests/{ => Unit}/Reporter/ConsoleReporterTest.php (95%)
 rename tests/{ => Unit}/Reporter/CsvReporterTest.php (93%)
 rename tests/{ => Unit}/Reporter/GitLabReporterTest.php (97%)
 rename tests/{ => Unit}/Reporter/GithubActionReporterTest.php (94%)
 rename tests/{ => Unit}/Reporter/JsonReporterTest.php (98%)
 rename tests/{ => Unit}/Rule/ForbiddenFunctionsTest.php (97%)

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index 8e3701f..f66dc00 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -170,5 +170,8 @@ jobs:
       - name: "Install dependencies with composer"
         run: "composer install --ansi --no-progress"
 
-      - name: "Run tests with phpunit/phpunit"
-        run: "vendor/bin/phpunit --colors=always"
+      - name: "Run unit tests with phpunit/phpunit"
+        run: "vendor/bin/phpunit --colors=always --testsuite=unit"
+
+      - name: "Run functional tests with phpunit/phpunit"
+        run: "vendor/bin/phpunit --colors=always --testsuite=functional"
diff --git a/Makefile b/Makefile
index 185d235..0c1ff9e 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,9 @@ static-code-analysis-baseline: vendor ## Generates a baseline for static code an
 	.phive/psalm --config=psalm.xml --set-baseline=psalm-baseline.xml
 
 .PHONY: tests
-tests: vendor ## Runs tests with phpunit/phpunit
-	vendor/bin/phpunit
+tests: vendor ## Runs unit and functional tests with phpunit/phpunit
+	vendor/bin/phpunit --testsuite=unit
+	vendor/bin/phpunit --testsuite=functional
 
 vendor: composer.json
 	composer install --no-progress
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index cbf4048..a6a64d7 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -19,8 +19,11 @@
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
     </php>
     <testsuites>
-        <testsuite name="Project Test Suite">
-            <directory>tests</directory>
+        <testsuite name="functional">
+            <directory>tests/Functional/</directory>
+        </testsuite>
+        <testsuite name="unit">
+            <directory>tests/Unit/</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/tests/Console/LintCommandTest.php b/tests/Functional/Console/LintCommandTest.php
similarity index 98%
rename from tests/Console/LintCommandTest.php
rename to tests/Functional/Console/LintCommandTest.php
index 9042d98..eaaf947 100644
--- a/tests/Console/LintCommandTest.php
+++ b/tests/Functional/Console/LintCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfTwig\Twigcs\Tests\Console;
+namespace FriendsOfTwig\Twigcs\Tests\Functional\Console;
 
 use FriendsOfTwig\Twigcs\Config\ConfigInterface;
 use FriendsOfTwig\Twigcs\Console\LintCommand;
@@ -242,11 +242,11 @@ public function testConfigFileWithDisplayAndSeverity(): void
 
     public function testConfigFileSamePathWithRulesetOverrides(): void
     {
-        chdir(__DIR__.'/../Fixture/config/local');
+        chdir(__DIR__.'/../../Fixture/config/local');
         $this->commandTester->execute([
             'paths' => null,
         ]);
-        chdir(__DIR__.'/../..');
+        chdir(__DIR__.'/../../..');
 
         $output = $this->commandTester->getDisplay();
         $statusCode = $this->commandTester->getStatusCode();
diff --git a/tests/CorpusTest.php b/tests/Functional/CorpusTest.php
similarity index 94%
rename from tests/CorpusTest.php
rename to tests/Functional/CorpusTest.php
index f2dce38..1bd746b 100644
--- a/tests/CorpusTest.php
+++ b/tests/Functional/CorpusTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfTwig\Twigcs\Tests;
+namespace FriendsOfTwig\Twigcs\Tests\Functional;
 
 use FriendsOfTwig\Twigcs\Console\LintCommand;
 use FriendsOfTwig\Twigcs\Container;
diff --git a/tests/Twig2FunctionalTest.php b/tests/Functional/Twig2FunctionalTest.php
similarity index 97%
rename from tests/Twig2FunctionalTest.php
rename to tests/Functional/Twig2FunctionalTest.php
index 0ee9443..7c38450 100644
--- a/tests/Twig2FunctionalTest.php
+++ b/tests/Functional/Twig2FunctionalTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfTwig\Twigcs\Tests;
+namespace FriendsOfTwig\Twigcs\Tests\Functional;
 
 use FriendsOfTwig\Twigcs\Lexer;
 use FriendsOfTwig\Twigcs\Rule\RegEngineRule;
diff --git a/tests/Twig3FunctionalTest.php b/tests/Functional/Twig3FunctionalTest.php
similarity index 99%
rename from tests/Twig3FunctionalTest.php
rename to tests/Functional/Twig3FunctionalTest.php
index 54cebf3..5b3e559 100644
--- a/tests/Twig3FunctionalTest.php
+++ b/tests/Functional/Twig3FunctionalTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfTwig\Twigcs\Tests;
+namespace FriendsOfTwig\Twigcs\Tests\Functional;
 
 use FriendsOfTwig\Twigcs\Lexer;
 use FriendsOfTwig\Twigcs\Rule\RegEngineRule;
diff --git a/tests/Config/ConfigResolverTest.php b/tests/Unit/Config/ConfigResolverTest.php
similarity index 98%
rename from tests/Config/ConfigResolverTest.php
rename to tests/Unit/Config/ConfigResolverTest.php
index aa452a3..fb4ef9e 100644
--- a/tests/Config/ConfigResolverTest.php
+++ b/tests/Unit/Config/ConfigResolverTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace FriendsOfTwig\Twigcs\Tests\Config;
+namespace FriendsOfTwig\Twigcs\Tests\Unit\Config;
 
 use FriendsOfTwig\Twigcs;
 use PHPUnit\Framework;
@@ -319,6 +319,6 @@ private static function fileSystem(): Filesystem\Filesystem
 
     private static function temporaryDirectory(): string
     {
-        return __DIR__.'/../../.build/test';
+        return __DIR__.'/../../../.build/test';
     }
 }
diff --git a/tests/ContainerTest.php b/tests/Unit/ContainerTest.php
similarity index 93%
rename from tests/ContainerTest.php
rename to tests/Unit/ContainerTest.php
index cb07ee6..7d1de5f 100644
--- a/tests/ContainerTest.php
+++ b/tests/Unit/ContainerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace FriendsOfTwig\Twigcs\Tests;
+namespace FriendsOfTwig\Twigcs\Tests\Unit;
 
 use FriendsOfTwig\Twigcs;
 use PHPUnit\Framework;
diff --git a/tests/RegEngine/ExpressionNodeTest.php b/tests/Unit/RegEngine/ExpressionNodeTest.php
similarity index 94%
rename from tests/RegEngine/ExpressionNodeTest.php
rename to tests/Unit/RegEngine/ExpressionNodeTest.php
index 649efd7..783fbe6 100644
--- a/tests/RegEngine/ExpressionNodeTest.php
+++ b/tests/Unit/RegEngine/ExpressionNodeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfTwig\Twigcs\Tests\RegEngine;
+namespace FriendsOfTwig\Twigcs\Tests\Unit\RegEngine;
 
 use FriendsOfTwig\Twigcs\RegEngine\ExpressionNode;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/RegEngine/ScopedExpressionTest.php b/tests/Unit/RegEngine/ScopedExpressionTest.php
similarity index 96%
rename from tests/RegEngine/ScopedExpressionTest.php
rename to tests/Unit/RegEngine/ScopedExpressionTest.php
index 534bb3d..9605697 100644
--- a/tests/RegEngine/ScopedExpressionTest.php
+++ b/tests/Unit/RegEngine/ScopedExpressionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfTwig\Twigcs\Tests\RegEngine;
+namespace FriendsOfTwig\Twigcs\Tests\Unit\RegEngine;
 
 use FriendsOfTwig\Twigcs\RegEngine\ScopedExpression;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Reporter/CheckstyleReporterTest.php b/tests/Unit/Reporter/CheckstyleReporterTest.php
similarity index 95%
rename from tests/Reporter/CheckstyleReporterTest.php
rename to tests/Unit/Reporter/CheckstyleReporterTest.php
index 1326d39..6991765 100644
--- a/tests/Reporter/CheckstyleReporterTest.php
+++ b/tests/Unit/Reporter/CheckstyleReporterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfTwig\Twigcs\Tests\Reporter;
+namespace FriendsOfTwig\Twigcs\Tests\Unit\Reporter;
 
 use FriendsOfTwig\Twigcs\Reporter\CheckstyleReporter;
 use FriendsOfTwig\Twigcs\Validator\Violation;
diff --git a/tests/Reporter/ConsoleReporterTest.php b/tests/Unit/Reporter/ConsoleReporterTest.php
similarity index 95%
rename from tests/Reporter/ConsoleReporterTest.php
rename to tests/Unit/Reporter/ConsoleReporterTest.php
index 5680434..2c3e198 100644
--- a/tests/Reporter/ConsoleReporterTest.php
+++ b/tests/Unit/Reporter/ConsoleReporterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfTwig\Twigcs\Tests\Reporter;
+namespace FriendsOfTwig\Twigcs\Tests\Unit\Reporter;
 
 use FriendsOfTwig\Twigcs\Reporter\ConsoleReporter;
 use FriendsOfTwig\Twigcs\Validator\Violation;
diff --git a/tests/Reporter/CsvReporterTest.php b/tests/Unit/Reporter/CsvReporterTest.php
similarity index 93%
rename from tests/Reporter/CsvReporterTest.php
rename to tests/Unit/Reporter/CsvReporterTest.php
index 29758dd..a6c6042 100644
--- a/tests/Reporter/CsvReporterTest.php
+++ b/tests/Unit/Reporter/CsvReporterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfTwig\Twigcs\Tests\Reporter;
+namespace FriendsOfTwig\Twigcs\Tests\Unit\Reporter;
 
 use FriendsOfTwig\Twigcs\Reporter\CsvReporter;
 use FriendsOfTwig\Twigcs\Validator\Violation;
diff --git a/tests/Reporter/GitLabReporterTest.php b/tests/Unit/Reporter/GitLabReporterTest.php
similarity index 97%
rename from tests/Reporter/GitLabReporterTest.php
rename to tests/Unit/Reporter/GitLabReporterTest.php
index 2260db9..03715af 100644
--- a/tests/Reporter/GitLabReporterTest.php
+++ b/tests/Unit/Reporter/GitLabReporterTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace FriendsOfTwig\Twigcs\Tests\Reporter;
+namespace FriendsOfTwig\Twigcs\Tests\Unit\Reporter;
 
 use FriendsOfTwig\Twigcs\Reporter\GitLabReporter;
 use FriendsOfTwig\Twigcs\Validator\Violation;
diff --git a/tests/Reporter/GithubActionReporterTest.php b/tests/Unit/Reporter/GithubActionReporterTest.php
similarity index 94%
rename from tests/Reporter/GithubActionReporterTest.php
rename to tests/Unit/Reporter/GithubActionReporterTest.php
index b8df74c..13fff07 100644
--- a/tests/Reporter/GithubActionReporterTest.php
+++ b/tests/Unit/Reporter/GithubActionReporterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfTwig\Twigcs\Tests\Reporter;
+namespace FriendsOfTwig\Twigcs\Tests\Unit\Reporter;
 
 use FriendsOfTwig\Twigcs\Reporter\GithubActionReporter;
 use FriendsOfTwig\Twigcs\Reporter\ReporterInterface;
diff --git a/tests/Reporter/JsonReporterTest.php b/tests/Unit/Reporter/JsonReporterTest.php
similarity index 98%
rename from tests/Reporter/JsonReporterTest.php
rename to tests/Unit/Reporter/JsonReporterTest.php
index 0192f78..634852f 100644
--- a/tests/Reporter/JsonReporterTest.php
+++ b/tests/Unit/Reporter/JsonReporterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfTwig\Twigcs\Tests\Reporter;
+namespace FriendsOfTwig\Twigcs\Tests\Unit\Reporter;
 
 use FriendsOfTwig\Twigcs\Reporter\JsonReporter;
 use FriendsOfTwig\Twigcs\Validator\Violation;
diff --git a/tests/Rule/ForbiddenFunctionsTest.php b/tests/Unit/Rule/ForbiddenFunctionsTest.php
similarity index 97%
rename from tests/Rule/ForbiddenFunctionsTest.php
rename to tests/Unit/Rule/ForbiddenFunctionsTest.php
index b0927fc..830c9ca 100644
--- a/tests/Rule/ForbiddenFunctionsTest.php
+++ b/tests/Unit/Rule/ForbiddenFunctionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FriendsOfTwig\Twigcs\Tests\Rule;
+namespace FriendsOfTwig\Twigcs\Tests\Unit\Rule;
 
 use FriendsOfTwig\Twigcs\Lexer;
 use FriendsOfTwig\Twigcs\Rule\ForbiddenFunctions;