Skip to content

Commit

Permalink
Decouple test files from external dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
pierlon committed Aug 13, 2021
1 parent 0765bb6 commit 5d99655
Show file tree
Hide file tree
Showing 107 changed files with 111 additions and 105 deletions.
2 changes: 1 addition & 1 deletion tests/php/src/Admin/AnalyticsOptionsSubmenuTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use AmpProject\AmpWP\Admin\RESTPreloader;
use AmpProject\AmpWP\DependencySupport;
use AmpProject\AmpWP\LoadingError;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/**
* Tests for AnalyticsOptionsSubmenu.
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Admin/GoogleFontsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use AmpProject\AmpWP\Admin\GoogleFonts;
use AmpProject\AmpWP\Infrastructure\Registerable;
use AmpProject\AmpWP\Infrastructure\Service;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/**
* Tests for GoogleFonts class.
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Admin/OnboardingWizardSubmenuTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use AmpProject\AmpWP\Infrastructure\Delayed;
use AmpProject\AmpWP\Infrastructure\Registerable;
use AmpProject\AmpWP\Infrastructure\Service;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/**
* Tests for OnboardingWizardSubmenu class.
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Admin/OptionsMenuTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
use AmpProject\AmpWP\Infrastructure\Registerable;
use AmpProject\AmpWP\Infrastructure\Service;
use AmpProject\AmpWP\LoadingError;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/**
* Tests for OptionsMenu.
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Admin/PluginActivationNoticeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

use AmpProject\AmpWP\Admin\PluginActivationNotice;
use AmpProject\AmpWP\Option;
use AmpProject\AmpWP\Tests\TestCase;
use AMP_Options_Manager;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/**
* Tests for PluginActivationNotice class.
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Admin/PluginRowMetaTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use AmpProject\AmpWP\Infrastructure\Delayed;
use AmpProject\AmpWP\Infrastructure\Registerable;
use AmpProject\AmpWP\Infrastructure\Service;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/**
* Tests for PluginRowMeta class.
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Admin/PolyfillsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
use AmpProject\AmpWP\Infrastructure\HasRequirements;
use AmpProject\AmpWP\Infrastructure\Registerable;
use AmpProject\AmpWP\Infrastructure\Service;
use AmpProject\AmpWP\Tests\TestCase;
use WP_Scripts;
use WP_Styles;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/**
* Tests for Polyfills class.
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Admin/RESTPreloaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace AmpProject\AmpWP\Tests\Admin;

use AmpProject\AmpWP\Admin\RESTPreloader;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/**
* Tests for RESTPreloader class.
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Admin/ReaderThemesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
use AmpProject\AmpWP\Option;
use AmpProject\AmpWP\Tests\Helpers\LoadsCoreThemes;
use AmpProject\AmpWP\Tests\Helpers\ThemesApiRequestMocking;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;
use Closure;
use WP_Error;

Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Admin/ValidationCountsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
use AmpProject\AmpWP\Infrastructure\Service;
use AmpProject\AmpWP\Option;
use AmpProject\AmpWP\Services;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/**
* Tests for ValidationCounts class.
Expand Down
1 change: 0 additions & 1 deletion tests/php/src/AmpSlugCustomizationWatcherTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use AmpProject\AmpWP\Infrastructure\Registerable;
use AmpProject\AmpWP\Infrastructure\Service;
use AmpProject\AmpWP\AmpSlugCustomizationWatcher;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\AmpSlugCustomizationWatcher */
final class AmpSlugCustomizationWatcherTest extends TestCase {
Expand Down
1 change: 0 additions & 1 deletion tests/php/src/AmpWpPluginTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use AmpProject\AmpWP\Infrastructure\Injector;
use AmpProject\AmpWP\PluginRegistry;
use AmpProject\AmpWP\Tests\Fixture\DummyService;
use Yoast\WPTestUtils\WPIntegration\TestCase;

final class AmpWpPluginTest extends TestCase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use AmpProject\AmpWP\Infrastructure\Registerable;
use AmpProject\AmpWP\Infrastructure\Service;
use AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/**
* @coversDefaultClass \AmpProject\AmpWP\BackgroundTask\BackgroundTaskDeactivator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
use AmpProject\AmpWP\BackgroundTask\BackgroundTaskDeactivator;
use AmpProject\AmpWP\BackgroundTask\MonitorCssTransientCaching;
use AmpProject\AmpWP\Option;
use AmpProject\AmpWP\Tests\TestCase;
use DateTime;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\BackgroundTask\MonitorCssTransientCaching */
class MonitorCssTransientCachingTest extends TestCase {
Expand Down
1 change: 0 additions & 1 deletion tests/php/src/DependencyInjectedTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use AmpProject\AmpWP\Infrastructure\ServiceContainer;
use AmpProject\AmpWP\Services;
use AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
use Yoast\WPTestUtils\WPIntegration\TestCase;

abstract class DependencyInjectedTestCase extends TestCase {

Expand Down
1 change: 0 additions & 1 deletion tests/php/src/DependencySupportTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use AmpProject\AmpWP\DependencySupport;
use AmpProject\AmpWP\Infrastructure\Service;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\DependencySupport */
class DependencySupportTest extends TestCase {
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/DevTools/BlockSourcesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
use AmpProject\AmpWP\PluginRegistry;
use AmpProject\AmpWP\Tests\Helpers\MockPluginEnvironment;
use AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/**
* Tests for the BlockSources class.
Expand Down
1 change: 1 addition & 0 deletions tests/php/src/DevTools/CallbackReflectionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use ReflectionFunction;
use ReflectionMethod;
use AmpProject\AmpWP\Tests\Helpers\LoadsCoreThemes;
use AmpProject\AmpWP\Tests\TestCase;

/**
* Tests for CallbackReflection class.
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/DevTools/UserAccessTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
use AMP_Theme_Support;
use AmpProject\AmpWP\DevTools\UserAccess;
use AmpProject\AmpWP\Option;
use AmpProject\AmpWP\Tests\TestCase;
use WP_Error;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/**
* Tests for UserAccess class.
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Editor/EditorSupportTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use AmpProject\AmpWP\Editor\EditorSupport;
use AmpProject\AmpWP\Infrastructure\Registerable;
use AmpProject\AmpWP\Infrastructure\Service;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\Editor\EditorSupport */
final class EditorSupportTest extends TestCase {
Expand Down
1 change: 0 additions & 1 deletion tests/php/src/ExtraThemeAndPluginHeadersTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use AmpProject\AmpWP\Infrastructure\Registerable;
use AmpProject\AmpWP\Infrastructure\Service;
use AmpProject\AmpWP\ExtraThemeAndPluginHeaders;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\ExtraThemeAndPluginHeaders */
final class ExtraThemeAndPluginHeadersTest extends TestCase {
Expand Down
1 change: 0 additions & 1 deletion tests/php/src/IconTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace AmpProject\AmpWP\Tests;

use AmpProject\AmpWP\Icon;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\Icon */
final class IconTest extends TestCase {
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Infrastructure/ServiceBasedPluginTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use AmpProject\AmpWP\Tests\Fixture\DummyServiceBasedPlugin;
use AmpProject\AmpWP\Tests\Fixture\DummyServiceWithDelay;
use AmpProject\AmpWP\Tests\Fixture\DummyServiceWithRequirements;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

final class ServiceBasedPluginTest extends TestCase {

Expand Down
1 change: 0 additions & 1 deletion tests/php/src/ObsoleteBlockAttributeRemoverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use AmpProject\AmpWP\Infrastructure\Registerable;
use AmpProject\AmpWP\Infrastructure\Service;
use AmpProject\AmpWP\ObsoleteBlockAttributeRemover;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use WP_REST_Response;

/** @coversDefaultClass \AmpProject\AmpWP\ObsoleteBlockAttributeRemover */
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Optimizer/AmpWPConfigurationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use AmpProject\Optimizer\Transformer\OptimizeHeroImages;
use AmpProject\Optimizer\Transformer\ServerSideRendering;
use AmpProject\Optimizer\TransformerConfiguration;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\Optimizer\AmpWPConfiguration */
final class AmpWPConfigurationTest extends TestCase {
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Optimizer/OptimizerServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use \AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
use AmpProject\RemoteGetRequest;
use AmpProject\RemoteRequest\FallbackRemoteGetRequest;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\Optimizer\OptimizerService */
final class OptimizerServiceTest extends TestCase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use AmpProject\Dom\Document;
use AmpProject\Optimizer\Error;
use AmpProject\Optimizer\ErrorCollection;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\Optimizer\Transformer\DetermineHeroImages */
final class DetermineHeroImagesTest extends TestCase {
Expand Down
1 change: 0 additions & 1 deletion tests/php/src/PluginRegistryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use AmpProject\AmpWP\PluginRegistry;
use AmpProject\AmpWP\Tests\Helpers\MockPluginEnvironment;
use AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\PluginRegistry */
final class PluginRegistryTest extends TestCase {
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/RemoteRequest/CachedRemoteGetRequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
use AmpProject\AmpWP\RemoteRequest\WpHttpRemoteGetRequest;
use AmpProject\RemoteRequest\RemoteGetRequestResponse;
use AmpProject\RemoteRequest\StubbedRemoteGetRequest;
use AmpProject\AmpWP\Tests\TestCase;
use DateTimeImmutable;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\RemoteRequest\CachedRemoteGetRequest */
class CachedRemoteGetRequestTest extends TestCase {
Expand Down
14 changes: 14 additions & 0 deletions tests/php/src/TestCase.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

namespace AmpProject\AmpWP\Tests;

use Yoast\WPTestUtils\WPIntegration\TestCase as PolyfilledTestCase;

/**
* Class TestCase.
*
* @package AmpProject\AmpWP\Tests
*/
abstract class TestCase extends PolyfilledTestCase {

}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
use AMP_Validated_URL_Post_Type;
use AmpProject\AmpWP\BackgroundTask\BackgroundTaskDeactivator;
use AmpProject\AmpWP\BackgroundTask\ValidatedUrlStylesheetDataGarbageCollection;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\BackgroundTask\ValidatedUrlStylesheetDataGarbageCollection */
class ValidatedUrlStylesheetDataGarbageCollectionTest extends TestCase {
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Validation/SavePostValidationEventTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
use AmpProject\AmpWP\Infrastructure\Service;
use AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
use AmpProject\AmpWP\Tests\Helpers\ValidationRequestMocking;
use AmpProject\AmpWP\Tests\TestCase;
use AmpProject\AmpWP\Validation\SavePostValidationEvent;
use AmpProject\AmpWP\Validation\URLValidationProvider;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/**
* @coversDefaultClass \AmpProject\AmpWP\Validation\SavePostValidationEvent
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Validation/ScannableURLProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
use AMP_Theme_Support;
use AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
use AmpProject\AmpWP\Tests\Helpers\ValidationRequestMocking;
use AmpProject\AmpWP\Tests\TestCase;
use AmpProject\AmpWP\Validation\ScannableURLProvider;
use AmpProject\AmpWP\Validation\URLScanningContext;
use WP_Query;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\Validation\ScannableURLProvider */
final class ScannableURLProviderTest extends TestCase {
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Validation/URLScanningContextTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace AmpProject\AmpWP\Tests\Validation;

use AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
use AmpProject\AmpWP\Tests\TestCase;
use AmpProject\AmpWP\Validation\URLScanningContext;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\Validation\URLScanningContext */
final class URLScanningContextTest extends TestCase {
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Validation/URLValidationCronTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
use AmpProject\AmpWP\Infrastructure\Service;
use AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
use AmpProject\AmpWP\Tests\Helpers\ValidationRequestMocking;
use AmpProject\AmpWP\Tests\TestCase;
use AmpProject\AmpWP\Validation\ScannableURLProvider;
use AmpProject\AmpWP\Validation\URLScanningContext;
use AmpProject\AmpWP\Validation\URLValidationCron;
use AmpProject\AmpWP\Validation\URLValidationProvider;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\Validation\URLValidationCron */
final class URLValidationCronTest extends TestCase {
Expand Down
2 changes: 1 addition & 1 deletion tests/php/src/Validation/URLValidationProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace AmpProject\AmpWP\Tests\Validation;

use AmpProject\AmpWP\Tests\Helpers\ValidationRequestMocking;
use AmpProject\AmpWP\Tests\TestCase;
use AmpProject\AmpWP\Validation\URLValidationProvider;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/** @coversDefaultClass \AmpProject\AmpWP\Validation\URLValidationProvider */
final class URLValidationProviderTest extends TestCase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

use AmpProject\AmpWP\DevTools\UserAccess;
use AmpProject\AmpWP\Tests\Helpers\ValidationRequestMocking;
use AmpProject\AmpWP\Tests\TestCase;
use AmpProject\AmpWP\Validation\URLValidationProvider;
use AmpProject\AmpWP\Validation\URLValidationRESTController;
use WP_REST_Controller;
use WP_REST_Request;
use Yoast\WPTestUtils\WPIntegration\TestCase;

/**
* Tests for URLValidationRESTController.
Expand Down
2 changes: 1 addition & 1 deletion tests/php/test-amp-analytics-options.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use AmpProject\AmpWP\Option;
use AmpProject\Dom\Document;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

class AMP_Analytics_Options_Test extends TestCase {

Expand Down
2 changes: 1 addition & 1 deletion tests/php/test-amp-audio-converter.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

use AmpProject\AmpWP\Tests\Helpers\MarkupComparison;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

// phpcs:disable WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned

Expand Down
2 changes: 1 addition & 1 deletion tests/php/test-amp-carousel.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use AmpProject\Dom\Document;
use AmpProject\AmpWP\Dom\ElementList;
use AmpProject\AmpWP\Tests\Helpers\PrivateAccess;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/**
* Tests for Carousel class.
Expand Down
2 changes: 1 addition & 1 deletion tests/php/test-amp-crowdsignal-embed-handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

use AmpProject\AmpWP\Tests\Helpers\WithoutBlockPreRendering;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

/**
* Class AMP_Crowdsignal_Embed_Handler_Test
Expand Down
2 changes: 1 addition & 1 deletion tests/php/test-amp-dailymotion-embed-handler.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use AmpProject\AmpWP\Tests\Helpers\WithoutBlockPreRendering;
use Yoast\WPTestUtils\WPIntegration\TestCase;
use AmpProject\AmpWP\Tests\TestCase;

class AMP_DailyMotion_Embed_Handler_Test extends TestCase {

Expand Down
Loading

0 comments on commit 5d99655

Please sign in to comment.