Skip to content

Commit b659067

Browse files
committed
Tests/Tokenizer: move tests
Move the tests directly related to the `Tokenizer\PHP` class into a `PHP` subdirectory. Move the tests directly related to the `Tokenizer\Tokenizer` class into a `Tokenizer` subdirectory. As there are five (soon three) Tokenizer classes, having the tests for each class in their own subdirectory makes it more straight forward to see what code is covered by tests.
1 parent a5d3ba7 commit b659067

File tree

55 files changed

+72
-28
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+72
-28
lines changed

phpcs.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144

145145
<!-- This test file specifically *needs* Windows line endings for testing purposes. -->
146146
<rule ref="Generic.Files.LineEndings.InvalidEOLChar">
147-
<exclude-pattern>tests/Core/Tokenizer/StableCommentWhitespaceWinTest\.php</exclude-pattern>
147+
<exclude-pattern>tests/Core/Tokenizer/PHP/StableCommentWhitespaceWinTest\.php</exclude-pattern>
148148
</rule>
149149

150150
<!-- Avoid false positive with this sniff detecting itself -->

tests/Core/Tokenizer/AnonClassParenthesisOwnerTest.php renamed to tests/Core/Tokenizer/PHP/AnonClassParenthesisOwnerTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
11+
12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1113

1214
final class AnonClassParenthesisOwnerTest extends AbstractTokenizerTestCase
1315
{

tests/Core/Tokenizer/AttributesTest.php renamed to tests/Core/Tokenizer/PHP/AttributesTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
11+
12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1113

1214
final class AttributesTest extends AbstractTokenizerTestCase
1315
{

tests/Core/Tokenizer/BackfillEnumTest.php renamed to tests/Core/Tokenizer/PHP/BackfillEnumTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
11+
12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1113

1214
final class BackfillEnumTest extends AbstractTokenizerTestCase
1315
{

tests/Core/Tokenizer/BackfillExplicitOctalNotationTest.php renamed to tests/Core/Tokenizer/PHP/BackfillExplicitOctalNotationTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
11+
12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1113

1214
final class BackfillExplicitOctalNotationTest extends AbstractTokenizerTestCase
1315
{

tests/Core/Tokenizer/BackfillFnTokenTest.php renamed to tests/Core/Tokenizer/PHP/BackfillFnTokenTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
11+
12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1113

1214
final class BackfillFnTokenTest extends AbstractTokenizerTestCase
1315
{

tests/Core/Tokenizer/BackfillMatchTokenTest.php renamed to tests/Core/Tokenizer/PHP/BackfillMatchTokenTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
99
*/
1010

11-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
11+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
1212

13+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1314
use PHP_CodeSniffer\Util\Tokens;
1415

1516
final class BackfillMatchTokenTest extends AbstractTokenizerTestCase

tests/Core/Tokenizer/BackfillNumericSeparatorTest.php renamed to tests/Core/Tokenizer/PHP/BackfillNumericSeparatorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
1111

12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1213
use PHP_CodeSniffer\Util\Tokens;
1314

1415
final class BackfillNumericSeparatorTest extends AbstractTokenizerTestCase

tests/Core/Tokenizer/BackfillReadonlyTest.php renamed to tests/Core/Tokenizer/PHP/BackfillReadonlyTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
11+
12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1113

1214
final class BackfillReadonlyTest extends AbstractTokenizerTestCase
1315
{

tests/Core/Tokenizer/BitwiseOrTest.php renamed to tests/Core/Tokenizer/PHP/BitwiseOrTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
11+
12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1113

1214
final class BitwiseOrTest extends AbstractTokenizerTestCase
1315
{

tests/Core/Tokenizer/ContextSensitiveKeywordsTest.php renamed to tests/Core/Tokenizer/PHP/ContextSensitiveKeywordsTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
1111

12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1213
use PHP_CodeSniffer\Util\Tokens;
1314

1415
final class ContextSensitiveKeywordsTest extends AbstractTokenizerTestCase

tests/Core/Tokenizer/DoubleArrowTest.php renamed to tests/Core/Tokenizer/PHP/DoubleArrowTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
1010
*/
1111

12-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
12+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
13+
14+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1315

1416
final class DoubleArrowTest extends AbstractTokenizerTestCase
1517
{

tests/Core/Tokenizer/DoubleQuotedStringTest.php renamed to tests/Core/Tokenizer/PHP/DoubleQuotedStringTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
99
*/
1010

11-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
11+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
12+
13+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1214

1315
final class DoubleQuotedStringTest extends AbstractTokenizerTestCase
1416
{

tests/Core/Tokenizer/FinallyTest.php renamed to tests/Core/Tokenizer/PHP/FinallyTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
11+
12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1113

1214
final class FinallyTest extends AbstractTokenizerTestCase
1315
{

tests/Core/Tokenizer/GotoLabelTest.php renamed to tests/Core/Tokenizer/PHP/GotoLabelTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
11+
12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1113

1214
final class GotoLabelTest extends AbstractTokenizerTestCase
1315
{

tests/Core/Tokenizer/HeredocStringTest.php renamed to tests/Core/Tokenizer/PHP/HeredocStringTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
99
*/
1010

11-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
11+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
12+
13+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1214

1315
final class HeredocStringTest extends AbstractTokenizerTestCase
1416
{

tests/Core/Tokenizer/NamedFunctionCallArgumentsTest.php renamed to tests/Core/Tokenizer/PHP/NamedFunctionCallArgumentsTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
1111

12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1213
use PHP_CodeSniffer\Util\Tokens;
1314

1415
final class NamedFunctionCallArgumentsTest extends AbstractTokenizerTestCase

tests/Core/Tokenizer/NamespacedNameSingleTokenTest.php renamed to tests/Core/Tokenizer/PHP/NamespacedNameSingleTokenTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
1818
*/
1919

20-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
20+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
2121

22+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
2223
use PHP_CodeSniffer\Util\Tokens;
2324

2425
final class NamespacedNameSingleTokenTest extends AbstractTokenizerTestCase

tests/Core/Tokenizer/NullsafeObjectOperatorTest.php renamed to tests/Core/Tokenizer/PHP/NullsafeObjectOperatorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
1111

12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1213
use PHP_CodeSniffer\Util\Tokens;
1314

1415
final class NullsafeObjectOperatorTest extends AbstractTokenizerTestCase

tests/Core/Tokenizer/OtherContextSensitiveKeywordsTest.php renamed to tests/Core/Tokenizer/PHP/OtherContextSensitiveKeywordsTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
11+
12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1113

1214
/**
1315
* Tests the conversion of PHPCS native context sensitive keyword tokens to T_STRING.

tests/Core/Tokenizer/ResolveSimpleTokenTest.php renamed to tests/Core/Tokenizer/PHP/ResolveSimpleTokenTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
1111

12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1213
use PHP_CodeSniffer\Util\Tokens;
1314

1415
/**

tests/Core/Tokenizer/ShortArrayTest.php renamed to tests/Core/Tokenizer/PHP/ShortArrayTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
11+
12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1113

1214
final class ShortArrayTest extends AbstractTokenizerTestCase
1315
{

tests/Core/Tokenizer/StableCommentWhitespaceTest.php renamed to tests/Core/Tokenizer/PHP/StableCommentWhitespaceTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
1414
*/
1515

16-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
16+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
1717

18+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1819
use PHP_CodeSniffer\Util\Tokens;
1920

2021
final class StableCommentWhitespaceTest extends AbstractTokenizerTestCase

tests/Core/Tokenizer/StableCommentWhitespaceWinTest.php renamed to tests/Core/Tokenizer/PHP/StableCommentWhitespaceWinTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
1111
*/
1212

13-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
13+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
1414

15+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1516
use PHP_CodeSniffer\Util\Tokens;
1617

1718
final class StableCommentWhitespaceWinTest extends AbstractTokenizerTestCase

tests/Core/Tokenizer/TypeIntersectionTest.php renamed to tests/Core/Tokenizer/PHP/TypeIntersectionTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
99
*/
1010

11-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
11+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
12+
13+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1214

1315
final class TypeIntersectionTest extends AbstractTokenizerTestCase
1416
{

tests/Core/Tokenizer/TypedConstantsTest.php renamed to tests/Core/Tokenizer/PHP/TypedConstantsTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
1313
*/
1414

15-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
15+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
1616

17+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1718
use PHP_CodeSniffer\Util\Tokens;
1819

1920
final class TypedConstantsTest extends AbstractTokenizerTestCase

tests/Core/Tokenizer/HeredocNowdocCloserTest.php renamed to tests/Core/Tokenizer/Tokenizer/HeredocNowdocCloserTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Tokenizer;
11+
12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1113

1214
/**
1315
* Heredoc/nowdoc closer token test.

tests/Core/Tokenizer/ScopeSettingWithNamespaceOperatorTest.php renamed to tests/Core/Tokenizer/Tokenizer/ScopeSettingWithNamespaceOperatorTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
* @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
88
*/
99

10-
namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
10+
namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Tokenizer;
11+
12+
use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
1113

1214
final class ScopeSettingWithNamespaceOperatorTest extends AbstractTokenizerTestCase
1315
{

0 commit comments

Comments
 (0)