Make fonts test files use Core approach (#53856)

* Make Fonts test files use Core approach. * Moves the files into phpunit/tests/ directory to match Core. * Removes the `-test.php` suffix from each test file. * Adds the directive to find the test files in phpunit/tests/ (to match how Core does it). * Adds GUTENBERG_DIR_TESTDATA and GUTENBERG_DIR_TESTFIXTURES constants to make it easier on tests to point to these locations. * Rename testcase to base.php
WordPress · Aug 22, 2023 · f0ff5f5 · f0ff5f5
1 parent 4b0bb9a
commit f0ff5f5
Show file tree

Hide file tree

Showing 64 changed files with 54 additions and 50 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -14,6 +14,7 @@
 	<testsuites>
 		<testsuite name="default">
 			<directory suffix="-test.php">./phpunit/</directory>
+			<directory suffix=".php">./phpunit/tests/</directory>
 		</testsuite>
 	</testsuites>
 	<groups>

diff --git a/phpunit/bootstrap.php b/phpunit/bootstrap.php
@@ -21,6 +21,8 @@
 if ( ! defined( 'LOCAL_WP_ENVIRONMENT_TYPE' ) ) {
 	define( 'LOCAL_WP_ENVIRONMENT_TYPE', 'local' );
 }
+define( 'GUTENBERG_DIR_TESTDATA', __DIR__ . '/data/' );
+define( 'GUTENBERG_DIR_TESTFIXTURES', __DIR__ . '/fixtures/' );
 
 // Pretend that these are Core unit tests. This is needed so that
 // wp_theme_has_theme_json() does not cache its return value between each test.

diff --git a/phpunit/multisite.xml b/phpunit/multisite.xml
@@ -15,6 +15,7 @@
 	<testsuites>
 		<testsuite name="default">
 			<directory suffix="-test.php">./</directory>
+			<directory suffix=".php">./tests/</directory>
 		</testsuite>
 	</testsuites>
 	<groups>

diff --git a/phpunit/fonts-api/wp-fonts-testcase.php → phpunit/tests/fonts-api/base.php b/phpunit/fonts-api/wp-fonts-testcase.php → phpunit/tests/fonts-api/base.php
@@ -70,7 +70,7 @@ public static function set_up_before_class() {
 		parent::set_up_before_class();
 
 		if ( self::$requires_switch_theme_fixtures ) {
-			self::$theme_root = realpath( __DIR__ . '/../data/themedir1' );
+			self::$theme_root = realpath( GUTENBERG_DIR_TESTDATA . '/themedir1' );
 		}
 	}
 

diff --git a/...-api/bc-layer/fonts-bc-layer-testcase.php → phpunit/tests/fonts-api/bc-layer/base.php b/...-api/bc-layer/fonts-bc-layer-testcase.php → phpunit/tests/fonts-api/bc-layer/base.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 require_once __DIR__ . '/bc-layer-tests-dataset.php';
 
 /**

diff --git a/...s-api/bc-layer/bc-layer-tests-dataset.php → ...s-api/bc-layer/bc-layer-tests-dataset.php b/...s-api/bc-layer/bc-layer-tests-dataset.php → ...s-api/bc-layer/bc-layer-tests-dataset.php
diff --git a/...ApiBcLayer/isDeprecatedStructure-test.php → ...FontsApiBcLayer/isDeprecatedStructure.php b/...ApiBcLayer/isDeprecatedStructure-test.php → ...FontsApiBcLayer/isDeprecatedStructure.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../fonts-bc-layer-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/...Layer/migrateDeprecatedStructure-test.php → ...ApiBcLayer/migrateDeprecatedStructure.php b/...Layer/migrateDeprecatedStructure-test.php → ...ApiBcLayer/migrateDeprecatedStructure.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../fonts-bc-layer-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/...-api/bc-layer/wpRegisterWebfonts-test.php → ...fonts-api/bc-layer/wpRegisterWebfonts.php b/...-api/bc-layer/wpRegisterWebfonts-test.php → ...fonts-api/bc-layer/wpRegisterWebfonts.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/fonts-bc-layer-testcase.php';
+require_once __DIR__ . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/...-layer/wpWebfonts/getAllWebfonts-test.php → ...pi/bc-layer/wpWebfonts/getAllWebfonts.php b/...-layer/wpWebfonts/getAllWebfonts-test.php → ...pi/bc-layer/wpWebfonts/getAllWebfonts.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/.../bc-layer/wpWebfonts/getFontSlug-test.php → ...s-api/bc-layer/wpWebfonts/getFontSlug.php b/.../bc-layer/wpWebfonts/getFontSlug-test.php → ...s-api/bc-layer/wpWebfonts/getFontSlug.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../fonts-bc-layer-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/...wpWebfonts/getRegisteredWebfonts-test.php → ...ayer/wpWebfonts/getRegisteredWebfonts.php b/...wpWebfonts/getRegisteredWebfonts-test.php → ...ayer/wpWebfonts/getRegisteredWebfonts.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../fonts-bc-layer-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/...layer/wpWebfonts/registerWebfont-test.php → ...i/bc-layer/wpWebfonts/registerWebfont.php b/...layer/wpWebfonts/registerWebfont-test.php → ...i/bc-layer/wpWebfonts/registerWebfont.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../fonts-bc-layer-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/phpunit/fonts-api/wp-fonts-tests-dataset.php → ...ests/fonts-api/wp-fonts-tests-dataset.php b/phpunit/fonts-api/wp-fonts-tests-dataset.php → ...ests/fonts-api/wp-fonts-tests-dataset.php
diff --git a/...fonts-api/wpDeregisterFontFamily-test.php → ...ests/fonts-api/wpDeregisterFontFamily.php b/...fonts-api/wpDeregisterFontFamily-test.php → ...ests/fonts-api/wpDeregisterFontFamily.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/wp-fonts-testcase.php';
+require_once __DIR__ . '/base.php';
 
 /**
  * @group fontsapi

diff --git a/...ts-api/wpDeregisterFontVariation-test.php → ...s/fonts-api/wpDeregisterFontVariation.php b/...ts-api/wpDeregisterFontVariation-test.php → ...s/fonts-api/wpDeregisterFontVariation.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/wp-fonts-testcase.php';
+require_once __DIR__ . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/...onts-api/wpEnqueueFontVariations-test.php → ...sts/fonts-api/wpEnqueueFontVariations.php b/...onts-api/wpEnqueueFontVariations-test.php → ...sts/fonts-api/wpEnqueueFontVariations.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/wp-fonts-testcase.php';
+require_once __DIR__ . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/phpunit/fonts-api/wpEnqueueFonts-test.php → phpunit/tests/fonts-api/wpEnqueueFonts.php b/phpunit/fonts-api/wpEnqueueFonts-test.php → phpunit/tests/fonts-api/wpEnqueueFonts.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/wp-fonts-testcase.php';
+require_once __DIR__ . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/phpunit/fonts-api/wpFonts-test.php → phpunit/tests/fonts-api/wpFonts.php b/phpunit/fonts-api/wpFonts-test.php → phpunit/tests/fonts-api/wpFonts.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/wp-fonts-testcase.php';
+require_once __DIR__ . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/phpunit/fonts-api/wpFonts/add-test.php → phpunit/tests/fonts-api/wpFonts/add.php b/phpunit/fonts-api/wpFonts/add-test.php → phpunit/tests/fonts-api/wpFonts/add.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/.../fonts-api/wpFonts/addFontFamily-test.php → ...tests/fonts-api/wpFonts/addFontFamily.php b/.../fonts-api/wpFonts/addFontFamily-test.php → ...tests/fonts-api/wpFonts/addFontFamily.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/...t/fonts-api/wpFonts/addVariation-test.php → .../tests/fonts-api/wpFonts/addVariation.php b/...t/fonts-api/wpFonts/addVariation-test.php → .../tests/fonts-api/wpFonts/addVariation.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/phpunit/fonts-api/wpFonts/dequeue-test.php → phpunit/tests/fonts-api/wpFonts/dequeue.php b/phpunit/fonts-api/wpFonts/dequeue-test.php → phpunit/tests/fonts-api/wpFonts/dequeue.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/phpunit/fonts-api/wpFonts/doItem-test.php → phpunit/tests/fonts-api/wpFonts/doItem.php b/phpunit/fonts-api/wpFonts/doItem-test.php → phpunit/tests/fonts-api/wpFonts/doItem.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/phpunit/fonts-api/wpFonts/doItems-test.php → phpunit/tests/fonts-api/wpFonts/doItems.php b/phpunit/fonts-api/wpFonts/doItems-test.php → phpunit/tests/fonts-api/wpFonts/doItems.php
@@ -6,8 +6,8 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
-require_once __DIR__ . '/../../fixtures/mock-provider.php';
+require_once dirname( __DIR__ ) . '/base.php';
+require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
 
 /**
  * @group  fontsapi

diff --git a/phpunit/fonts-api/wpFonts/enqueue-test.php → phpunit/tests/fonts-api/wpFonts/enqueue.php b/phpunit/fonts-api/wpFonts/enqueue-test.php → phpunit/tests/fonts-api/wpFonts/enqueue.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/...it/fonts-api/wpFonts/getEnqueued-test.php → ...t/tests/fonts-api/wpFonts/getEnqueued.php b/...it/fonts-api/wpFonts/getEnqueued-test.php → ...t/tests/fonts-api/wpFonts/getEnqueued.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/...t/fonts-api/wpFonts/getProviders-test.php → .../tests/fonts-api/wpFonts/getProviders.php b/...t/fonts-api/wpFonts/getProviders-test.php → .../tests/fonts-api/wpFonts/getProviders.php
@@ -6,8 +6,8 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
-require_once __DIR__ . '/../../fixtures/mock-provider.php';
+require_once dirname( __DIR__ ) . '/base.php';
+require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
 
 /**
  * @group  fontsapi

diff --git a/.../fonts-api/wpFonts/getRegistered-test.php → ...tests/fonts-api/wpFonts/getRegistered.php b/.../fonts-api/wpFonts/getRegistered-test.php → ...tests/fonts-api/wpFonts/getRegistered.php
@@ -7,7 +7,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/phpunit/fonts-api/wpFonts/query-test.php → phpunit/tests/fonts-api/wpFonts/query.php b/phpunit/fonts-api/wpFonts/query-test.php → phpunit/tests/fonts-api/wpFonts/query.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/...nts-api/wpFonts/registerProvider-test.php → ...ts/fonts-api/wpFonts/registerProvider.php b/...nts-api/wpFonts/registerProvider-test.php → ...ts/fonts-api/wpFonts/registerProvider.php
@@ -6,8 +6,8 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
-require_once __DIR__ . '/../../fixtures/mock-provider.php';
+require_once dirname( __DIR__ ) . '/base.php';
+require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
 
 /**
  * @group  fontsapi

diff --git a/phpunit/fonts-api/wpFonts/remove-test.php → phpunit/tests/fonts-api/wpFonts/remove.php b/phpunit/fonts-api/wpFonts/remove-test.php → phpunit/tests/fonts-api/wpFonts/remove.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/...nts-api/wpFonts/removeFontFamily-test.php → ...ts/fonts-api/wpFonts/removeFontFamily.php b/...nts-api/wpFonts/removeFontFamily-test.php → ...ts/fonts-api/wpFonts/removeFontFamily.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group fontsapi

diff --git a/...onts-api/wpFonts/removeVariation-test.php → ...sts/fonts-api/wpFonts/removeVariation.php b/...onts-api/wpFonts/removeVariation-test.php → ...sts/fonts-api/wpFonts/removeVariation.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/...t/fonts-api/wpFontsProviderLocal-test.php → .../tests/fonts-api/wpFontsProviderLocal.php b/...t/fonts-api/wpFontsProviderLocal-test.php → .../tests/fonts-api/wpFontsProviderLocal.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/wp-fonts-testcase.php';
+require_once __DIR__ . '/base.php';
 
 /**
  * @group fontsapi
@@ -155,7 +155,7 @@ public function data_get_css_print_styles() {
 	 * `wp-content/themes/` directory to ensure consistency when running tests.
 	 */
 	private function set_up_theme() {
-		$this->theme_root                = realpath( DIR_TESTDATA . '/themedir1' );
+		$this->theme_root                = realpath( GUTENBERG_DIR_TESTDATA . '/themedir1' );
 		$this->orig_theme_dir            = $GLOBALS['wp_theme_directories'];
 		$GLOBALS['wp_theme_directories'] = array( $this->theme_root );
 

diff --git a/...olver/addMissingFontsToThemeJson-test.php → ...tsResolver/addMissingFontsToThemeJson.php b/...olver/addMissingFontsToThemeJson-test.php → ...tsResolver/addMissingFontsToThemeJson.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * Test WP_Fonts_Resolver::add_missing_fonts_to_theme_json().

diff --git a/...esolver/enqueueUserSelectedFonts-test.php → ...ontsResolver/enqueueUserSelectedFonts.php b/...esolver/enqueueUserSelectedFonts-test.php → ...ontsResolver/enqueueUserSelectedFonts.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group  fontsapi

diff --git a/...olver/registerFontsFromThemeJson-test.php → ...tsResolver/registerFontsFromThemeJson.php b/...olver/registerFontsFromThemeJson-test.php → ...tsResolver/registerFontsFromThemeJson.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * Test WP_Fonts_Resolver::register_fonts_from_theme_json().

diff --git a/...tils/convertFontFamilyIntoHandle-test.php → ...ontsUtils/convertFontFamilyIntoHandle.php b/...tils/convertFontFamilyIntoHandle-test.php → ...ontsUtils/convertFontFamilyIntoHandle.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group fontsapi

diff --git a/...Utils/convertVariationIntoHandle-test.php → ...FontsUtils/convertVariationIntoHandle.php b/...Utils/convertVariationIntoHandle-test.php → ...FontsUtils/convertVariationIntoHandle.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group fontsapi

diff --git a/...Utils/getFontFamilyFromVariation-test.php → ...FontsUtils/getFontFamilyFromVariation.php b/...Utils/getFontFamilyFromVariation-test.php → ...FontsUtils/getFontFamilyFromVariation.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group fontsapi

diff --git a/...fonts-api/wpFontsUtils/isDefined-test.php → ...ests/fonts-api/wpFontsUtils/isDefined.php b/...fonts-api/wpFontsUtils/isDefined-test.php → ...ests/fonts-api/wpFontsUtils/isDefined.php
@@ -6,7 +6,7 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/../wp-fonts-testcase.php';
+require_once dirname( __DIR__ ) . '/base.php';
 
 /**
  * @group fontsapi

diff --git a/phpunit/fonts-api/wpPrintFonts-test.php → phpunit/tests/fonts-api/wpPrintFonts.php b/phpunit/fonts-api/wpPrintFonts-test.php → phpunit/tests/fonts-api/wpPrintFonts.php
@@ -6,8 +6,8 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/wp-fonts-testcase.php';
-require_once __DIR__ . '/../fixtures/mock-provider.php';
+require_once __DIR__ . '/base.php';
+require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
 
 /**
  * @group  fontsapi

diff --git a/...fonts-api/wpRegisterFontProvider-test.php → ...ests/fonts-api/wpRegisterFontProvider.php b/...fonts-api/wpRegisterFontProvider-test.php → ...ests/fonts-api/wpRegisterFontProvider.php
@@ -6,8 +6,8 @@
  * @subpackage Fonts API
  */
 
-require_once __DIR__ . '/wp-fonts-testcase.php';
-require_once __DIR__ . '/../fixtures/mock-provider.php';
+require_once __DIR__ . '/base.php';
+require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
 
 /**
  * @group  fontsapi