commit f8cf747f57ca49f7f895ee6fb341c41ae813d900 Author: Karoly Negyesi Date: Fri Dec 27 21:04:35 2013 -0800 config is getting schema'd diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateAggregatorConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateAggregatorConfigsTest.php index eb759df..d3cc6a5 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateAggregatorConfigsTest.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateAggregatorConfigsTest.php @@ -42,10 +42,10 @@ public function testAggregatorSettings() { $this->assertIdentical($config->get('fetcher'), 'aggregator'); $this->assertIdentical($config->get('parser'), 'aggregator'); $this->assertIdentical($config->get('processors'), array('aggregator')); - $this->assertIdentical($config->get('items.teaser_length'), '600'); + $this->assertIdentical($config->get('items.teaser_length'), 600); $this->assertIdentical($config->get('items.allowed_html'), '
      • '); - $this->assertIdentical($config->get('items.expire'), '9676800'); - $this->assertIdentical($config->get('source.list_max'), '3'); + $this->assertIdentical($config->get('items.expire'), 9676800); + $this->assertIdentical($config->get('source.list_max'), 3); $this->assertIdentical($config->get('source.category_selector'), 'checkboxes'); } } diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateContactConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateContactConfigsTest.php index 1ea96da..7eb7788 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateContactConfigsTest.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateContactConfigsTest.php @@ -39,7 +39,7 @@ public function testContactSettings() { $executable = new MigrateExecutable($migration, new MigrateMessage()); $executable->import(); $config = \Drupal::config('contact.settings'); - $this->assertIdentical($config->get('user_default_enabled'), 1); + $this->assertIdentical($config->get('user_default_enabled'), true); $this->assertIdentical($config->get('flood.limit'), 3); } } diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateForumConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateForumConfigsTest.php index 52ac1fc..c492a09 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateForumConfigsTest.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateForumConfigsTest.php @@ -39,14 +39,14 @@ public function testForumSettings() { $executable = new MigrateExecutable($migration, new MigrateMessage()); $executable->import(); $config = \Drupal::config('forum.settings'); - $this->assertIdentical($config->get('topics.hot_threshold'), '15'); - $this->assertIdentical($config->get('topics.page_limit'), '25'); - $this->assertIdentical($config->get('topics.order'), '1'); + $this->assertIdentical($config->get('topics.hot_threshold'), 15); + $this->assertIdentical($config->get('topics.page_limit'), 25); + $this->assertIdentical($config->get('topics.order'), 1); // The vocabulary vid depends on existing vids when the Forum module was enabled. This would have to be user-selectable based on a query to the D6 vocabulary table. //$this->assertIdentical($config->get('forum_nav_vocabulary'), '1'); // This is 'forum_block_num_0' in D6, but block:active:limit' in D8. - $this->assertIdentical($config->get('block.active.limit'), '5'); + $this->assertIdentical($config->get('block.active.limit'), 5); // This is 'forum_block_num_1' in D6, but 'block:new:limit' in D8. - $this->assertIdentical($config->get('block.new.limit'), '5'); + $this->assertIdentical($config->get('block.new.limit'), 5); } } diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateNodeConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateNodeConfigsTest.php index 9c63134..a44b229 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateNodeConfigsTest.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateNodeConfigsTest.php @@ -33,6 +33,6 @@ function testNodeSettings() { $executable = new MigrateExecutable($migration, new MigrateMessage); $executable->import(); $config = \Drupal::config('node.settings'); - $this->assertIdentical($config->get('use_admin_theme'), 0); + $this->assertIdentical($config->get('use_admin_theme'), false); } } diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSearchConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSearchConfigsTest.php index 2e9d3d9..5357a06 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSearchConfigsTest.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSearchConfigsTest.php @@ -39,9 +39,9 @@ public function testSearchSettings() { $executable = new MigrateExecutable($migration, new MigrateMessage()); $executable->import(); $config = \Drupal::config('search.settings'); - $this->assertIdentical($config->get('index.minimum_word_size'), '3'); + $this->assertIdentical($config->get('index.minimum_word_size'), 3); $this->assertIdentical($config->get('index.overlap_cjk'), 1); - $this->assertIdentical($config->get('index.cron_limit'), '100'); + $this->assertIdentical($config->get('index.cron_limit'), 100); // Not sure where these two variables are set in D6. $this->assertIdentical($config->get('index.tag_weights'), array( 'h1' => 25, diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSyslogConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSyslogConfigsTest.php index 29b7f1e..61cbd24 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSyslogConfigsTest.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSyslogConfigsTest.php @@ -41,6 +41,7 @@ public function testSyslogSettings() { $executable->import(); $config = \Drupal::config('syslog.settings'); $this->assertIdentical($config->get('identity'), 'drupal'); - $this->assertIdentical($config->get('facility'), $facility); + // @TODO: remove this typecast once there's schema of rhtis config. + $this->assertIdentical($config->get('facility'), (string) $facility); } } diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSystemConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSystemConfigsTest.php index 1c13171..26cc353 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSystemConfigsTest.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSystemConfigsTest.php @@ -67,9 +67,10 @@ public function testSystemPerformance() { $executable = new MigrateExecutable($migration, new MigrateMessage()); $executable->import(); $config = \Drupal::config('system.performance'); - $this->assertIdentical($config->get('css.preprocess'), 0); - $this->assertIdentical($config->get('js.preprocess'), 0); - $this->assertIdentical($config->get('cache.page.max_age'), 0); + $this->assertIdentical($config->get('css.preprocess'), false); + $this->assertIdentical($config->get('js.preprocess'), false); + // @TODO: make this 0 once there's schema for cache.page.max_age. + $this->assertIdentical($config->get('cache.page.max_age'), '0'); } /**