Tests: use PSR-4

* Ensure subdirectory names use "ProperCase". * Ensure all test class file names match the name of the test class. * Change the Composer `autoload-dev` directive to use PSR-4 autoloading. * Update the `phpunit.xml.dist` file to match. * Update the `.phpcs.xml.dist` file to match.
Yoast · Nov 20, 2023 · 97eceea · 97eceea
1 parent b0695e6
commit 97eceea
Show file tree

Hide file tree

Showing 33 changed files with 15 additions and 7 deletions.
diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
@@ -163,4 +163,12 @@
 		<exclude-pattern>/src/watchers/republished-post-watcher\.php$</exclude-pattern>
 	</rule>
 
+	<!-- The below two issues will be fixed in YoastCS 3.0, after which these excludes can be removed. -->
+	<rule ref="Yoast.Commenting.FileComment.Unnecessary">
+		<exclude-pattern>/tests/*/bootstrap\.php$</exclude-pattern>
+	</rule>
+	<rule ref="Yoast.Files.FileName.InvalidClassFileName">
+		<exclude-pattern>/tests/*\.php$</exclude-pattern>
+	</rule>
+
 </ruleset>
diff --git a/composer.json b/composer.json
@@ -37,9 +37,9 @@
 		]
 	},
 	"autoload-dev": {
-		"classmap": [
-			"tests/"
-		]
+		"psr-4": {
+			"Yoast\\WP\\Duplicate_Post\\Tests\\": "tests/"
+		}
 	},
 	"config": {
 		"allow-plugins": {

diff --git a/phpunit-wp.xml.dist b/phpunit-wp.xml.dist
@@ -4,7 +4,7 @@
 	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
 	backupGlobals="false"
 	backupStaticAttributes="false"
-	bootstrap="tests/wp/bootstrap.php"
+	bootstrap="tests/WP/bootstrap.php"
 	colors="true"
 	convertDeprecationsToExceptions="true"
 	convertErrorsToExceptions="true"
@@ -20,7 +20,7 @@
 	>
 	<testsuites>
 		<testsuite name="duplicatepost">
-			<directory suffix="-test.php">./tests/wp</directory>
+			<directory suffix="Test.php">./tests/WP</directory>
 		</testsuite>
 	</testsuites>
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -4,7 +4,7 @@
 	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
 	backupGlobals="false"
 	backupStaticAttributes="false"
-	bootstrap="tests/unit/bootstrap.php"
+	bootstrap="tests/Unit/bootstrap.php"
 	colors="true"
 	convertDeprecationsToExceptions="true"
 	convertErrorsToExceptions="true"
@@ -20,7 +20,7 @@
 	>
 	<testsuites>
 		<testsuite name="duplicatepost">
-			<directory suffix="-test.php">./tests/unit</directory>
+			<directory suffix="Test.php">./tests/Unit</directory>
 		</testsuite>
 	</testsuites>
 

diff --git a/...nit/admin/options-form-generator-test.php → ...nit/Admin/Options_Form_Generator_Test.php b/...nit/admin/options-form-generator-test.php → ...nit/Admin/Options_Form_Generator_Test.php
diff --git a/tests/unit/admin/options-inputs-test.php → tests/Unit/Admin/Options_Inputs_Test.php b/tests/unit/admin/options-inputs-test.php → tests/Unit/Admin/Options_Inputs_Test.php
diff --git a/tests/unit/admin/options-page-test.php → tests/Unit/Admin/Options_Page_Test.php b/tests/unit/admin/options-page-test.php → tests/Unit/Admin/Options_Page_Test.php
diff --git a/tests/unit/admin/options-test.php → tests/Unit/Admin/Options_Test.php b/tests/unit/admin/options-test.php → tests/Unit/Admin/Options_Test.php
diff --git a/...t/handlers/check-changes-handler-test.php → ...t/Handlers/Check_Changes_Handler_Test.php b/...t/handlers/check-changes-handler-test.php → ...t/Handlers/Check_Changes_Handler_Test.php
diff --git a/tests/unit/permissions-helper-test.php → tests/Unit/Permissions_Helper_Test.php b/tests/unit/permissions-helper-test.php → tests/Unit/Permissions_Helper_Test.php
diff --git a/tests/unit/post-duplicator-test.php → tests/Unit/Post_Duplicator_Test.php b/tests/unit/post-duplicator-test.php → tests/Unit/Post_Duplicator_Test.php
diff --git a/tests/unit/post-republisher-test.php → tests/Unit/Post_Republisher_Test.php b/tests/unit/post-republisher-test.php → tests/Unit/Post_Republisher_Test.php
diff --git a/tests/unit/revisions-migrator-test.php → tests/Unit/Revisions_Migrator_Test.php b/tests/unit/revisions-migrator-test.php → tests/Unit/Revisions_Migrator_Test.php
diff --git a/tests/unit/testcase.php → tests/Unit/TestCase.php b/tests/unit/testcase.php → tests/Unit/TestCase.php
diff --git a/tests/unit/ui/admin-bar-test.php → tests/Unit/UI/Admin_Bar_Test.php b/tests/unit/ui/admin-bar-test.php → tests/Unit/UI/Admin_Bar_Test.php
diff --git a/tests/unit/ui/asset-manager-test.php → tests/Unit/UI/Asset_Manager_Test.php b/tests/unit/ui/asset-manager-test.php → tests/Unit/UI/Asset_Manager_Test.php
diff --git a/tests/unit/ui/block-editor-test.php → tests/Unit/UI/Block_Editor_Test.php b/tests/unit/ui/block-editor-test.php → tests/Unit/UI/Block_Editor_Test.php
diff --git a/tests/unit/ui/bulk-actions-test.php → tests/Unit/UI/Bulk_Actions_Test.php b/tests/unit/ui/bulk-actions-test.php → tests/Unit/UI/Bulk_Actions_Test.php
diff --git a/tests/unit/ui/classic-editor-test.php → tests/Unit/UI/Classic_Editor_Test.php b/tests/unit/ui/classic-editor-test.php → tests/Unit/UI/Classic_Editor_Test.php
diff --git a/tests/unit/ui/column-test.php → tests/Unit/UI/Column_Test.php b/tests/unit/ui/column-test.php → tests/Unit/UI/Column_Test.php
diff --git a/tests/unit/ui/link-builder-test.php → tests/Unit/UI/Link_Builder_Test.php b/tests/unit/ui/link-builder-test.php → tests/Unit/UI/Link_Builder_Test.php
diff --git a/tests/unit/ui/metabox-test.php → tests/Unit/UI/Metabox_Test.php b/tests/unit/ui/metabox-test.php → tests/Unit/UI/Metabox_Test.php
diff --git a/tests/unit/ui/post-states-test.php → tests/Unit/UI/Post_States_Test.php b/tests/unit/ui/post-states-test.php → tests/Unit/UI/Post_States_Test.php
diff --git a/tests/unit/ui/row-actions-test.php → tests/Unit/UI/Row_Actions_Test.php b/tests/unit/ui/row-actions-test.php → tests/Unit/UI/Row_Actions_Test.php
diff --git a/tests/unit/utils-test.php → tests/Unit/Utils_Test.php b/tests/unit/utils-test.php → tests/Unit/Utils_Test.php
diff --git a/...it/watchers/bulk-actions-watcher-test.php → ...it/Watchers/Bulk_Actions_Watcher_Test.php b/...it/watchers/bulk-actions-watcher-test.php → ...it/Watchers/Bulk_Actions_Watcher_Test.php
diff --git a/...nit/watchers/copied-post-watcher-test.php → ...nit/Watchers/Copied_Post_Watcher_Test.php b/...nit/watchers/copied-post-watcher-test.php → ...nit/Watchers/Copied_Post_Watcher_Test.php
diff --git a/...it/watchers/link-actions-watcher-test.php → ...it/Watchers/Link_Actions_Watcher_Test.php b/...it/watchers/link-actions-watcher-test.php → ...it/Watchers/Link_Actions_Watcher_Test.php
diff --git a/...t/watchers/original-post-watcher-test.php → ...t/Watchers/Original_Post_Watcher_Test.php b/...t/watchers/original-post-watcher-test.php → ...t/Watchers/Original_Post_Watcher_Test.php
diff --git a/...atchers/republished-post-watcher-test.php → ...atchers/Republished_Post_Watcher_Test.php b/...atchers/republished-post-watcher-test.php → ...atchers/Republished_Post_Watcher_Test.php
diff --git a/tests/unit/bootstrap.php → tests/Unit/bootstrap.php b/tests/unit/bootstrap.php → tests/Unit/bootstrap.php
diff --git a/tests/wp/post-duplicator-test.php → tests/WP/Post_Duplicator_Test.php b/tests/wp/post-duplicator-test.php → tests/WP/Post_Duplicator_Test.php
diff --git a/tests/wp/bootstrap.php → tests/WP/bootstrap.php b/tests/wp/bootstrap.php → tests/WP/bootstrap.php