diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml index f0a4828..de9063b 100644 --- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml +++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml @@ -6,7 +6,7 @@ source: - locale_cache_strings - locale_js_directory process: - cache_string: locale_cache_strings + cache_strings: locale_cache_strings 'javascript.directory': locale_js_directory destination: plugin: config diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml index 9cc1b9c..63dc976 100644 --- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml +++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml @@ -10,7 +10,7 @@ source: - statistics_block_top_all_num - statistics_block_top_last_num process: - 'access_log.enable': statistics_enable_access_log + 'access_log.enabled': statistics_enable_access_log 'access_log.max_lifetime': statistics_flush_accesslog_timer 'count_content_views': statistics_count_content_views 'block.popular.top_day_limit': statistics_block_top_day_num diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml index 5b34a2e..924c166 100644 --- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml +++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml @@ -11,7 +11,7 @@ process: 'fetch.max_attempts': update_max_fetch_attempts 'fetch.url': update_fetch_url 'notification.threshold': update_notification_threshold - 'notification.mails': update_notify_emails + 'notification.emails': update_notify_emails destination: plugin: config config_name: update.settings diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php index 2cb114a..1c0a352 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -15,6 +16,8 @@ */ class MigrateAggregatorConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -62,4 +65,12 @@ public function testAggregatorSettings() { $this->assertIdentical($config->get('source.category_selector'), 'checkboxes'); } + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('aggregator.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'aggregator.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php index 6f2e179..07fcfb0 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateBookConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateMessage; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -16,6 +17,8 @@ */ class MigrateBookConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -57,4 +60,13 @@ public function testBookSettings() { $this->assertIdentical($config->get('block.navigation.mode'), 'all pages'); $this->assertIdentical($config->get('allowed_types'), array('book')); } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('book.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'book.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php index fadaccc..6605e08 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateMessage; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -16,6 +17,8 @@ */ class MigrateContactConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -66,4 +69,13 @@ public function testContactSettings() { $this->assertIdentical($config->get('flood.limit'), 3); $this->assertIdentical($config->get('default_category'), 'some_other_category'); } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('contact.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'contact.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php index e4753f4..418cbd1 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDblogConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateMessage; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -16,6 +17,8 @@ */ class MigrateDblogConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -55,4 +58,13 @@ public function testBookSettings() { $config = \Drupal::config('dblog.settings'); $this->assertIdentical($config->get('row_limit'), 1000); } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('dblog.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'dblog.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php index 592992e..c222fb3 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php @@ -39,6 +39,7 @@ class MigrateDrupal6Test extends MigrateFullDrupalTestBase { 'options', 'search', 'simpletest', + 'statistics', 'syslog', 'taxonomy', 'telephone', diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldConfigsTest.php index 4a7e340..0a23eef 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -15,6 +16,8 @@ */ class MigrateFieldConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * {@inheritdoc} */ @@ -47,4 +50,13 @@ public function testFieldSettings() { $config = \Drupal::config('field.settings'); $this->assertIdentical($config->get('language_fallback'), TRUE); } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('field.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'field.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php index fc7edc4..2fb3244 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFileConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateMessage; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -16,6 +17,8 @@ */ class MigrateFileConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -57,4 +60,13 @@ public function testFileSettings() { $this->assertIdentical($config->get('description.length'), 128); $this->assertIdentical($config->get('icon.directory'), 'sites/default/files/icons'); } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('file.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'file.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php index d5fb297..38e8ab3 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateForumConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -15,6 +16,8 @@ */ class MigrateForumConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -62,4 +65,13 @@ public function testForumSettings() { // This is 'forum_block_num_1' in D6, but 'block:new:limit' in D8. $this->assertIdentical($config->get('block.new.limit'), 5); } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('forum.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'forum.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php index de89d92..ad2bcf3 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateLocaleConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -15,6 +16,8 @@ */ class MigrateLocaleConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -52,8 +55,16 @@ public function setUp() { */ public function testLocaleSettings() { $config = \Drupal::config('locale.settings'); - $this->assertIdentical($config->get('cache_string'), 1); + $this->assertIdentical($config->get('cache_strings'), TRUE); $this->assertIdentical($config->get('javascript.directory'), 'languages'); } + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('locale.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'locale.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuConfigsTest.php index 404f281..4930db1 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -15,6 +16,8 @@ */ class MigrateMenuConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -56,4 +59,13 @@ public function testMenuSettings() { $this->assertIdentical($config->get('secondary_links'), 'secondary-links'); $this->assertIdentical($config->get('override_parent_selector'), FALSE); } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('menu_ui.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'menu_ui.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php index 165fe13..6674bf9 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateMessage; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -16,6 +17,8 @@ */ class MigrateNodeConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -55,4 +58,14 @@ public function testNodeSettings() { $config = \Drupal::config('node.settings'); $this->assertIdentical($config->get('use_admin_theme'), false); } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('node.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'node.settings', $config_data); + } + + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php index c2c5dbf..ca4a25f 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateSearchConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateMessage; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -16,6 +17,8 @@ */ class MigrateSearchConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -57,4 +60,13 @@ public function testSearchSettings() { $this->assertIdentical($config->get('index.overlap_cjk'), TRUE); $this->assertIdentical($config->get('index.cron_limit'), 100); } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('search.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'search.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php index 688410b..ad5b79a 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateSimpletestConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateMessage; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -16,6 +17,8 @@ */ class MigrateSimpletestConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -61,4 +64,13 @@ public function testSimpletestSettings() { $this->assertIdentical($config->get('httpauth.username'), ''); $this->assertIdentical($config->get('verbose'), TRUE); } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('simpletest.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'simpletest.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateStatisticsConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateStatisticsConfigsTest.php index eaac333..d04170f 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateStatisticsConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateStatisticsConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateMessage; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -16,6 +17,8 @@ */ class MigrateStatisticsConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -53,11 +56,20 @@ protected function setUp() { */ public function testStatisticsSettings() { $config = \Drupal::config('statistics.settings'); - $this->assertIdentical($config->get('access_log.enable'), 0); + $this->assertIdentical($config->get('access_log.enabled'), FALSE); $this->assertIdentical($config->get('access_log.max_lifetime'), 259200); $this->assertIdentical($config->get('count_content_views'), 0); $this->assertIdentical($config->get('block.popular.top_day_limit'), 0); $this->assertIdentical($config->get('block.popular.top_all_limit'), 0); $this->assertIdentical($config->get('block.popular.top_recent_limit'), 0); } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('statistics.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'statistics.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateSyslogConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateSyslogConfigsTest.php index 587bbb8..d8222ac 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateSyslogConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateSyslogConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -15,6 +16,8 @@ */ class MigrateSyslogConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -55,4 +58,13 @@ public function testSyslogSettings() { $this->assertIdentical($config->get('identity'), 'drupal'); $this->assertIdentical($config->get('facility'), '128'); } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('syslog.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'syslog.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyConfigsTest.php index b89874b..994ef8c 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -15,6 +16,8 @@ */ class MigrateTaxonomyConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -55,4 +58,12 @@ public function testTaxonomySettings() { $this->assertIdentical($config->get('terms_per_page_admin'), 100); $this->assertIdentical($config->get('override_selector'), FALSE); } + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('taxonomy.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'taxonomy.settings', $config_data); + } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateTextConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateTextConfigsTest.php index 04e659b..7c3a5fd 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateTextConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateTextConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -15,6 +16,8 @@ */ class MigrateTextConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -55,4 +58,13 @@ public function testTextSettings() { $this->assertIdentical($config->get('default_summary_length'), 456); } + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('text.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'text.settings', $config_data); + } + + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php index 444fa7f..9131641 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUpdateConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -15,6 +16,8 @@ */ class MigrateUpdateConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * Modules to enable. * @@ -55,6 +58,15 @@ public function testUpdateSettings() { $this->assertIdentical($config->get('fetch.max_attempts'), 2); $this->assertIdentical($config->get('fetch.url'), 'http://updates.drupal.org/release-history'); $this->assertIdentical($config->get('notification.threshold'), 'all'); - $this->assertIdentical($config->get('notification.mails'), array()); + $this->assertIdentical($config->get('notification.emails'), array()); + } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('update.settings')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'update.settings', $config_data); } + } diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserConfigsTest.php index 7a2a8e7..ba4260b 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserConfigsTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserConfigsTest.php @@ -7,6 +7,7 @@ namespace Drupal\migrate_drupal\Tests\d6; +use Drupal\config\Tests\SchemaCheckTestTrait; use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; @@ -15,6 +16,8 @@ */ class MigrateUserConfigsTest extends MigrateDrupalTestBase { + use SchemaCheckTestTrait; + /** * {@inheritdoc} */ @@ -60,4 +63,13 @@ public function testUserMail() { $this->assertIdentical($config->get('status_blocked.subject'), 'Account details for !username at !site (blocked)'); $this->assertIdentical($config->get('status_blocked.body'), "!username,\n\nYour account on !site has been blocked."); } + + /** + * Tests configuration schema. + */ + public function testConfigSchema() { + $config_data = \Drupal::config('user.mail')->get(); + $this->assertConfigSchema(\Drupal::service('config.typed'), 'user.mail', $config_data); + } + }