updated core to 8.6.1 via composer

core/modules/rest/tests/fixtures/update/drupal-8.rest-rest_update_8201.php

@@ -54,6 +54,6 @@ $data = $connection->insert('config')
   ->fields([
     'name' => 'rest.settings',
     'data' => serialize($config),
-    'collection' => ''
+    'collection' => '',
   ])
   ->execute();

core/modules/rest/tests/fixtures/update/drupal-8.rest-rest_update_8203.php

@@ -53,6 +53,6 @@ $data = $connection->insert('config')
   ->fields([
     'name' => 'rest.settings',
     'data' => serialize($config),
-    'collection' => ''
+    'collection' => '',
   ])
   ->execute();

core/modules/rest/tests/fixtures/update/rest-export-with-authentication-correction.php

@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Test fixture for \Drupal\rest\Tests\Update\RestExportAuthCorrectionUpdateTest.
+ * Test fixture for \Drupal\Tests\rest\Functional\Update\RestExportAuthCorrectionUpdateTest.
  */
 
 use Drupal\Core\Database\Database;

core/modules/rest/tests/modules/config_test_rest/config_test_rest.info.yml

@@ -4,4 +4,4 @@ package: Testing
 version: VERSION
 core: 8.x
 dependencies:
-  - config_test
+  - drupal:config_test

core/modules/rest/tests/modules/rest_test/rest_test.info.yml

@@ -4,5 +4,3 @@ description: 'Provides test hooks and resources for REST module.'
 package: Testing
 version: VERSION
 core: 8.x
-dependencies:
-  - rest

core/modules/rest/tests/modules/rest_test/rest_test.services.yml

@@ -12,3 +12,7 @@ services:
       public: false
       tags:
         - { name: page_cache_request_policy }
+  rest_test.encoder.foobar:
+    class: Drupal\serialization\Encoder\JsonEncoder
+    tags:
+      - { name: encoder, format: foobar }

core/modules/rest/tests/modules/rest_test_views/rest_test_views.info.yml

@@ -5,5 +5,5 @@ package: Testing
 version: VERSION
 core: 8.x
 dependencies:
-  - rest
-  - views
+  - drupal:rest
+  - drupal:views

core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonAnonTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Action;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class ActionJsonAnonTest extends ActionResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Action;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group rest
- */
-class ActionJsonBasicAuthTest extends ActionResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Action/ActionJsonCookieTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Action;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group rest
- */
-class ActionJsonCookieTest extends ActionResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Action/ActionResourceTestBase.php

@@ -2,88 +2,15 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\Action;
 
-use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
-use Drupal\system\Entity\Action;
-use Drupal\user\RoleInterface;
+@trigger_error('The ' . __NAMESPACE__ . '\ActionResourceTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\system\Functional\Rest\ActionResourceTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
 
-abstract class ActionResourceTestBase extends EntityResourceTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['user'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'action';
-
-  /**
-   * @var \Drupal\system\ActionConfigEntityInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    $this->grantPermissionsToTestedRole(['administer actions']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    $action = Action::create([
-      'id' => 'user_add_role_action.' . RoleInterface::ANONYMOUS_ID,
-      'type' => 'user',
-      'label' => t('Add the anonymous role to the selected users'),
-      'configuration' => [
-        'rid' => RoleInterface::ANONYMOUS_ID,
-      ],
-      'plugin' => 'user_add_role_action',
-    ]);
-    $action->save();
-
-    return $action;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    return [
-      'configuration' => [
-        'rid' => 'anonymous',
-      ],
-      'dependencies' => [
-        'config' => ['user.role.anonymous'],
-        'module' => ['user'],
-      ],
-      'id' => 'user_add_role_action.anonymous',
-      'label' => 'Add the anonymous role to the selected users',
-      'langcode' => 'en',
-      'plugin' => 'user_add_role_action',
-      'status' => TRUE,
-      'type' => 'user',
-      'uuid' => $this->entity->uuid(),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    return [
-      'user.permissions',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    // @todo Update in https://www.drupal.org/node/2300677.
-  }
+use Drupal\Tests\system\Functional\Rest\ActionResourceTestBase as ActionResourceTestBaseReal;
 
+/**
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\system\Functional\Rest\ActionResourceTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
+ */
+abstract class ActionResourceTestBase extends ActionResourceTestBaseReal {
 }

core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlAnonTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Action;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ActionXmlAnonTest extends ActionResourceTestBase {
-
-  use AnonResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlBasicAuthTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Action;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ActionXmlBasicAuthTest extends ActionResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Action/ActionXmlCookieTest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Action;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ActionXmlCookieTest extends ActionResourceTestBase {
-
-  use CookieResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonAnonTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class BaseFieldOverrideJsonAnonTest extends BaseFieldOverrideResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group rest
- */
-class BaseFieldOverrideJsonBasicAuthTest extends BaseFieldOverrideResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideJsonCookieTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group rest
- */
-class BaseFieldOverrideJsonCookieTest extends BaseFieldOverrideResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideResourceTestBase.php

@@ -2,110 +2,15 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
 
-use Drupal\Core\Field\Entity\BaseFieldOverride;
-use Drupal\node\Entity\NodeType;
-use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+@trigger_error('The ' . __NAMESPACE__ . '\BaseFieldOverrideResourceTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\FunctionalTests\Rest\BaseFieldOverrideResourceTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
 
-abstract class BaseFieldOverrideResourceTestBase extends EntityResourceTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['field', 'node'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'base_field_override';
-
-  /**
-   * @var \Drupal\Core\Field\Entity\BaseFieldOverride
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    $this->grantPermissionsToTestedRole(['administer node fields']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    $camelids = NodeType::create([
-      'name' => 'Camelids',
-      'type' => 'camelids',
-    ]);
-    $camelids->save();
-
-    $entity = BaseFieldOverride::create([
-      'field_name' => 'promote',
-      'entity_type' => 'node',
-      'bundle' => 'camelids',
-    ]);
-    $entity->save();
-
-    return $entity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    return [
-      'bundle' => 'camelids',
-      'default_value' => [],
-      'default_value_callback' => '',
-      'dependencies' => [
-        'config' => [
-          'node.type.camelids',
-        ],
-      ],
-      'description' => '',
-      'entity_type' => 'node',
-      'field_name' => 'promote',
-      'field_type' => 'boolean',
-      'id' => 'node.camelids.promote',
-      'label' => NULL,
-      'langcode' => 'en',
-      'required' => FALSE,
-      'settings' => [
-        'on_label' => 'On',
-        'off_label' => 'Off',
-      ],
-      'status' => TRUE,
-      'translatable' => TRUE,
-      'uuid' => $this->entity->uuid(),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    // @todo Update in https://www.drupal.org/node/2300677.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    return [
-      'user.permissions',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedUnauthorizedAccessMessage($method) {
-    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
-      return parent::getExpectedUnauthorizedAccessMessage($method);
-    }
-
-    return "The 'administer node fields' permission is required.";
-  }
+use Drupal\FunctionalTests\Rest\BaseFieldOverrideResourceTestBase as BaseFieldOverrideResourceTestBaseReal;
 
+/**
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\FunctionalTests\Rest\BaseFieldOverrideResourceTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
+ */
+abstract class BaseFieldOverrideResourceTestBase extends BaseFieldOverrideResourceTestBaseReal {
 }

core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlAnonTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class BaseFieldOverrideXmlAnonTest extends BaseFieldOverrideResourceTestBase {
-
-  use AnonResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlBasicAuthTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class BaseFieldOverrideXmlBasicAuthTest extends BaseFieldOverrideResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BaseFieldOverride/BaseFieldOverrideXmlCookieTest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BaseFieldOverride;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class BaseFieldOverrideXmlCookieTest extends BaseFieldOverrideResourceTestBase {
-
-  use CookieResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonAnonTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class BlockJsonAnonTest extends BlockResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group rest
- */
-class BlockJsonBasicAuthTest extends BlockResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Block/BlockJsonCookieTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group rest
- */
-class BlockJsonCookieTest extends BlockResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Block/BlockResourceTestBase.php

@@ -2,158 +2,15 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\Block;
 
-use Drupal\block\Entity\Block;
-use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+@trigger_error('The ' . __NAMESPACE__ . '\BlockResourceTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\block\Functional\Rest\BlockResourceTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
 
-abstract class BlockResourceTestBase extends EntityResourceTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['block'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'block';
-
-  /**
-   * @var \Drupal\block\BlockInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    switch ($method) {
-      case 'GET':
-        $this->entity->setVisibilityConfig('user_role', [])->save();
-        break;
-      case 'POST':
-        $this->grantPermissionsToTestedRole(['administer blocks']);
-        break;
-      case 'PATCH':
-        $this->grantPermissionsToTestedRole(['administer blocks']);
-        break;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    $block = Block::create([
-      'plugin' => 'llama_block',
-      'region' => 'header',
-      'id' => 'llama',
-      'theme' => 'classy',
-    ]);
-    // All blocks can be viewed by the anonymous user by default. An interesting
-    // side effect of this is that any anonymous user is also able to read the
-    // corresponding block config entity via REST, even if an authentication
-    // provider is configured for the block config entity REST resource! In
-    // other words: Block entities do not distinguish between 'view' as in
-    // "render on a page" and 'view' as in "read the configuration".
-    // This prevents that.
-    // @todo Fix this in https://www.drupal.org/node/2820315.
-    $block->setVisibilityConfig('user_role', [
-      'id' => 'user_role',
-      'roles' => ['non-existing-role' => 'non-existing-role'],
-      'negate' => FALSE,
-      'context_mapping' => [
-        'user' => '@user.current_user_context:current_user',
-      ],
-    ]);
-    $block->save();
-
-    return $block;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    $normalization = [
-      'uuid' => $this->entity->uuid(),
-      'id' => 'llama',
-      'weight' => NULL,
-      'langcode' => 'en',
-      'status' => TRUE,
-      'dependencies' => [
-        'theme' => [
-          'classy',
-        ],
-      ],
-      'theme' => 'classy',
-      'region' => 'header',
-      'provider' => NULL,
-      'plugin' => 'llama_block',
-      'settings' => [
-        'id' => 'broken',
-        'label' => '',
-        'provider' => 'core',
-        'label_display' => 'visible',
-      ],
-      'visibility' => [],
-    ];
-
-    return $normalization;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    // @todo Update in https://www.drupal.org/node/2300677.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    // @see ::createEntity()
-    return ['url.site'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheTags() {
-    // Because the 'user.permissions' cache context is missing, the cache tag
-    // for the anonymous user role is never added automatically.
-    return array_values(array_diff(parent::getExpectedCacheTags(), ['config:user.role.anonymous']));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedUnauthorizedAccessMessage($method) {
-    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
-      return parent::getExpectedUnauthorizedAccessMessage($method);
-    }
-
-    switch ($method) {
-      case 'GET':
-        return "You are not authorized to view this block entity.";
-      default:
-        return parent::getExpectedUnauthorizedAccessMessage($method);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedUnauthorizedAccessCacheability() {
-    // @see \Drupal\block\BlockAccessControlHandler::checkAccess()
-    return parent::getExpectedUnauthorizedAccessCacheability()
-      ->setCacheTags([
-        '4xx-response',
-        'config:block.block.llama',
-        'http_response',
-        static::$auth ? 'user:2' : 'user:0',
-      ])
-      ->setCacheContexts(['user.roles']);
-  }
+use Drupal\Tests\block\Functional\Rest\BlockResourceTestBase as BlockResourceTestBaseReal;
 
+/**
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\block\Functional\Rest\BlockResourceTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
+ */
+abstract class BlockResourceTestBase extends BlockResourceTestBaseReal {
 }

core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlAnonTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class BlockXmlAnonTest extends BlockResourceTestBase {
-
-  use AnonResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlBasicAuthTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class BlockXmlBasicAuthTest extends BlockResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Block/BlockXmlCookieTest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Block;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class BlockXmlCookieTest extends BlockResourceTestBase {
-
-  use CookieResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonAnonTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class BlockContentJsonAnonTest extends BlockContentResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group rest
- */
-class BlockContentJsonBasicAuthTest extends BlockContentResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentJsonCookieTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group rest
- */
-class BlockContentJsonCookieTest extends BlockContentResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentResourceTestBase.php

@@ -2,198 +2,15 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
 
-use Drupal\block_content\Entity\BlockContent;
-use Drupal\block_content\Entity\BlockContentType;
-use Drupal\Core\Cache\Cache;
-use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+@trigger_error('The ' . __NAMESPACE__ . '\BlockContentResourceTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\block_content\Functional\Rest\BlockContentResourceTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
+
+use Drupal\Tests\block_content\Functional\Rest\BlockContentResourceTestBase as BlockContentResourceTestBaseReal;
 
 /**
- * ResourceTestBase for BlockContent entity.
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\block_content\Functional\Rest\BlockContentResourceTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
  */
-abstract class BlockContentResourceTestBase extends EntityResourceTestBase {
-
-  use BcTimestampNormalizerUnixTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['block_content'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'block_content';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $patchProtectedFieldNames = [
-    'changed',
-  ];
-
-  /**
-   * @var \Drupal\block_content\BlockContentInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    $this->grantPermissionsToTestedRole(['administer blocks']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    if (!BlockContentType::load('basic')) {
-      $block_content_type = BlockContentType::create([
-        'id' => 'basic',
-        'label' => 'basic',
-        'revision' => TRUE,
-      ]);
-      $block_content_type->save();
-      block_content_add_body_field($block_content_type->id());
-    }
-
-    // Create a "Llama" custom block.
-    $block_content = BlockContent::create([
-      'info' => 'Llama',
-      'type' => 'basic',
-      'body' => [
-        'value' => 'The name "llama" was adopted by European settlers from native Peruvians.',
-        'format' => 'plain_text',
-      ],
-    ])
-      ->setPublished(FALSE);
-    $block_content->save();
-    return $block_content;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    return [
-      'id' => [
-        [
-          'value' => 1,
-        ],
-      ],
-      'uuid' => [
-        [
-          'value' => $this->entity->uuid(),
-        ],
-      ],
-      'langcode' => [
-        [
-          'value' => 'en',
-        ],
-      ],
-      'type' => [
-        [
-          'target_id' => 'basic',
-          'target_type' => 'block_content_type',
-          'target_uuid' => BlockContentType::load('basic')->uuid(),
-        ],
-      ],
-      'info' => [
-        [
-          'value' => 'Llama',
-        ],
-      ],
-      'revision_log' => [],
-      'changed' => [
-        $this->formatExpectedTimestampItemValues($this->entity->getChangedTime()),
-      ],
-      'revision_id' => [
-        [
-          'value' => 1,
-        ],
-      ],
-      'revision_created' => [
-        $this->formatExpectedTimestampItemValues((int) $this->entity->getRevisionCreationTime()),
-      ],
-      'revision_user' => [],
-      'revision_translation_affected' => [
-        [
-          'value' => TRUE,
-        ],
-      ],
-      'default_langcode' => [
-        [
-          'value' => TRUE,
-        ],
-      ],
-      'body' => [
-        [
-          'value' => 'The name "llama" was adopted by European settlers from native Peruvians.',
-          'format' => 'plain_text',
-          'summary' => NULL,
-          'processed' => "<p>The name &quot;llama&quot; was adopted by European settlers from native Peruvians.</p>\n",
-        ],
-      ],
-      'status' => [
-        [
-          'value' => FALSE,
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    return [
-      'type' => [
-        [
-          'target_id' => 'basic',
-        ],
-      ],
-      'info' => [
-        [
-          'value' => 'Dramallama',
-        ],
-      ],
-    ];
-  }
-
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedUnauthorizedAccessMessage($method) {
-    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
-      return parent::getExpectedUnauthorizedAccessMessage($method);
-    }
-
-    return parent::getExpectedUnauthorizedAccessMessage($method);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedUnauthorizedAccessCacheability() {
-    // @see \Drupal\block_content\BlockContentAccessControlHandler()
-    return parent::getExpectedUnauthorizedAccessCacheability()
-      ->addCacheTags(['block_content:1']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheTags() {
-    return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:filter.format.plain_text']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    return Cache::mergeContexts(['url.site'], $this->container->getParameter('renderer.config')['required_cache_contexts']);
-  }
-
+abstract class BlockContentResourceTestBase extends BlockContentResourceTestBaseReal {
 }

core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlAnonTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class BlockContentXmlAnonTest extends BlockContentResourceTestBase {
-
-  use AnonResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlBasicAuthTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class BlockContentXmlBasicAuthTest extends BlockContentResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentXmlCookieTest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContent;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class BlockContentXmlCookieTest extends BlockContentResourceTestBase {
-
-  use CookieResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonAnonTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class BlockContentTypeJsonAnonTest extends BlockContentTypeResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group rest
- */
-class BlockContentTypeJsonBasicAuthTest extends BlockContentTypeResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeJsonCookieTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group rest
- */
-class BlockContentTypeJsonCookieTest extends BlockContentTypeResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeResourceTestBase.php

@@ -2,70 +2,15 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
 
-use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
-use Drupal\block_content\Entity\BlockContentType;
+@trigger_error('The ' . __NAMESPACE__ . '\BlockContentTypeResourceTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\block_content\Functional\Rest\BlockContentTypeResourceTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
 
-abstract class BlockContentTypeResourceTestBase extends EntityResourceTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['block_content'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'block_content_type';
-
-  /**
-   * @var \Drupal\block_content\Entity\BlockContentTypeInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    $this->grantPermissionsToTestedRole(['administer blocks']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    $block_content_type = BlockContentType::create([
-      'id' => 'pascal',
-      'label' => 'Pascal',
-      'revision' => FALSE,
-      'description' => 'Provides a competitive alternative to the "basic" type',
-    ]);
-
-    $block_content_type->save();
-
-    return $block_content_type;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    return [
-      'dependencies' => [],
-      'description' => 'Provides a competitive alternative to the "basic" type',
-      'id' => 'pascal',
-      'label' => 'Pascal',
-      'langcode' => 'en',
-      'revision' => 0,
-      'status' => TRUE,
-      'uuid' => $this->entity->uuid(),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    // @todo Update in https://www.drupal.org/node/2300677.
-  }
+use Drupal\Tests\block_content\Functional\Rest\BlockContentTypeResourceTestBase as BlockContentTypeResourceTestBaseReal;
 
+/**
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\block_content\Functional\Rest\BlockContentTypeResourceTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
+ */
+abstract class BlockContentTypeResourceTestBase extends BlockContentTypeResourceTestBaseReal {
 }

core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlAnonTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class BlockContentTypeXmlAnonTest extends BlockContentTypeResourceTestBase {
-
-  use AnonResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlBasicAuthTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class BlockContentTypeXmlBasicAuthTest extends BlockContentTypeResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/BlockContentType/BlockContentTypeXmlCookieTest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\BlockContentType;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class BlockContentTypeXmlCookieTest extends BlockContentTypeResourceTestBase {
-
-  use CookieResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonAnonTest.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class CommentJsonAnonTest extends CommentResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   *
-   * Anononymous users cannot edit their own comments.
-   *
-   * @see \Drupal\comment\CommentAccessControlHandler::checkAccess
-   *
-   * Therefore we grant them the 'administer comments' permission for the
-   * purpose of this test.
-   *
-   * @see ::setUpAuthorization
-   */
-  protected static $patchProtectedFieldNames = [
-    'pid',
-    'entity_id',
-    'changed',
-    'thread',
-    'entity_type',
-    'field_name',
-  ];
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group rest
- */
-class CommentJsonBasicAuthTest extends CommentResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentJsonCookieTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group rest
- */
-class CommentJsonCookieTest extends CommentResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php

@@ -2,384 +2,15 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
 
-use Drupal\comment\Entity\Comment;
-use Drupal\comment\Entity\CommentType;
-use Drupal\comment\Tests\CommentTestTrait;
-use Drupal\Core\Cache\Cache;
-use Drupal\entity_test\Entity\EntityTest;
-use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
-use Drupal\user\Entity\User;
-use GuzzleHttp\RequestOptions;
+@trigger_error('The ' . __NAMESPACE__ . '\CommentResourceTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\comment\Functional\Rest\CommentResourceTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
 
-abstract class CommentResourceTestBase extends EntityResourceTestBase {
-
-  use CommentTestTrait, BcTimestampNormalizerUnixTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['comment', 'entity_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'comment';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $patchProtectedFieldNames = [
-    'status',
-    'pid',
-    'entity_id',
-    'uid',
-    'name',
-    'homepage',
-    'created',
-    'changed',
-    'thread',
-    'entity_type',
-    'field_name',
-  ];
-
-  /**
-   * @var \Drupal\comment\CommentInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    switch ($method) {
-      case 'GET':
-        $this->grantPermissionsToTestedRole(['access comments', 'view test entity']);
-        break;
-      case 'POST':
-        $this->grantPermissionsToTestedRole(['post comments']);
-        break;
-      case 'PATCH':
-        // Anononymous users are not ever allowed to edit their own comments. To
-        // be able to test PATCHing comments as the anonymous user, the more
-        // permissive 'administer comments' permission must be granted.
-        // @see \Drupal\comment\CommentAccessControlHandler::checkAccess
-        if (static::$auth) {
-          $this->grantPermissionsToTestedRole(['edit own comments']);
-        }
-        else {
-          $this->grantPermissionsToTestedRole(['administer comments']);
-        }
-        break;
-      case 'DELETE':
-        $this->grantPermissionsToTestedRole(['administer comments']);
-        break;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    // Create a "bar" bundle for the "entity_test" entity type and create.
-    $bundle = 'bar';
-    entity_test_create_bundle($bundle, NULL, 'entity_test');
-
-    // Create a comment field on this bundle.
-    $this->addDefaultCommentField('entity_test', 'bar', 'comment');
-
-    // Create a "Camelids" test entity that the comment will be assigned to.
-    $commented_entity = EntityTest::create([
-      'name' => 'Camelids',
-      'type' => 'bar',
-    ]);
-    $commented_entity->save();
-
-    // Create a "Llama" comment.
-    $comment = Comment::create([
-      'comment_body' => [
-        'value' => 'The name "llama" was adopted by European settlers from native Peruvians.',
-        'format' => 'plain_text',
-      ],
-      'entity_id' => $commented_entity->id(),
-      'entity_type' => 'entity_test',
-      'field_name' => 'comment',
-    ]);
-    $comment->setSubject('Llama')
-      ->setOwnerId(static::$auth ? $this->account->id() : 0)
-      ->setPublished(TRUE)
-      ->setCreatedTime(123456789)
-      ->setChangedTime(123456789);
-    $comment->save();
-
-    return $comment;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    $author = User::load($this->entity->getOwnerId());
-    return [
-      'cid' => [
-        ['value' => 1],
-      ],
-      'uuid' => [
-        ['value' => $this->entity->uuid()],
-      ],
-      'langcode' => [
-        [
-          'value' => 'en',
-        ],
-      ],
-      'comment_type' => [
-        [
-          'target_id' => 'comment',
-          'target_type' => 'comment_type',
-          'target_uuid' => CommentType::load('comment')->uuid(),
-        ],
-      ],
-      'subject' => [
-        [
-          'value' => 'Llama',
-        ],
-      ],
-      'status' => [
-        [
-          'value' => TRUE,
-        ],
-      ],
-      'created' => [
-        $this->formatExpectedTimestampItemValues(123456789),
-      ],
-      'changed' => [
-        $this->formatExpectedTimestampItemValues($this->entity->getChangedTime()),
-      ],
-      'default_langcode' => [
-        [
-          'value' => TRUE,
-        ],
-      ],
-      'uid' => [
-        [
-          'target_id' => (int) $author->id(),
-          'target_type' => 'user',
-          'target_uuid' => $author->uuid(),
-          'url' => base_path() . 'user/' . $author->id(),
-        ],
-      ],
-      'pid' => [],
-      'entity_type' => [
-        [
-          'value' => 'entity_test',
-        ],
-      ],
-      'entity_id' => [
-        [
-          'target_id' => 1,
-          'target_type' => 'entity_test',
-          'target_uuid' => EntityTest::load(1)->uuid(),
-          'url' => base_path() . 'entity_test/1',
-        ],
-      ],
-      'field_name' => [
-        [
-          'value' => 'comment',
-        ],
-      ],
-      'name' => [],
-      'homepage' => [],
-      'thread' => [
-        [
-          'value' => '01/',
-        ],
-      ],
-      'comment_body' => [
-        [
-          'value' => 'The name "llama" was adopted by European settlers from native Peruvians.',
-          'format' => 'plain_text',
-          'processed' => '<p>The name &quot;llama&quot; was adopted by European settlers from native Peruvians.</p>' . "\n",
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    return [
-      'comment_type' => [
-        [
-          'target_id' => 'comment',
-        ],
-      ],
-      'entity_type' => [
-        [
-          'value' => 'entity_test',
-        ],
-      ],
-      'entity_id' => [
-        [
-          'target_id' => (int) EntityTest::load(1)->id(),
-        ],
-      ],
-      'field_name' => [
-        [
-          'value' => 'comment',
-        ],
-      ],
-      'subject' => [
-        [
-          'value' => 'Dramallama',
-        ],
-      ],
-      'comment_body' => [
-        [
-          'value' => 'Llamas are awesome.',
-          'format' => 'plain_text',
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPatchEntity() {
-    return array_diff_key($this->getNormalizedPostEntity(), ['entity_type' => TRUE, 'entity_id' => TRUE, 'field_name' => TRUE]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheTags() {
-    return Cache::mergeTags(parent::getExpectedCacheTags(), ['config:filter.format.plain_text']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    return Cache::mergeContexts(['languages:language_interface', 'theme'], parent::getExpectedCacheContexts());
-  }
-
-  /**
-   * Tests POSTing a comment without critical base fields.
-   *
-   * testPost() is testing with the most minimal normalization possible: the one
-   * returned by ::getNormalizedPostEntity().
-   *
-   * But Comment entities have some very special edge cases:
-   * - base fields that are not marked as required in
-   *   \Drupal\comment\Entity\Comment::baseFieldDefinitions() yet in fact are
-   *   required.
-   * - base fields that are marked as required, but yet can still result in
-   *   validation errors other than "missing required field".
-   */
-  public function testPostDxWithoutCriticalBaseFields() {
-    $this->initAuthentication();
-    $this->provisionEntityResource();
-    $this->setUpAuthorization('POST');
-
-    $url = $this->getEntityResourcePostUrl()->setOption('query', ['_format' => static::$format]);
-    $request_options = [];
-    $request_options[RequestOptions::HEADERS]['Accept'] = static::$mimeType;
-    $request_options[RequestOptions::HEADERS]['Content-Type'] = static::$mimeType;
-    $request_options = array_merge_recursive($request_options, $this->getAuthenticationRequestOptions('POST'));
-
-    // DX: 422 when missing 'entity_type' field.
-    $request_options[RequestOptions::BODY] = $this->serializer->encode(array_diff_key($this->getNormalizedPostEntity(), ['entity_type' => TRUE]), static::$format);
-    $response = $this->request('POST', $url, $request_options);
-    // @todo Uncomment, remove next 3 lines in https://www.drupal.org/node/2820364.
-    $this->assertSame(500, $response->getStatusCode());
-    $this->assertSame(['text/plain; charset=UTF-8'], $response->getHeader('Content-Type'));
-    $this->assertStringStartsWith('The website encountered an unexpected error. Please try again later.</br></br><em class="placeholder">Symfony\Component\HttpKernel\Exception\HttpException</em>: Internal Server Error in <em class="placeholder">Drupal\rest\Plugin\rest\resource\EntityResource-&gt;post()</em>', (string) $response->getBody());
-    // $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nentity_type: This value should not be null.\n", $response);
-
-    // DX: 422 when missing 'entity_id' field.
-    $request_options[RequestOptions::BODY] = $this->serializer->encode(array_diff_key($this->getNormalizedPostEntity(), ['entity_id' => TRUE]), static::$format);
-    // @todo Remove the try/catch in favor of the two commented lines in
-    // https://www.drupal.org/node/2820364.
-    try {
-      $response = $this->request('POST', $url, $request_options);
-      // This happens on DrupalCI.
-      // $this->assertSame(500, $response->getStatusCode());
-    }
-    catch (\Exception $e) {
-      // This happens on Wim's local machine.
-      // $this->assertSame("Error: Call to a member function get() on null\nDrupal\\comment\\Plugin\\Validation\\Constraint\\CommentNameConstraintValidator->getAnonymousContactDetailsSetting()() (Line: 96)\n", $e->getMessage());
-    }
-    // $response = $this->request('POST', $url, $request_options);
-    // $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nentity_type: This value should not be null.\n", $response);
-
-    // DX: 422 when missing 'entity_type' field.
-    $request_options[RequestOptions::BODY] = $this->serializer->encode(array_diff_key($this->getNormalizedPostEntity(), ['field_name' => TRUE]), static::$format);
-    $response = $this->request('POST', $url, $request_options);
-    // @todo Uncomment, remove next 2 lines in https://www.drupal.org/node/2820364.
-    $this->assertSame(500, $response->getStatusCode());
-    $this->assertSame(['text/plain; charset=UTF-8'], $response->getHeader('Content-Type'));
-    // $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nfield_name: This value should not be null.\n", $response);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedUnauthorizedAccessMessage($method) {
-    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
-      return parent::getExpectedUnauthorizedAccessMessage($method);
-    }
-
-    switch ($method) {
-      case 'GET';
-        return "The 'access comments' permission is required and the comment must be published.";
-      case 'POST';
-        return "The 'post comments' permission is required.";
-      default:
-        return parent::getExpectedUnauthorizedAccessMessage($method);
-    }
-  }
-
-  /**
-   * Tests POSTing a comment with and without 'skip comment approval'
-   */
-  public function testPostSkipCommentApproval() {
-    $this->initAuthentication();
-    $this->provisionEntityResource();
-    $this->setUpAuthorization('POST');
-
-    // Create request.
-    $request_options = [];
-    $request_options[RequestOptions::HEADERS]['Accept'] = static::$mimeType;
-    $request_options[RequestOptions::HEADERS]['Content-Type'] = static::$mimeType;
-    $request_options = array_merge_recursive($request_options, $this->getAuthenticationRequestOptions('POST'));
-    $request_options[RequestOptions::BODY] = $this->serializer->encode($this->getNormalizedPostEntity(), static::$format);
-
-    $url = $this->getEntityResourcePostUrl()->setOption('query', ['_format' => static::$format]);
-
-    // Status should be FALSE when posting as anonymous.
-    $response = $this->request('POST', $url, $request_options);
-    $unserialized = $this->serializer->deserialize((string) $response->getBody(), get_class($this->entity), static::$format);
-    $this->assertResourceResponse(201, FALSE, $response);
-    $this->assertFalse($unserialized->getStatus());
-
-    // Grant anonymous permission to skip comment approval.
-    $this->grantPermissionsToTestedRole(['skip comment approval']);
-
-    // Status should be TRUE when posting as anonymous and skip comment approval.
-    $response = $this->request('POST', $url, $request_options);
-    $unserialized = $this->serializer->deserialize((string) $response->getBody(), get_class($this->entity), static::$format);
-    $this->assertResourceResponse(201, FALSE, $response);
-    $this->assertTrue($unserialized->getStatus());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedUnauthorizedAccessCacheability() {
-    // @see \Drupal\comment\CommentAccessControlHandler::checkAccess()
-    return parent::getExpectedUnauthorizedAccessCacheability()
-      ->addCacheTags(['comment:1']);
-  }
+use Drupal\Tests\comment\Functional\Rest\CommentResourceTestBase as CommentResourceTestBaseReal;
 
+/**
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\comment\Functional\Rest\CommentResourceTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
+ */
+abstract class CommentResourceTestBase extends CommentResourceTestBaseReal {
 }

core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlAnonTest.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class CommentXmlAnonTest extends CommentResourceTestBase {
-
-  use AnonResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   *
-   * Anononymous users cannot edit their own comments.
-   *
-   * @see \Drupal\comment\CommentAccessControlHandler::checkAccess
-   *
-   * Therefore we grant them the 'administer comments' permission for the
-   * purpose of this test.
-   *
-   * @see ::setUpAuthorization
-   */
-  protected static $patchProtectedFieldNames = [
-    'pid',
-    'entity_id',
-    'changed',
-    'thread',
-    'entity_type',
-    'field_name',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function testPostDxWithoutCriticalBaseFields() {
-    // Deserialization of the XML format is not supported.
-    $this->markTestSkipped();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function testPostSkipCommentApproval() {
-    // Deserialization of the XML format is not supported.
-    $this->markTestSkipped();
-  }
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlBasicAuthTest.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class CommentXmlBasicAuthTest extends CommentResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function testPostDxWithoutCriticalBaseFields() {
-    // Deserialization of the XML format is not supported.
-    $this->markTestSkipped();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function testPostSkipCommentApproval() {
-    // Deserialization of the XML format is not supported.
-    $this->markTestSkipped();
-  }
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentXmlCookieTest.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Comment;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class CommentXmlCookieTest extends CommentResourceTestBase {
-
-  use CookieResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function testPostDxWithoutCriticalBaseFields() {
-    // Deserialization of the XML format is not supported.
-    $this->markTestSkipped();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function testPostSkipCommentApproval() {
-    // Deserialization of the XML format is not supported.
-    $this->markTestSkipped();
-  }
-
-}

core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonAnonTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class CommentTypeJsonAnonTest extends CommentTypeResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group rest
- */
-class CommentTypeJsonBasicAuthTest extends CommentTypeResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeJsonCookieTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group rest
- */
-class CommentTypeJsonCookieTest extends CommentTypeResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeResourceTestBase.php

@@ -2,76 +2,15 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
 
-use Drupal\comment\Entity\CommentType;
-use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+@trigger_error('The ' . __NAMESPACE__ . '\CommentTypeResourceTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\comment\Functional\Rest\CommentTypeResourceTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
+
+use Drupal\Tests\comment\Functional\Rest\CommentTypeResourceTestBase as CommentTypeResourceTestBaseReal;
 
 /**
- * ResourceTestBase for CommentType entity.
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\comment\Functional\Rest\CommentTypeResourceTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
  */
-abstract class CommentTypeResourceTestBase extends EntityResourceTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['node', 'comment'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'comment_type';
-
-  /**
-   * The CommentType entity.
-   *
-   * @var \Drupal\comment\CommentTypeInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    $this->grantPermissionsToTestedRole(['administer comment types']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    // Create a "Camelids" comment type.
-    $camelids = CommentType::create([
-      'id' => 'camelids',
-      'label' => 'Camelids',
-      'description' => 'Camelids are large, strictly herbivorous animals with slender necks and long legs.',
-      'target_entity_type_id' => 'node',
-    ]);
-
-    $camelids->save();
-
-    return $camelids;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    return [
-      'dependencies' => [],
-      'description' => 'Camelids are large, strictly herbivorous animals with slender necks and long legs.',
-      'id' => 'camelids',
-      'label' => 'Camelids',
-      'langcode' => 'en',
-      'status' => TRUE,
-      'target_entity_type_id' => 'node',
-      'uuid' => $this->entity->uuid(),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    // @todo Update in https://www.drupal.org/node/2300677.
-  }
-
+abstract class CommentTypeResourceTestBase extends CommentTypeResourceTestBaseReal {
 }

core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlAnonTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class CommentTypeXmlAnonTest extends CommentTypeResourceTestBase {
-
-  use AnonResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlBasicAuthTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class CommentTypeXmlBasicAuthTest extends CommentTypeResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/CommentType/CommentTypeXmlCookieTest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\CommentType;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class CommentTypeXmlCookieTest extends CommentTypeResourceTestBase {
-
-  use CookieResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonAnonTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class ConfigTestJsonAnonTest extends ConfigTestResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group rest
- */
-class ConfigTestJsonBasicAuthTest extends ConfigTestResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestJsonCookieTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group rest
- */
-class ConfigTestJsonCookieTest extends ConfigTestResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestResourceTestBase.php

@@ -2,72 +2,15 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
 
-use Drupal\config_test\Entity\ConfigTest;
-use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+@trigger_error('The ' . __NAMESPACE__ . '\ConfigTestResourceTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\config_test\Functional\Rest\ConfigTestResourceTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
 
-abstract class ConfigTestResourceTestBase extends EntityResourceTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['config_test', 'config_test_rest'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'config_test';
-
-  /**
-   * @var \Drupal\config_test\ConfigTestInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    $this->grantPermissionsToTestedRole(['view config_test']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    $config_test = ConfigTest::create([
-      'id' => 'llama',
-      'label' => 'Llama',
-    ]);
-    $config_test->save();
-
-    return $config_test;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    $normalization = [
-      'uuid' => $this->entity->uuid(),
-      'id' => 'llama',
-      'weight' => 0,
-      'langcode' => 'en',
-      'status' => TRUE,
-      'dependencies' => [],
-      'label' => 'Llama',
-      'style' => NULL,
-      'size' => NULL,
-      'size_value' => NULL,
-      'protected_property' => NULL,
-    ];
-
-    return $normalization;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    // @todo Update in https://www.drupal.org/node/2300677.
-  }
+use Drupal\Tests\config_test\Functional\Rest\ConfigTestResourceTestBase as ConfigTestResourceTestBaseReal;
 
+/**
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\config_test\Functional\Rest\ConfigTestResourceTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
+ */
+abstract class ConfigTestResourceTestBase extends ConfigTestResourceTestBaseReal {
 }

core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlAnonTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ConfigTestXmlAnonTest extends ConfigTestResourceTestBase {
-
-  use AnonResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlBasicAuthTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ConfigTestXmlBasicAuthTest extends ConfigTestResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ConfigTest/ConfigTestXmlCookieTest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigTest;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ConfigTestXmlCookieTest extends ConfigTestResourceTestBase {
-
-  use CookieResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonAnonTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class ConfigurableLanguageJsonAnonTest extends ConfigurableLanguageResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
-
-/**
- * @group rest
- */
-class ConfigurableLanguageJsonBasicAuthTest extends ConfigurableLanguageResourceTestBase {
-
-  use BasicAuthResourceWithInterfaceTranslationTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageJsonCookieTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group rest
- */
-class ConfigurableLanguageJsonCookieTest extends ConfigurableLanguageResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageResourceTestBase.php

@@ -2,94 +2,15 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
 
-use Drupal\Core\Cache\Cache;
-use Drupal\Core\Url;
-use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
-use Drupal\language\Entity\ConfigurableLanguage;
+@trigger_error('The ' . __NAMESPACE__ . '\ConfigurableLanguageResourceTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\language\Functional\Rest\ConfigurableLanguageResourceTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
 
-abstract class ConfigurableLanguageResourceTestBase extends EntityResourceTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['language'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'configurable_language';
-
-  /**
-   * @var \Drupal\language\ConfigurableLanguageInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    $this->grantPermissionsToTestedRole(['administer languages']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    $configurable_language = ConfigurableLanguage::create([
-      'id' => 'll',
-      'label' => 'Llama Language',
-    ]);
-    $configurable_language->save();
-
-    return $configurable_language;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    return [
-      'dependencies' => [],
-      'direction' => 'ltr',
-      'id' => 'll',
-      'label' => 'Llama Language',
-      'langcode' => 'en',
-      'locked' => FALSE,
-      'status' => TRUE,
-      'uuid' => $this->entity->uuid(),
-      'weight' => 0,
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    return Cache::mergeContexts(parent::getExpectedCacheContexts(), ['languages:language_interface']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    // @todo Update in https://www.drupal.org/node/2300677.
-  }
-
-  /**
-   * Test a GET request for a default config entity, which has a _core key.
-   *
-   * @see https://www.drupal.org/node/2915414
-   */
-  public function testGetDefaultConfig() {
-    $this->initAuthentication();
-    $url = Url::fromUri('base:/entity/configurable_language/en')->setOption('query', ['_format' => static::$format]);;
-    $request_options = $this->getAuthenticationRequestOptions('GET');
-    $this->provisionEntityResource();
-    $this->setUpAuthorization('GET');
-    $response = $this->request('GET', $url, $request_options);
-
-    $normalization = $this->serializer->decode((string) $response->getBody(), static::$format);
-    $this->assertArrayNotHasKey('_core', $normalization);
-  }
+use Drupal\Tests\language\Functional\Rest\ConfigurableLanguageResourceTestBase as ConfigurableLanguageResourceTestBaseReal;
 
+/**
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\language\Functional\Rest\ConfigurableLanguageResourceTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
+ */
+abstract class ConfigurableLanguageResourceTestBase extends ConfigurableLanguageResourceTestBaseReal {
 }

core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlAnonTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ConfigurableLanguageXmlAnonTest extends ConfigurableLanguageResourceTestBase {
-
-  use AnonResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlBasicAuthTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ConfigurableLanguageXmlBasicAuthTest extends ConfigurableLanguageResourceTestBase {
-
-  use BasicAuthResourceWithInterfaceTranslationTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ConfigurableLanguage/ConfigurableLanguageXmlCookieTest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ConfigurableLanguage;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ConfigurableLanguageXmlCookieTest extends ConfigurableLanguageResourceTestBase {
-
-  use CookieResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonAnonTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class ContactFormJsonAnonTest extends ContactFormResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group rest
- */
-class ContactFormJsonBasicAuthTest extends ContactFormResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormJsonCookieTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group rest
- */
-class ContactFormJsonCookieTest extends ContactFormResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormResourceTestBase.php

@@ -2,103 +2,15 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
 
-use Drupal\contact\Entity\ContactForm;
-use Drupal\Tests\rest\Functional\BcTimestampNormalizerUnixTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+@trigger_error('The ' . __NAMESPACE__ . '\ContactFormResourceTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\contact\Functional\Rest\ContactFormResourceTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
 
-abstract class ContactFormResourceTestBase extends EntityResourceTestBase {
-
-  use BcTimestampNormalizerUnixTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['contact'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'contact_form';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $patchProtectedFieldNames = [];
-
-  /**
-   * @var \Drupal\contact\Entity\ContactForm
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    switch ($method) {
-      case 'GET':
-        $this->grantPermissionsToTestedRole(['access site-wide contact form']);
-      default:
-        $this->grantPermissionsToTestedRole(['administer contact forms']);
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    $contact_form = ContactForm::create([
-      'id' => 'llama',
-      'label' => 'Llama',
-      'message' => 'Let us know what you think about llamas',
-      'reply' => 'Llamas are indeed awesome!',
-      'recipients' => [
-        'llama@example.com',
-        'contact@example.com',
-      ],
-    ]);
-    $contact_form->save();
-
-    return $contact_form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    return [
-      'dependencies' => [],
-      'id' => 'llama',
-      'label' => 'Llama',
-      'langcode' => 'en',
-      'message' => 'Let us know what you think about llamas',
-      'recipients' => [
-        'llama@example.com',
-        'contact@example.com',
-      ],
-      'redirect' => NULL,
-      'reply' => 'Llamas are indeed awesome!',
-      'status' => TRUE,
-      'uuid' => $this->entity->uuid(),
-      'weight' => 0,
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    // @todo Update in https://www.drupal.org/node/2300677.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedUnauthorizedAccessMessage($method) {
-    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
-      return parent::getExpectedUnauthorizedAccessMessage($method);
-    }
-
-    return "The 'access site-wide contact form' permission is required.";
-  }
+use Drupal\Tests\contact\Functional\Rest\ContactFormResourceTestBase as ContactFormResourceTestBaseReal;
 
+/**
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\contact\Functional\Rest\ContactFormResourceTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
+ */
+abstract class ContactFormResourceTestBase extends ContactFormResourceTestBaseReal {
 }

core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlAnonTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ContactFormXmlAnonTest extends ContactFormResourceTestBase {
-
-  use AnonResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlBasicAuthTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ContactFormXmlBasicAuthTest extends ContactFormResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ContactForm/ContactFormXmlCookieTest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ContactForm;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ContactFormXmlCookieTest extends ContactFormResourceTestBase {
-
-  use CookieResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonAnonTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class ContentLanguageSettingsJsonAnonTest extends ContentLanguageSettingsResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
-
-/**
- * @group rest
- */
-class ContentLanguageSettingsJsonBasicAuthTest extends ContentLanguageSettingsResourceTestBase {
-
-  use BasicAuthResourceWithInterfaceTranslationTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsJsonCookieTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group rest
- */
-class ContentLanguageSettingsJsonCookieTest extends ContentLanguageSettingsResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsResourceTestBase.php

@@ -2,91 +2,15 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
 
-use Drupal\language\Entity\ContentLanguageSettings;
-use Drupal\node\Entity\NodeType;
-use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+@trigger_error('The ' . __NAMESPACE__ . '\ContentLanguageSettingsResourceTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\language\Functional\Rest\ContentLanguageSettingsResourceTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
 
-abstract class ContentLanguageSettingsResourceTestBase extends EntityResourceTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['language', 'node'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'language_content_settings';
-
-  /**
-   * @var \Drupal\language\ContentLanguageSettingsInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    $this->grantPermissionsToTestedRole(['administer languages']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    // Create a "Camelids" node type.
-    $camelids = NodeType::create([
-      'name' => 'Camelids',
-      'type' => 'camelids',
-    ]);
-    $camelids->save();
-
-    $entity = ContentLanguageSettings::create([
-      'target_entity_type_id' => 'node',
-      'target_bundle' => 'camelids',
-    ]);
-    $entity->setDefaultLangcode('site_default')
-      ->save();
-
-    return $entity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    return [
-      'default_langcode' => 'site_default',
-      'dependencies' => [
-        'config' => [
-          'node.type.camelids',
-        ],
-      ],
-      'id' => 'node.camelids',
-      'langcode' => 'en',
-      'language_alterable' => FALSE,
-      'status' => TRUE,
-      'target_bundle' => 'camelids',
-      'target_entity_type_id' => 'node',
-      'uuid' => $this->entity->uuid(),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    // @todo Update in https://www.drupal.org/node/2300677.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    return [
-      'languages:language_interface',
-      'user.permissions',
-    ];
-  }
+use Drupal\Tests\language\Functional\Rest\ContentLanguageSettingsResourceTestBase as ContentLanguageSettingsResourceTestBaseReal;
 
+/**
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\language\Functional\Rest\ContentLanguageSettingsResourceTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
+ */
+abstract class ContentLanguageSettingsResourceTestBase extends ContentLanguageSettingsResourceTestBaseReal {
 }

core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlAnonTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ContentLanguageSettingsXmlAnonTest extends ContentLanguageSettingsResourceTestBase {
-
-  use AnonResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlBasicAuthTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ContentLanguageSettingsXmlBasicAuthTest extends ContentLanguageSettingsResourceTestBase {
-
-  use BasicAuthResourceWithInterfaceTranslationTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/ContentLanguageSettings/ContentLanguageSettingsXmlCookieTest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\ContentLanguageSettings;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class ContentLanguageSettingsXmlCookieTest extends ContentLanguageSettingsResourceTestBase {
-
-  use CookieResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonAnonTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class DateFormatJsonAnonTest extends DateFormatResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group rest
- */
-class DateFormatJsonBasicAuthTest extends DateFormatResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatJsonCookieTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group rest
- */
-class DateFormatJsonCookieTest extends DateFormatResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatResourceTestBase.php

@@ -2,75 +2,15 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
 
-use Drupal\Core\Datetime\Entity\DateFormat;
-use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+@trigger_error('The ' . __NAMESPACE__ . '\DateFormatResourceTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\FunctionalTests\Rest\DateFormatResourceTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
+
+use Drupal\FunctionalTests\Rest\DateFormatResourceTestBase as DateFormatResourceTestBaseReal;
 
 /**
- * ResourceTestBase for DateFormat entity.
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\FunctionalTests\Rest\DateFormatResourceTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
  */
-abstract class DateFormatResourceTestBase extends EntityResourceTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = [];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'date_format';
-
-  /**
-   * The DateFormat entity.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    $this->grantPermissionsToTestedRole(['administer site configuration']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    // Create a date format.
-    $date_format = DateFormat::create([
-      'id' => 'llama',
-      'label' => 'Llama',
-      'pattern' => 'F d, Y',
-    ]);
-
-    $date_format->save();
-
-    return $date_format;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    return [
-      'dependencies' => [],
-      'id' => 'llama',
-      'label' => 'Llama',
-      'langcode' => 'en',
-      'locked' => FALSE,
-      'pattern' => 'F d, Y',
-      'status' => TRUE,
-      'uuid' => $this->entity->uuid(),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    // @todo Update in https://www.drupal.org/node/2300677.
-  }
-
+abstract class DateFormatResourceTestBase extends DateFormatResourceTestBaseReal {
 }

core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlAnonTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class DateFormatXmlAnonTest extends DateFormatResourceTestBase {
-
-  use AnonResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlBasicAuthTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class DateFormatXmlBasicAuthTest extends DateFormatResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/DateFormat/DateFormatXmlCookieTest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\DateFormat;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class DateFormatXmlCookieTest extends DateFormatResourceTestBase {
-
-  use CookieResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonAnonTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class EditorJsonAnonTest extends EditorResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group rest
- */
-class EditorJsonBasicAuthTest extends EditorResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorJsonCookieTest.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-
-/**
- * @group rest
- */
-class EditorJsonCookieTest extends EditorResourceTestBase {
-
-  use CookieResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorResourceTestBase.php

@@ -2,183 +2,15 @@
 
 namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
 
-use Drupal\editor\Entity\Editor;
-use Drupal\filter\Entity\FilterFormat;
-use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+@trigger_error('The ' . __NAMESPACE__ . '\EditorResourceTestBase is deprecated in Drupal 8.6.x and will be removed before Drupal 9.0.0. Instead, use Drupal\Tests\editor\Functional\Rest\EditorResourceTestBase. See https://www.drupal.org/node/2971931.', E_USER_DEPRECATED);
+
+use Drupal\Tests\editor\Functional\Rest\EditorResourceTestBase as EditorResourceTestBaseReal;
 
 /**
- * ResourceTestBase for Editor entity.
+ * @deprecated in Drupal 8.6.x. Will be removed before Drupal 9.0.0. Use
+ *   Drupal\Tests\editor\Functional\Rest\EditorResourceTestBase instead.
+ *
+ * @see https://www.drupal.org/node/2971931
  */
-abstract class EditorResourceTestBase extends EntityResourceTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['ckeditor', 'editor'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'editor';
-
-  /**
-   * The Editor entity.
-   *
-   * @var \Drupal\editor\EditorInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    $this->grantPermissionsToTestedRole(['administer filters']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    // Create a "Llama" filter format.
-    $llama_format = FilterFormat::create([
-      'name' => 'Llama',
-      'format' => 'llama',
-      'langcode' => 'es',
-      'filters' => [
-        'filter_html' => [
-          'status' => TRUE,
-          'settings' => [
-            'allowed_html' => '<p> <a> <b> <lo>',
-          ],
-        ],
-      ],
-    ]);
-
-    $llama_format->save();
-
-    // Create a "Camelids" editor.
-    $camelids = Editor::create([
-      'format' => 'llama',
-      'editor' => 'ckeditor',
-    ]);
-    $camelids
-      ->setImageUploadSettings([
-        'status' => FALSE,
-        'scheme' => file_default_scheme(),
-        'directory' => 'inline-images',
-        'max_size' => '',
-        'max_dimensions' => [
-          'width' => '',
-          'height' => '',
-        ],
-      ])
-      ->save();
-
-    return $camelids;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedNormalizedEntity() {
-    return [
-      'dependencies' => [
-        'config' => [
-          'filter.format.llama',
-        ],
-        'module' => [
-          'ckeditor',
-        ],
-      ],
-      'editor' => 'ckeditor',
-      'format' => 'llama',
-      'image_upload' => [
-        'status' => FALSE,
-        'scheme' => 'public',
-        'directory' => 'inline-images',
-        'max_size' => '',
-        'max_dimensions' => [
-          'width' => NULL,
-          'height' => NULL,
-        ],
-      ],
-      'langcode' => 'en',
-      'settings' => [
-        'toolbar' => [
-          'rows' => [
-            [
-              [
-                'name' => 'Formatting',
-                'items' => [
-                  'Bold',
-                  'Italic',
-                ],
-              ],
-              [
-                'name' => 'Links',
-                'items' => [
-                  'DrupalLink',
-                  'DrupalUnlink',
-                ],
-              ],
-              [
-                'name' => 'Lists',
-                'items' => [
-                  'BulletedList',
-                  'NumberedList',
-                ],
-              ],
-              [
-                'name' => 'Media',
-                'items' => [
-                  'Blockquote',
-                  'DrupalImage',
-                ],
-              ],
-              [
-                'name' => 'Tools',
-                'items' => [
-                  'Source',
-                ],
-              ],
-            ],
-          ],
-        ],
-        'plugins' => [
-          'language' => [
-            'language_list' => 'un',
-          ],
-        ],
-      ],
-      'status' => TRUE,
-      'uuid' => $this->entity->uuid(),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getNormalizedPostEntity() {
-    // @todo Update in https://www.drupal.org/node/2300677.
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedCacheContexts() {
-    // @see ::createEntity()
-    return ['user.permissions'];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedUnauthorizedAccessMessage($method) {
-    if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) {
-      return parent::getExpectedUnauthorizedAccessMessage($method);
-    }
-
-    return "The 'administer filters' permission is required.";
-  }
-
+abstract class EditorResourceTestBase extends EditorResourceTestBaseReal {
 }

core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlAnonTest.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class EditorXmlAnonTest extends EditorResourceTestBase {
-
-  use AnonResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlBasicAuthTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class EditorXmlBasicAuthTest extends EditorResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/Editor/EditorXmlCookieTest.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\Editor;
-
-use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
-use Drupal\Tests\rest\Functional\EntityResource\XmlEntityNormalizationQuirksTrait;
-
-/**
- * @group rest
- */
-class EditorXmlCookieTest extends EditorResourceTestBase {
-
-  use CookieResourceTestTrait;
-  use XmlEntityNormalizationQuirksTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'xml';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'text/xml; charset=UTF-8';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'cookie';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonAnonTest.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay;
-
-use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
-
-/**
- * @group rest
- */
-class EntityFormDisplayJsonAnonTest extends EntityFormDisplayResourceTestBase {
-
-  use AnonResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-}

core/modules/rest/tests/src/Functional/EntityResource/EntityFormDisplay/EntityFormDisplayJsonBasicAuthTest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Drupal\Tests\rest\Functional\EntityResource\EntityFormDisplay;
-
-use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
-
-/**
- * @group rest
- */
-class EntityFormDisplayJsonBasicAuthTest extends EntityFormDisplayResourceTestBase {
-
-  use BasicAuthResourceTestTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static $modules = ['basic_auth'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $format = 'json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $mimeType = 'application/json';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $auth = 'basic_auth';
-
-}