Update to Drupal 8.2.0. For more information, see https://www.drupal.org/project/drupal/releases/8.2.0

core/modules/language/tests/src/Kernel/Migrate/MigrateDefaultLanguageTrait.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Migrate;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\migrate\Plugin\MigrationInterface;
+
+/**
+ * Tests the default language variable migration.
+ */
+trait MigrateDefaultLanguageTrait {
+
+  /**
+   * Helper method to test the migration.
+   *
+   * @param string $langcode
+   *   The langcode of the default language.
+   * @param bool $existing
+   *   Whether the default language exists on the destination.
+   */
+  protected function doTestMigration($langcode, $existing = TRUE) {
+    // The default language of the test fixture is English. Change it to
+    // something else before migrating, to be sure that the source site
+    // default language is migrated.
+    $value = 'O:8:"stdClass":11:{s:8:"language";s:2:"' . $langcode . '";s:4:"name";s:6:"French";s:6:"native";s:6:"French";s:9:"direction";s:1:"0";s:7:"enabled";i:1;s:7:"plurals";s:1:"0";s:7:"formula";s:0:"";s:6:"domain";s:0:"";s:6:"prefix";s:0:"";s:6:"weight";s:1:"0";s:10:"javascript";s:0:"";}';
+    $this->sourceDatabase->update('variable')
+      ->fields(array(
+        'value' => $value
+      ))
+      ->condition('name', 'language_default' )
+      ->execute();
+
+    $this->startCollectingMessages();
+    $this->executeMigrations(['language', 'default_language']);
+
+    if ($existing) {
+      // If the default language exists, we should be able to load it and the
+      // default_langcode config should be set.
+      $default_language = ConfigurableLanguage::load($langcode);
+      $this->assertNotNull($default_language);
+      $this->assertIdentical($langcode, $this->config('system.site')->get('default_langcode'));
+    }
+    else {
+      // Otherwise, the migration log should contain an error message.
+      $messages = $this->migration->getIdMap()->getMessageIterator();
+      $count = 0;
+      foreach ($messages as $message) {
+        $count++;
+        $this->assertEqual($message->message, "The language '$langcode' does not exist on this site.");
+        $this->assertEqual($message->level, MigrationInterface::MESSAGE_ERROR);
+      }
+      $this->assertEqual($count, 1);
+    }
+  }
+
+}

core/modules/language/tests/src/Kernel/Migrate/d6/MigrateDefaultLanguageTest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Migrate\d6;
+
+use Drupal\Tests\language\Kernel\Migrate\MigrateDefaultLanguageTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests the default language variable migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateDefaultLanguageTest extends MigrateDrupal6TestBase {
+
+  use MigrateDefaultLanguageTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language'];
+
+  /**
+   * Tests language_default migration with an existing language.
+   */
+  public function testMigrationWithExistingLanguage() {
+    $this->doTestMigration('fr');
+  }
+
+  /**
+   * Tests language_default migration with a non-existing language.
+   */
+  public function testMigrationWithNonExistentLanguage() {
+    $this->doTestMigration('tv', FALSE);
+  }
+
+}

core/modules/language/tests/src/Kernel/Migrate/d7/MigrateDefaultLanguageTest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Migrate\d7;
+
+use Drupal\Tests\language\Kernel\Migrate\MigrateDefaultLanguageTrait;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests the default language variable migration.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateDefaultLanguageTest extends MigrateDrupal7TestBase {
+
+  use MigrateDefaultLanguageTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language'];
+
+  /**
+   * Tests language_default migration with a non-existing language.
+   */
+  public function testMigrationWithExistingLanguage() {
+    $this->doTestMigration('is');
+  }
+
+  /**
+   * Tests language_default migration with a non-existing language.
+   */
+  public function testMigrationWithNonExistentLanguage() {
+    $this->doTestMigration('tv', FALSE);
+  }
+
+}

core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\language\Unit {
+namespace Drupal\Tests\language\Unit;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Language\LanguageInterface;
@@ -252,13 +252,11 @@ class LanguageNegotiationUrlTest extends UnitTestCase {
 
 }
 
-}
-
 // @todo Remove as part of https://www.drupal.org/node/2481833.
-namespace {
-  if (!function_exists('base_path')) {
-    function base_path() {
-      return '/';
-    }
+namespace Drupal\language\Plugin\LanguageNegotiation;
+
+if (!function_exists('base_path')) {
+  function base_path() {
+    return '/';
   }
 }