Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/quicktest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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:
Expand All @@ -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)"
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
13 changes: 11 additions & 2 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
42 changes: 0 additions & 42 deletions tests/AllTests.php

This file was deleted.

63 changes: 0 additions & 63 deletions tests/Core/AllTests.php

This file was deleted.

98 changes: 0 additions & 98 deletions tests/FileList.php

This file was deleted.

Loading