Move utility tests to WordPress/Helpers/Tests/ContextHelper/

Author: rodrigoprimo

Tests/bootstrap.php

@@ -45,21 +45,6 @@
 ) {
 	require_once $phpcsDir . $ds . 'autoload.php';
 	require_once $phpcsDir . $ds . 'tests' . $ds . 'bootstrap.php'; // PHPUnit 6.x+ support.
-
-	spl_autoload_register(
-		function ( $className ) {
-			// Only try & load our own classes.
-			if ( stripos( $className, 'WordPressCS' ) !== 0 ) {
-				return;
-			}
-
-			$file = realpath( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . strtr( str_replace( 'WordPressCS\\', '', $className ), '\\', DIRECTORY_SEPARATOR ) . '.php';
-
-			if ( file_exists( $file ) ) {
-				include_once $file;
-			}
-		}
-	);
 } else {
 	echo 'Uh oh... can\'t find PHPCS.
 

WordPress/Util/Tests/Helpers/ContextHelper/IsInFunctionCallUnitTest.inc renamed to WordPress/Tests/Helpers/ContextHelper/IsInFunctionCallUnitTest.inc

@@ -7,7 +7,7 @@
  * @license https://opensource.org/licenses/MIT MIT
  */
 
-namespace WordPressCS\WordPress\Util\Tests\Helpers\ContextHelper;
+namespace WordPressCS\WordPress\Tests\Helpers\ContextHelper;
 
 use PHPCSUtils\Tokens\Collections;
 use WordPressCS\WordPress\Helpers\ContextHelper;

WordPress/Util/Tests/Helpers/ContextHelper/IsInFunctionCallUnitTest.php renamed to WordPress/Tests/Helpers/ContextHelper/IsInFunctionCallUnitTest.php

@@ -53,12 +53,10 @@
 			"@php ./vendor/squizlabs/php_codesniffer/bin/phpcbf"
 		],
 		"run-tests": [
-			"@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/squizlabs/php_codesniffer/tests/AllTests.php --no-coverage",
-			"@php ./vendor/phpunit/phpunit/phpunit WordPress/Util/Tests/ --no-coverage"
+			"@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/squizlabs/php_codesniffer/tests/AllTests.php --no-coverage"
 		],
 		"coverage": [
-			"@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/squizlabs/php_codesniffer/tests/AllTests.php",
-			"@php ./vendor/phpunit/phpunit/phpunit WordPress/Util/Tests/"
+			"@php ./vendor/phpunit/phpunit/phpunit --filter WordPress ./vendor/squizlabs/php_codesniffer/tests/AllTests.php"
 		],
 		"check-complete": [
 			"@php ./vendor/phpcsstandards/phpcsdevtools/bin/phpcs-check-feature-completeness -q ./WordPress"

composer.json

@@ -13,10 +13,7 @@
 	forceCoversAnnotation="true">
 
 	<testsuites>
-		<testsuite name="WordPress Utilities Tests">
-			<directory suffix="UnitTest.php">./WordPress/Util/Tests/</directory>
-		</testsuite>
-		<testsuite name="WordPress Sniffs Tests">
+		<testsuite name="WordPress Tests">
 			<directory suffix="UnitTest.php">./WordPress/Tests/</directory>
 		</testsuite>
 	</testsuites>