diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php index e0fa4c2..4bf3196 100644 --- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php +++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php @@ -9,15 +9,24 @@ use Drupal\Component\Utility\Unicode; use Drupal\Core\Entity\Entity\EntityViewDisplay; -use Drupal\field\Tests\FieldTypeTestBase; use Drupal\Core\Datetime\DrupalDateTime; +use Drupal\simpletest\WebTestBase; /** * Tests Datetime field functionality. * * @group datetime */ -class DateTimeFieldTest extends FieldTypeTestBase { +class DateTimeFieldTest extends WebTestBase { + + /** + * Set to TRUE to strict check all configuration saved. + * + * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker + * + * @var bool + */ + protected $strictConfigSchema = TRUE; /** * Modules to enable. diff --git a/core/modules/field/src/Tests/Email/EmailFieldTest.php b/core/modules/field/src/Tests/Email/EmailFieldTest.php index 3672cfb..bfc8e86 100644 --- a/core/modules/field/src/Tests/Email/EmailFieldTest.php +++ b/core/modules/field/src/Tests/Email/EmailFieldTest.php @@ -8,14 +8,23 @@ namespace Drupal\field\Tests\Email; use Drupal\Component\Utility\Unicode; -use Drupal\field\Tests\FieldTypeTestBase; +use Drupal\simpletest\WebTestBase; /** * Tests email field functionality. * * @group field */ -class EmailFieldTest extends FieldTypeTestBase { +class EmailFieldTest extends WebTestBase { + + /** + * Set to TRUE to strict check all configuration saved. + * + * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker + * + * @var bool + */ + protected $strictConfigSchema = TRUE; /** * Modules to enable. diff --git a/core/modules/field/src/Tests/FieldTypeTestBase.php b/core/modules/field/src/Tests/FieldTypeTestBase.php deleted file mode 100644 index 7ae7c22..0000000 --- a/core/modules/field/src/Tests/FieldTypeTestBase.php +++ /dev/null @@ -1,41 +0,0 @@ -container->get('config.storage')->listAll('core.entity_view_display.'), - $this->container->get('config.storage')->listAll('core.entity_form_display.') - ); - - $factory = $this->container->get('config.factory'); - /** @var \Drupal\Core\Config\TypedConfigManagerInterface $typed_config */ - $typed_config = $this->container->get('config.typed'); - foreach ($names as $name) { - $config = $factory->get($name); - $this->assertConfigSchema($typed_config, $name, $config->get()); - } - - parent::tearDown(); - } - -} diff --git a/core/modules/field/src/Tests/Number/NumberFieldTest.php b/core/modules/field/src/Tests/Number/NumberFieldTest.php index 994e96a..d84fa65 100644 --- a/core/modules/field/src/Tests/Number/NumberFieldTest.php +++ b/core/modules/field/src/Tests/Number/NumberFieldTest.php @@ -8,14 +8,23 @@ namespace Drupal\field\Tests\Number; use Drupal\Component\Utility\Unicode; -use Drupal\field\Tests\FieldTypeTestBase; +use Drupal\simpletest\WebTestBase; /** * Tests the creation of numeric fields. * * @group field */ -class NumberFieldTest extends FieldTypeTestBase { +class NumberFieldTest extends WebTestBase { + + /** + * Set to TRUE to strict check all configuration saved. + * + * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker + * + * @var bool + */ + protected $strictConfigSchema = TRUE; /** * Modules to enable. diff --git a/core/modules/field/src/Tests/String/StringFieldTest.php b/core/modules/field/src/Tests/String/StringFieldTest.php index faebcee..f9a6df2 100644 --- a/core/modules/field/src/Tests/String/StringFieldTest.php +++ b/core/modules/field/src/Tests/String/StringFieldTest.php @@ -8,14 +8,23 @@ namespace Drupal\field\Tests\String; use Drupal\Component\Utility\Unicode; -use Drupal\field\Tests\FieldTypeTestBase; +use Drupal\simpletest\WebTestBase; /** * Tests the creation of string fields. * * @group text */ -class StringFieldTest extends FieldTypeTestBase { +class StringFieldTest extends WebTestBase { + + /** + * Set to TRUE to strict check all configuration saved. + * + * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker + * + * @var bool + */ + protected $strictConfigSchema = TRUE; /** * Modules to enable. diff --git a/core/modules/image/src/Tests/ImageFieldTestBase.php b/core/modules/image/src/Tests/ImageFieldTestBase.php index 9b374f4..efbbfea 100644 --- a/core/modules/image/src/Tests/ImageFieldTestBase.php +++ b/core/modules/image/src/Tests/ImageFieldTestBase.php @@ -7,7 +7,7 @@ namespace Drupal\image\Tests; -use Drupal\field\Tests\FieldTypeTestBase; +use Drupal\simpletest\WebTestBase; /** * TODO: Test the following functions. @@ -25,7 +25,16 @@ /** * This class provides methods specifically for testing Image's field handling. */ -abstract class ImageFieldTestBase extends FieldTypeTestBase { +abstract class ImageFieldTestBase extends WebTestBase { + + /** + * Set to TRUE to strict check all configuration saved. + * + * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker + * + * @var bool + */ + protected $strictConfigSchema = TRUE; /** * Modules to enable.