Merge pull request #995 from PHPCSStandards/phpcs-4.0/feature/25-refactor-testsuite

Tests: refactor the test framework

Author: jrfnl

.github/workflows/quicktest.yml

@@ -60,14 +60,14 @@ jobs:
 
       - name: 'PHPUnit: run the full test suite'
         if: ${{ matrix.os != 'windows-latest' }}
-        run: php "vendor/bin/phpunit" tests/AllTests.php --no-coverage
+        run: php "vendor/bin/phpunit" --no-coverage
 
       - name: 'PHPUnit: run tests which may have different outcomes on Windows'
         if: ${{ matrix.os == 'windows-latest' }}
-        run: php "vendor/bin/phpunit" tests/AllTests.php --group Windows --no-coverage
+        run: php "vendor/bin/phpunit" --group Windows --no-coverage
 
       - name: 'PHPUnit: run select tests in CBF mode'
-        run: php "vendor/bin/phpunit" tests/AllTests.php --group CBF --exclude-group nothing --no-coverage
+        run: php "vendor/bin/phpunit" --group CBF --exclude-group nothing --no-coverage
         env:
           PHP_CODESNIFFER_CBF: '1'
 

.github/workflows/test.yml

@@ -204,11 +204,11 @@ jobs:
 
       - name: 'PHPUnit: run the full test suite without code coverage'
         if: ${{ matrix.skip_tests != true }}
-        run: php "vendor/bin/phpunit" tests/AllTests.php --no-coverage
+        run: php "vendor/bin/phpunit" --no-coverage
 
       - name: 'PHPUnit: run select tests in CBF mode'
         if: ${{ matrix.skip_tests != true }}
-        run: php "vendor/bin/phpunit" tests/AllTests.php --group CBF --exclude-group nothing --no-coverage
+        run: php "vendor/bin/phpunit" --group CBF --exclude-group nothing --no-coverage
         env:
           PHP_CODESNIFFER_CBF: '1'
 
@@ -307,13 +307,13 @@ jobs:
       - name: "Run the unit tests with code coverage"
         if: ${{ matrix.os != 'windows-latest' }}
         run: >
-          php "vendor/bin/phpunit" tests/AllTests.php
+          php "vendor/bin/phpunit"
           ${{ steps.phpunit_version.outputs.VERSION >= '9.3' && '--coverage-cache ./build/phpunit-cache' || '' }}
 
       - name: "Run select tests in CBF mode with code coverage"
         if: ${{ matrix.os != 'windows-latest' }}
         run: >
-          php "vendor/bin/phpunit" tests/AllTests.php
+          php "vendor/bin/phpunit"
           ${{ steps.phpunit_version.outputs.VERSION >= '9.3' && '--coverage-cache ./build/phpunit-cache' || '' }}
           --group CBF --exclude-group nothing --coverage-clover build/logs/clover-cbf.xml
         env:
@@ -322,7 +322,7 @@ jobs:
       - name: "Run the unit tests which may have different outcomes on Windows with code coverage"
         if: ${{ matrix.os == 'windows-latest' }}
         run: >
-          php "vendor/bin/phpunit" tests/AllTests.php --group Windows
+          php "vendor/bin/phpunit" --group Windows
           ${{ steps.phpunit_version.outputs.VERSION >= '9.3' && '--coverage-cache ./build/phpunit-cache' || '' }}
 
       - name: "Upload coverage results to Coveralls (normal run)"

composer.json

@@ -59,15 +59,15 @@
         ],
         "test": [
             "Composer\\Config::disableProcessTimeout",
-            "@php ./vendor/phpunit/phpunit/phpunit tests/AllTests.php --no-coverage"
+            "@php ./vendor/phpunit/phpunit/phpunit --no-coverage"
         ],
         "coverage": [
             "Composer\\Config::disableProcessTimeout",
-            "@php ./vendor/phpunit/phpunit/phpunit tests/AllTests.php -d max_execution_time=0"
+            "@php ./vendor/phpunit/phpunit/phpunit -d max_execution_time=0"
         ],
         "coverage-local": [
             "Composer\\Config::disableProcessTimeout",
-            "@php ./vendor/phpunit/phpunit/phpunit tests/AllTests.php --coverage-html ./build/coverage-html -d max_execution_time=0"
+            "@php ./vendor/phpunit/phpunit/phpunit --coverage-html ./build/coverage-html -d max_execution_time=0"
         ],
         "build": [
             "Composer\\Config::disableProcessTimeout",

phpunit.xml.dist

@@ -13,8 +13,17 @@
     forceCoversAnnotation="true"
     >
     <testsuites>
-        <testsuite name="PHP_CodeSniffer Test Suite">
-            <file>tests/AllTests.php</file>
+        <testsuite name="PHPCS_Core">
+            <directory>./tests/Core/</directory>
+        </testsuite>
+        <testsuite name="PHPCS_Sniffs">
+            <directory>./src/Standards/Generic/Tests/</directory>
+            <directory>./src/Standards/PEAR/Tests/</directory>
+            <directory>./src/Standards/PSR1/Tests/</directory>
+            <directory>./src/Standards/PSR2/Tests/</directory>
+            <directory>./src/Standards/PSR12/Tests/</directory>
+            <directory>./src/Standards/Squiz/Tests/</directory>
+            <directory>./src/Standards/Zend/Tests/</directory>
         </testsuite>
     </testsuites>