Merge pull request #334 from Yoast/JRF/tests-use-psr4

Jrf/tests use psr4
Yoast · Nov 20, 2023 · c010070 · c010070
2 parents 9081aa2 + 97eceea
commit c010070
Show file tree

Hide file tree

Showing 34 changed files with 47 additions and 35 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 b/tests/Unit/bootstrap.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * PHPUnit bootstrap file
+ *
+ * @package Yoast\WP\Duplicate_Post\Tests
+ */
+
+namespace Yoast\WP\Duplicate_Post\Tests\Unit;
+
+\define( 'OBJECT', 'OBJECT' );
+\define( 'ARRAY_A', 'ARRAY_A' );
+\define( 'ARRAY_N', 'ARRAY_N' );
+
+\define( 'DUPLICATE_POST_FILE', '/var/www/html/wp-content/plugins/duplicate-post/duplicate-post.php' );
+\define( 'DUPLICATE_POST_CURRENT_VERSION', '4.0' );
+
+if ( \file_exists( \dirname( __DIR__, 2 ) . '/vendor/autoload.php' ) === false ) {
+ echo \PHP_EOL, 'ERROR: Run `composer install` to generate the autoload files before running the unit tests.', \PHP_EOL;
+ exit( 1 );
+}
+
+require_once __DIR__ . '/../../vendor/yoast/wp-test-utils/src/BrainMonkey/bootstrap.php';
+require_once __DIR__ . '/../../vendor/autoload.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
@@ -5,28 +5,30 @@
  * @package Yoast\WP\Duplicate_Post\Tests
  */
 
+namespace Yoast\WP\Duplicate_Post\Tests\WP;
+
 use Yoast\WPTestUtils\WPIntegration;
 
 // Disable xdebug backtrace.
-if ( function_exists( 'xdebug_disable' ) ) {
- xdebug_disable();
+if ( \function_exists( 'xdebug_disable' ) ) {
+ \xdebug_disable();
 }
 
-echo 'Welcome to the Duplicate Post Test Suite' . PHP_EOL;
-echo 'Version: 1.0' . PHP_EOL . PHP_EOL;
+echo 'Welcome to the Duplicate Post Test Suite' . \PHP_EOL;
+echo 'Version: 1.0' . \PHP_EOL . \PHP_EOL;
 
 /*
  * Load the plugin(s).
  */
-require_once dirname( __DIR__, 2 ) . '/vendor/yoast/wp-test-utils/src/WPIntegration/bootstrap-functions.php';
+require_once \dirname( __DIR__, 2 ) . '/vendor/yoast/wp-test-utils/src/WPIntegration/bootstrap-functions.php';
 
 // Get access to tests_add_filter() function.
 require_once WPIntegration\get_path_to_wp_test_dir() . 'includes/functions.php';
 
-tests_add_filter(
+\tests_add_filter(
  'muplugins_loaded',
  function() {
- require_once dirname( __DIR__, 2 ) . '/duplicate-post.php';
+ require_once \dirname( __DIR__, 2 ) . '/duplicate-post.php';
  }
 );
 

diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php