Move all files to 2017/

2017/web/core/modules/language/tests/language_config_override_test/config/install/language/de/language_config_override_test.settings.yml

@@ -0,0 +1 @@
+name: 'Deutsch'

2017/web/core/modules/language/tests/language_config_override_test/language_config_override_test.info.yml

@@ -0,0 +1,6 @@
+name: 'Language config overridetest'
+type: module
+description: 'Support module for the language config override test.'
+core: 8.x
+package: Testing
+version: VERSION

2017/web/core/modules/language/tests/language_elements_test/language_elements_test.info.yml

@@ -0,0 +1,8 @@
+name: 'Language form elements test'
+type: module
+description: 'Support module for the language form elements tests.'
+core: 8.x
+package: Testing
+version: VERSION
+dependencies:
+  - drupal:entity_test

2017/web/core/modules/language/tests/language_elements_test/language_elements_test.routing.yml

@@ -0,0 +1,15 @@
+language_elements_test.config_element:
+  path: '/language-tests/language_configuration_element'
+  defaults:
+    _form: '\Drupal\language_elements_test\Form\LanguageConfigurationElement'
+    _title: 'Language configuration form element'
+  requirements:
+    _access: 'TRUE'
+
+language_elements_test.config_element_test:
+  path: '/language-tests/language_configuration_element_test'
+  defaults:
+    _form: '\Drupal\language_elements_test\Form\LanguageConfigurationElementTest'
+    _title: 'Language configuration form element'
+  requirements:
+    _access: 'TRUE'

2017/web/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Drupal\language_elements_test\Form;
+
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\language\Entity\ContentLanguageSettings;
+
+/**
+ * A form containing a language configuration element.
+ *
+ * @internal
+ */
+class LanguageConfigurationElement extends FormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'language_elements_configuration_element';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $conf = ContentLanguageSettings::loadByEntityTypeBundle('entity_test', 'some_bundle');
+
+    $form['lang_configuration'] = [
+      '#type' => 'language_configuration',
+      '#entity_information' => [
+        'entity_type' => 'entity_test',
+        'bundle' => 'some_bundle',
+      ],
+      '#default_value' => $conf,
+    ];
+
+    $form['submit'] = [
+      '#type' => 'submit',
+      '#value' => 'Save',
+    ];
+    $form['#submit'][] = 'language_configuration_element_submit';
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+  }
+
+}

2017/web/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Drupal\language_elements_test\Form;
+
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * A form containing a language select element.
+ *
+ * @internal
+ */
+class LanguageConfigurationElementTest extends FormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'language_elements_configuration_element_test';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['langcode'] = [
+      '#title' => t('Language select'),
+      '#type' => 'language_select',
+      '#default_value' => language_get_default_langcode('entity_test', 'some_bundle'),
+    ];
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+  }
+
+}

2017/web/core/modules/language/tests/language_test/config/optional/views.view.no_entity_translation_view.yml

@@ -0,0 +1,172 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - language_test
+id: no_entity_translation_view
+label: 'No Entity Translation View'
+module: views
+description: ''
+tag: ''
+base_table: no_language_entity_test
+base_field: id
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: none
+        options: {  }
+      cache:
+        type: tag
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: full
+        options:
+          items_per_page: 10
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: '‹ Previous'
+            next: 'Next ›'
+            first: '« First'
+            last: 'Last »'
+          quantity: 9
+      style:
+        type: default
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          inline:
+            operations: operations
+          separator: ''
+          hide_empty: false
+      fields:
+        uuid:
+          id: uuid
+          table: no_language_entity_test
+          field: uuid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: ''
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: no_language_entity_test
+          entity_field: uuid
+          plugin_id: field
+      filters: {  }
+      sorts: {  }
+      title: 'No Entity Translation View'
+      header: {  }
+      footer: {  }
+      empty: {  }
+      relationships: {  }
+      arguments: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+      tags: {  }
+  page_1:
+    display_plugin: page
+    id: page_1
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: no-entity-translation-view
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url.query_args
+      tags: {  }

2017/web/core/modules/language/tests/language_test/language_test.info.yml

@@ -0,0 +1,6 @@
+name: 'Language test'
+type: module
+description: 'Support module for the language layer tests.'
+core: 8.x
+package: Testing
+version: VERSION

2017/web/core/modules/language/tests/language_test/language_test.module

@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * @file
+ * Mock module for language layer tests.
+ */
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Url;
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUI;
+
+/**
+ * Implements hook_page_top().
+ */
+function language_test_page_top() {
+  if (\Drupal::moduleHandler()->moduleExists('language')) {
+    language_test_store_language_negotiation();
+    \Drupal::messenger()->addStatus(t('Language negotiation method: @name', ['@name' => \Drupal::languageManager()->getNegotiatedLanguageMethod()]));
+  }
+}
+
+/**
+ * Implements hook_language_types_info().
+ */
+function language_test_language_types_info() {
+  if (\Drupal::state()->get('language_test.language_types')) {
+    return [
+      'test_language_type' => [
+        'name' => t('Test'),
+        'description' => t('A test language type.'),
+      ],
+      'fixed_test_language_type' => [
+        'fixed' => ['test_language_negotiation_method'],
+        'locked' => TRUE,
+      ],
+    ];
+  }
+}
+
+/**
+ * Implements hook_language_types_info_alter().
+ */
+function language_test_language_types_info_alter(array &$language_types) {
+  if (\Drupal::state()->get('language_test.content_language_type')) {
+    $language_types[LanguageInterface::TYPE_CONTENT]['locked'] = FALSE;
+    unset($language_types[LanguageInterface::TYPE_CONTENT]['fixed']);
+    // By default languages are not configurable. Make
+    // LanguageInterface::TYPE_CONTENT configurable.
+    $config = \Drupal::configFactory()->getEditable('language.types');
+    $configurable = $config->get('configurable');
+    if (!in_array(LanguageInterface::TYPE_CONTENT, $configurable)) {
+      $configurable[] = LanguageInterface::TYPE_CONTENT;
+      $config->set('configurable', $configurable)->save();
+    }
+  }
+}
+
+/**
+ * Implements hook_language_negotiation_info_alter().
+ */
+function language_test_language_negotiation_info_alter(array &$negotiation_info) {
+  if (\Drupal::state()->get('language_test.language_negotiation_info_alter')) {
+    unset($negotiation_info[LanguageNegotiationUI::METHOD_ID]);
+  }
+}
+
+/**
+ * Store the last negotiated languages.
+ */
+function language_test_store_language_negotiation() {
+  $last = [];
+  foreach (\Drupal::languageManager()->getDefinedLanguageTypes() as $type) {
+    $last[$type] = \Drupal::languageManager()->getCurrentLanguage($type)->getId();
+  }
+  \Drupal::state()->set('language_test.language_negotiation_last', $last);
+}
+
+/**
+ * Implements hook_language_fallback_candidates_alter().
+ */
+function language_test_language_fallback_candidates_alter(array &$candidates, array $context) {
+  if (Drupal::state()->get('language_test.fallback_alter.candidates')) {
+    unset($candidates[LanguageInterface::LANGCODE_NOT_SPECIFIED]);
+  }
+}
+
+/**
+ * Implements hook_language_fallback_candidates_OPERATION_alter().
+ */
+function language_test_language_fallback_candidates_test_alter(array &$candidates, array $context) {
+  if (Drupal::state()->get('language_test.fallback_operation_alter.candidates')) {
+    $langcode = LanguageInterface::LANGCODE_NOT_APPLICABLE;
+    $candidates[$langcode] = $langcode;
+  }
+}
+
+/**
+ * Implements hook_module_preinstall().
+ */
+function language_test_module_preinstall() {
+  \Drupal::state()->set('language_test.language_count_preinstall', count(\Drupal::languageManager()->getLanguages()));
+}
+
+/**
+ * Implements hook_language_switch_links_alter().
+ */
+function language_test_language_switch_links_alter(array &$links, $type, Url $url) {
+  // I'll just sit here and wait to be called with the right arguments.
+}

2017/web/core/modules/language/tests/language_test/language_test.routing.yml

@@ -0,0 +1,33 @@
+language_test.l_active_class:
+  path: '/language_test/type-link-active-class'
+  defaults:
+    _controller: '\Drupal\language_test\Controller\LanguageTestController::typeLinkActiveClass'
+  requirements:
+    _access: 'TRUE'
+
+language_test.subrequest:
+  path: '/language_test/subrequest'
+  defaults:
+    _controller: '\Drupal\language_test\Controller\LanguageTestController::testSubRequest'
+  requirements:
+    _access: 'TRUE'
+
+language_test.entity_using_original_language:
+  path: '/admin/language_test/entity_using_original_language/{configurable_language}'
+  defaults:
+    _controller: '\Drupal\language_test\Controller\LanguageTestController::testEntity'
+  requirements:
+    _access: 'TRUE'
+
+language_test.entity_using_current_language:
+  path: '/admin/language_test/entity_using_current_language/{configurable_language}'
+  defaults:
+    _controller: '\Drupal\language_test\Controller\LanguageTestController::testEntity'
+  requirements:
+    _access: 'TRUE'
+  options:
+    parameters:
+      configurable_language:
+        type: entity:configurable_language
+        # Force load in the interface text language selected for page.
+        with_config_overrides: TRUE

2017/web/core/modules/language/tests/language_test/src/Controller/LanguageTestController.php

@@ -0,0 +1,137 @@
+<?php
+
+namespace Drupal\language_test\Controller;
+
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\Url;
+use Drupal\language\ConfigurableLanguageInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+/**
+ * Controller routines for language_test routes.
+ */
+class LanguageTestController implements ContainerInjectionInterface {
+
+  use StringTranslationTrait;
+
+  /**
+   * The HTTP kernel service.
+   *
+   * @var \Symfony\Component\HttpKernel\HttpKernelInterface
+   */
+  protected $httpKernel;
+
+  /**
+   * The language manager service.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * Constructs a new LanguageTestController object.
+   *
+   * @param \Symfony\Component\HttpKernel\HttpKernelInterface $httpKernel
+   *   An HTTP kernel.
+   */
+  public function __construct(HttpKernelInterface $httpKernel, LanguageManagerInterface $language_manager) {
+    $this->httpKernel = $httpKernel;
+    $this->languageManager = $language_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static($container->get('http_kernel'), $container->get('language_manager'));
+  }
+
+  /**
+   * Route entity upcasting test helper.
+   *
+   * @param \Drupal\language\ConfigurableLanguageInterface $configurable_language
+   *   The ConfigurableLanguage object from the route.
+   *
+   * @return string
+   *   Testing feedback based on (translated) entity title.
+   */
+  public function testEntity(ConfigurableLanguageInterface $configurable_language) {
+    return ['#markup' => $this->t('Loaded %label.', ['%label' => $configurable_language->label()])];
+  }
+
+  /**
+   * Returns links to the current page with different langcodes.
+   *
+   * Using #type 'link' causes these links to be rendered with the link
+   * generator.
+   */
+  public function typeLinkActiveClass() {
+    // We assume that 'en' and 'fr' have been configured.
+    $languages = $this->languageManager->getLanguages();
+    return [
+      'no_language' => [
+        '#type' => 'link',
+        '#title' => t('Link to the current path with no langcode provided.'),
+        '#url' => Url::fromRoute('<current>'),
+        '#options' => [
+          'attributes' => [
+            'id' => 'no_lang_link',
+          ],
+          'set_active_class' => TRUE,
+        ],
+      ],
+      'fr' => [
+        '#type' => 'link',
+        '#title' => t('Link to a French version of the current path.'),
+        '#url' => Url::fromRoute('<current>'),
+        '#options' => [
+          'language' => $languages['fr'],
+          'attributes' => [
+            'id' => 'fr_link',
+          ],
+          'set_active_class' => TRUE,
+        ],
+      ],
+      'en' => [
+        '#type' => 'link',
+        '#title' => t('Link to an English version of the current path.'),
+        '#url' => Url::fromRoute('<current>'),
+        '#options' => [
+          'language' => $languages['en'],
+          'attributes' => [
+            'id' => 'en_link',
+          ],
+          'set_active_class' => TRUE,
+        ],
+      ],
+    ];
+  }
+
+  /**
+   * Uses a sub request to retrieve the 'user' page.
+   *
+   * @return \Symfony\Component\HttpFoundation\Response
+   *   The kernels response to the sub request.
+   */
+  public function testSubRequest() {
+    $request = Request::createFromGlobals();
+    $server = $request->server->all();
+    if (basename($server['SCRIPT_FILENAME']) != basename($server['SCRIPT_NAME'])) {
+      // We need this for when the test is executed by run-tests.sh.
+      // @todo Remove this once run-tests.sh has been converted to use a Request
+      //   object.
+      $server['SCRIPT_FILENAME'] = $server['SCRIPT_NAME'];
+      $base_path = ltrim($server['REQUEST_URI'], '/');
+    }
+    else {
+      $base_path = $request->getBasePath();
+    }
+    $sub_request = Request::create($base_path . '/user', 'GET', $request->query->all(), $request->cookies->all(), [], $server);
+    return $this->httpKernel->handle($sub_request, HttpKernelInterface::SUB_REQUEST);
+  }
+
+}

2017/web/core/modules/language/tests/language_test/src/Entity/NoLanguageEntityTest.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\language_test\Entity;
+
+use Drupal\Core\Entity\ContentEntityBase;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+
+/**
+ * Defines the test entity class.
+ *
+ * @ContentEntityType(
+ *   id = "no_language_entity_test",
+ *   label = @Translation("Test entity without language support"),
+ *   handlers = {
+ *     "views_data" = "Drupal\entity_test\EntityTestViewsData"
+ *   },
+ *   base_table = "no_language_entity_test",
+ *   persistent_cache = FALSE,
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "uuid" = "uuid",
+ *   },
+ * )
+ */
+class NoLanguageEntityTest extends ContentEntityBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    $fields['id'] = BaseFieldDefinition::create('integer')
+      ->setLabel(t('ID'))
+      ->setDescription(t('The ID of the test entity.'))
+      ->setReadOnly(TRUE)
+      ->setSetting('unsigned', TRUE);
+
+    $fields['uuid'] = BaseFieldDefinition::create('uuid')
+      ->setLabel(t('UUID'))
+      ->setDescription(t('The UUID of the test entity.'))
+      ->setReadOnly(TRUE);
+
+    return $fields;
+  }
+
+}

2017/web/core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\language_test\Plugin\LanguageNegotiation;
+
+use Drupal\language\LanguageNegotiationMethodBase;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Class for identifying language from a selected language.
+ *
+ * @LanguageNegotiation(
+ *   id = "test_language_negotiation_method",
+ *   weight = -10,
+ *   name = @Translation("Test"),
+ *   description = @Translation("This is a test language negotiation method."),
+ *   types = {Drupal\Core\Language\LanguageInterface::TYPE_CONTENT,
+ *   "test_language_type", "fixed_test_language_type"}
+ * )
+ */
+class LanguageNegotiationTest extends LanguageNegotiationMethodBase {
+
+  /**
+   * The language negotiation method id.
+   */
+  const METHOD_ID = 'test_language_negotiation_method';
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getLangcode(Request $request = NULL) {
+    return 'it';
+  }
+
+}

2017/web/core/modules/language/tests/language_test/src/Plugin/LanguageNegotiation/LanguageNegotiationTestTs.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Drupal\language_test\Plugin\LanguageNegotiation;
+
+/**
+ * Class for identifying language from a selected language.
+ *
+ * @LanguageNegotiation(
+ *   id = "test_language_negotiation_method_ts",
+ *   weight = -10,
+ *   name = @Translation("Type-specific test"),
+ *   description = @Translation("This is a test language negotiation method."),
+ *   types = {"test_language_type"}
+ * )
+ */
+class LanguageNegotiationTestTs extends LanguageNegotiationTest {
+
+  /**
+   * The language negotiation method id.
+   */
+  const METHOD_ID = 'test_language_negotiation_method_ts';
+
+}

2017/web/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Test administration path based conversion of entities.
+ *
+ * @group language
+ */
+class AdminPathEntityConverterLanguageTest extends BrowserTestBase {
+
+  public static $modules = ['language', 'language_test'];
+
+  protected function setUp() {
+    parent::setUp();
+    $permissions = [
+      'access administration pages',
+      'administer site configuration',
+    ];
+    $this->drupalLogin($this->drupalCreateUser($permissions));
+    ConfigurableLanguage::createFromLangcode('es')->save();
+  }
+
+  /**
+   * Tests the translated and untranslated config entities are loaded properly.
+   */
+  public function testConfigUsingCurrentLanguage() {
+    \Drupal::languageManager()
+      ->getLanguageConfigOverride('es', 'language.entity.es')
+      ->set('label', 'Español')
+      ->save();
+
+    $this->drupalGet('es/admin/language_test/entity_using_current_language/es');
+    $this->assertNoRaw(t('Loaded %label.', ['%label' => 'Spanish']));
+    $this->assertRaw(t('Loaded %label.', ['%label' => 'Español']));
+
+    $this->drupalGet('es/admin/language_test/entity_using_original_language/es');
+    $this->assertRaw(t('Loaded %label.', ['%label' => 'Spanish']));
+    $this->assertNoRaw(t('Loaded %label.', ['%label' => 'Español']));
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/ConfigurableLanguageManagerTest.php

@@ -0,0 +1,189 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\language\Entity\ContentLanguageSettings;
+use Drupal\node\Entity\Node;
+use Drupal\node\Entity\NodeType;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests Language Negotiation.
+ *
+ * Uses different negotiators for content and interface.
+ *
+ * @group language
+ */
+class ConfigurableLanguageManagerTest extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'language',
+    'content_translation',
+    'node',
+    'locale',
+    'block',
+    'system',
+    'user',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    /** @var \Drupal\user\UserInterface $user */
+    $user = $this->createUser([], '', TRUE);
+    $this->drupalLogin($user);
+    ConfigurableLanguage::createFromLangcode('es')->save();
+
+    // Create a page node type and make it translatable.
+    NodeType::create([
+      'type' => 'page',
+      'name' => t('Page'),
+    ])->save();
+
+    $config = ContentLanguageSettings::loadByEntityTypeBundle('node', 'page');
+    $config->setDefaultLangcode('en')
+      ->setLanguageAlterable(TRUE)
+      ->save();
+
+    // Create a Node with title 'English' and translate it to Spanish.
+    $node = Node::create([
+      'type' => 'page',
+      'title' => 'English',
+    ]);
+    $node->save();
+    $node->addTranslation('es', ['title' => 'Español']);
+    $node->save();
+
+    // Enable both language_interface and language_content language negotiation.
+    \Drupal::getContainer()->get('language_negotiator')->updateConfiguration([
+      'language_interface',
+      'language_content',
+    ]);
+
+    // Set the preferred language of the user for admin pages to English.
+    $user->set('preferred_admin_langcode', 'en')->save();
+
+    // Make sure node edit pages are administration pages.
+    $this->config('node.settings')->set('use_admin_theme', '1')->save();
+    $this->container->get('router.builder')->rebuild();
+
+    // Place a Block with a translatable string on the page.
+    $this->placeBlock('system_powered_by_block', ['region' => 'content']);
+
+    // Load the Spanish Node page once, to register the translatable string.
+    $this->drupalGet('/es/node/1');
+
+    // Translate the Powered by string.
+    /** @var \Drupal\locale\StringStorageInterface $string_storage */
+    $string_storage = \Drupal::getContainer()->get('locale.storage');
+    $source = $string_storage->findString(['source' => 'Powered by <a href=":poweredby">Drupal</a>']);
+    $string_storage->createTranslation([
+      'lid' => $source->lid,
+      'language' => 'es',
+      'translation' => 'Funciona con ...',
+    ])->save();
+    // Invalidate caches so that the new translation will be used.
+    Cache::invalidateTags(['rendered', 'locale']);
+  }
+
+  /**
+   * Test translation with URL and Preferred Admin Language negotiators.
+   *
+   * The interface language uses the preferred language for admin pages of the
+   * user and after that the URL. The Content uses just the URL.
+   */
+  public function testUrlContentTranslationWithPreferredAdminLanguage() {
+    $assert_session = $this->assertSession();
+    // Set the interface language to use the preferred administration language
+    // and then the URL.
+    /** @var \Drupal\language\LanguageNegotiatorInterface $language_negotiator */
+    $language_negotiator = \Drupal::getContainer()->get('language_negotiator');
+    $language_negotiator->saveConfiguration('language_interface', [
+      'language-user-admin' => 1,
+      'language-url' => 2,
+      'language-selected' => 3,
+    ]);
+    // Set Content Language Negotiator to use just the URL.
+    $language_negotiator->saveConfiguration('language_content', [
+      'language-url' => 4,
+      'language-selected' => 5,
+    ]);
+
+    // See if the full view of the node in english is present and the
+    // string in the Powered By Block is in English.
+    $this->drupalGet('/node/1');
+    $assert_session->pageTextContains('English');
+    $assert_session->pageTextContains('Powered by');
+
+    // Load the spanish node page again and see if both the node and the string
+    // are translated.
+    $this->drupalGet('/es/node/1');
+    $assert_session->pageTextContains('Español');
+    $assert_session->pageTextContains('Funciona con');
+    $assert_session->pageTextNotContains('Powered by');
+
+    // Check if the Powered by string is shown in English on an
+    // administration page, and the node content is shown in Spanish.
+    $this->drupalGet('/es/node/1/edit');
+    $assert_session->pageTextContains('Español');
+    $assert_session->pageTextContains('Powered by');
+    $assert_session->pageTextNotContains('Funciona con');
+  }
+
+  /**
+   * Test translation with URL and Session Language Negotiators.
+   */
+  public function testUrlContentTranslationWithSessionLanguage() {
+    $assert_session = $this->assertSession();
+    /** @var \Drupal\language\LanguageNegotiatorInterface $language_negotiator */
+    $language_negotiator = \Drupal::getContainer()->get('language_negotiator');
+    // Set Interface Language Negotiator to Session.
+    $language_negotiator->saveConfiguration('language_interface', [
+      'language-session' => 1,
+      'language-url' => 2,
+      'language-selected' => 3,
+    ]);
+
+    // Set Content Language Negotiator to URL.
+    $language_negotiator->saveConfiguration('language_content', [
+      'language-url' => 4,
+      'language-selected' => 5,
+    ]);
+
+    // See if the full view of the node in english is present and the
+    // string in the Powered By Block is in English.
+    $this->drupalGet('/node/1');
+    $assert_session->pageTextContains('English');
+    $assert_session->pageTextContains('Powered by');
+
+    // The language session variable has not been set yet, so
+    // The string should be in Spanish.
+    $this->drupalGet('/es/node/1');
+    $assert_session->pageTextContains('Español');
+    $assert_session->pageTextNotContains('Powered by');
+    $assert_session->pageTextContains('Funciona con');
+
+    // Set the session language to Spanish but load the English node page.
+    $this->drupalGet('/node/1', ['query' => ['language' => 'es']]);
+    $assert_session->pageTextContains('English');
+    $assert_session->pageTextNotContains('Español');
+    $assert_session->pageTextContains('Funciona con');
+    $assert_session->pageTextNotContains('Powered by');
+
+    // Set the session language to English but load the node page in Spanish.
+    $this->drupalGet('/es/node/1', ['query' => ['language' => 'en']]);
+    $assert_session->pageTextNotContains('English');
+    $assert_session->pageTextContains('Español');
+    $assert_session->pageTextNotContains('Funciona con');
+    $assert_session->pageTextContains('Powered by');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/EntityTypeWithoutLanguageFormTest.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests entity type without language support.
+ *
+ * This is to ensure that an entity type without language support can not
+ * enable the language select from the content language settings page.
+ *
+ * @group language
+ */
+class EntityTypeWithoutLanguageFormTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'language',
+    'language_test',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create and log in administrative user.
+    $admin_user = $this->drupalCreateUser([
+      'administer languages',
+    ]);
+    $this->drupalLogin($admin_user);
+  }
+
+  /**
+   * Tests configuration options with an entity without language definition.
+   */
+  public function testEmptyLangcode() {
+    // Assert that we can not enable language select from
+    // content language settings page.
+    $this->drupalGet('admin/config/regional/content-language');
+    $this->assertNoField('entity_types[no_language_entity_test]');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/Hal/ConfigurableLanguageHalJsonAnonTest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Hal;
+
+use Drupal\Tests\language\Functional\Rest\ConfigurableLanguageResourceTestBase;
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class ConfigurableLanguageHalJsonAnonTest extends ConfigurableLanguageResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+}

2017/web/core/modules/language/tests/src/Functional/Hal/ConfigurableLanguageHalJsonBasicAuthTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Hal;
+
+use Drupal\Tests\language\Functional\Rest\ConfigurableLanguageResourceTestBase;
+use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
+
+/**
+ * @group hal
+ */
+class ConfigurableLanguageHalJsonBasicAuthTest extends ConfigurableLanguageResourceTestBase {
+
+  use BasicAuthResourceWithInterfaceTranslationTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal', 'basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}

2017/web/core/modules/language/tests/src/Functional/Hal/ConfigurableLanguageHalJsonCookieTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Hal;
+
+use Drupal\Tests\language\Functional\Rest\ConfigurableLanguageResourceTestBase;
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class ConfigurableLanguageHalJsonCookieTest extends ConfigurableLanguageResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}

2017/web/core/modules/language/tests/src/Functional/Hal/ContentLanguageSettingsHalJsonAnonTest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Hal;
+
+use Drupal\Tests\language\Functional\Rest\ContentLanguageSettingsResourceTestBase;
+use Drupal\Tests\rest\Functional\AnonResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class ContentLanguageSettingsHalJsonAnonTest extends ContentLanguageSettingsResourceTestBase {
+
+  use AnonResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+}

2017/web/core/modules/language/tests/src/Functional/Hal/ContentLanguageSettingsHalJsonBasicAuthTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Hal;
+
+use Drupal\Tests\language\Functional\Rest\ContentLanguageSettingsResourceTestBase;
+use Drupal\Tests\rest\Functional\BasicAuthResourceWithInterfaceTranslationTestTrait;
+
+/**
+ * @group hal
+ */
+class ContentLanguageSettingsHalJsonBasicAuthTest extends ContentLanguageSettingsResourceTestBase {
+
+  use BasicAuthResourceWithInterfaceTranslationTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal', 'basic_auth'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'basic_auth';
+
+}

2017/web/core/modules/language/tests/src/Functional/Hal/ContentLanguageSettingsHalJsonCookieTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Hal;
+
+use Drupal\Tests\language\Functional\Rest\ContentLanguageSettingsResourceTestBase;
+use Drupal\Tests\rest\Functional\CookieResourceTestTrait;
+
+/**
+ * @group hal
+ */
+class ContentLanguageSettingsHalJsonCookieTest extends ContentLanguageSettingsResourceTestBase {
+
+  use CookieResourceTestTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['hal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $format = 'hal_json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $mimeType = 'application/hal+json';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $auth = 'cookie';
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageBlockSettingsVisibilityTest.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests that the language settings on block config appears correctly.
+ *
+ * @group language
+ */
+class LanguageBlockSettingsVisibilityTest extends BrowserTestBase {
+
+  public static $modules = ['block', 'language'];
+
+  public function testUnnecessaryLanguageSettingsVisibility() {
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'administer blocks']);
+    $this->drupalLogin($admin_user);
+    $this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'hu'], t('Add language'));
+    $this->drupalGet('admin/structure/block/add/system_menu_block:admin/stark');
+    $this->assertNoFieldByXPath('//input[@id="edit-visibility-language-langcodes-und"]', NULL, '\'Not specified\' option does not appear at block config, language settings section.');
+    $this->assertNoFieldByXpath('//input[@id="edit-visibility-language-langcodes-zxx"]', NULL, '\'Not applicable\' option does not appear at block config, language settings section.');
+    $this->assertFieldByXPath('//input[@id="edit-visibility-language-langcodes-en"]', NULL, '\'English\' option appears at block config, language settings section.');
+    $this->assertFieldByXpath('//input[@id="edit-visibility-language-langcodes-hu"]', NULL, '\'Hungarian\' option appears at block config, language settings section.');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageBreadcrumbTest.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests breadcrumbs functionality.
+ *
+ * @group Menu
+ */
+class LanguageBreadcrumbTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'block', 'filter'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->drupalPlaceBlock('system_breadcrumb_block');
+    ConfigurableLanguage::createFromLangcode('de')->save();
+    ConfigurableLanguage::createFromLangcode('gsw-berne')->save();
+  }
+
+  /**
+   * Tests breadcrumbs with URL prefixes.
+   */
+  public function testBreadCrumbs() {
+    // Prepare common base breadcrumb elements.
+    $home = ['' => 'Home'];
+    $admin = $home + ['admin' => t('Administration')];
+
+    $page = $this->getSession()->getPage();
+
+    // /user/login is the default frontpage which only works for an anonymous
+    // user. Access the frontpage in different languages, ensure that no
+    // breadcrumb is displayed.
+    $this->drupalGet('user/login');
+    $breadcrumbs = $page->find('css', '.block-system-breadcrumb-block');
+    $this->assertNull($breadcrumbs);
+
+    $this->drupalGet('de/user/login');
+    $breadcrumbs = $page->find('css', '.block-system-breadcrumb-block');
+    $this->assertNull($breadcrumbs);
+
+    $this->drupalGet('gsw-berne/user/login');
+    $breadcrumbs = $page->find('css', '.block-system-breadcrumb-block');
+    $this->assertNull($breadcrumbs);
+
+    $admin_user = $this->drupalCreateUser(['access administration pages']);
+    $this->drupalLogin($admin_user);
+
+    // Use administration routes to assert that breadcrumb is displayed
+    // correctly on pages other than the frontpage.
+    $this->drupalGet('admin');
+    $breadcrumbs = $page->find('css', '.block-system-breadcrumb-block');
+    $this->assertEquals(1, substr_count($breadcrumbs->getText(), 'Home'));
+    $this->assertEquals(0, substr_count($breadcrumbs->getText(), 'Administration'));
+
+    $this->drupalGet('de/admin');
+    $breadcrumbs = $page->find('css', '.block-system-breadcrumb-block');
+    $this->assertEquals(1, substr_count($breadcrumbs->getText(), 'Home'));
+    $this->assertEquals(0, substr_count($breadcrumbs->getText(), 'Administration'));
+
+    $this->drupalGet('admin/structure', $admin);
+    $breadcrumbs = $page->find('css', '.block-system-breadcrumb-block');
+    $this->assertEquals(1, substr_count($breadcrumbs->getText(), 'Home'));
+    $this->assertEquals(1, substr_count($breadcrumbs->getText(), 'Administration'));
+
+    $this->drupalGet('de/admin/structure', $admin);
+    $breadcrumbs = $page->find('css', '.block-system-breadcrumb-block');
+    $this->assertEquals(1, substr_count($breadcrumbs->getText(), 'Home'));
+    $this->assertEquals(1, substr_count($breadcrumbs->getText(), 'Administration'));
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests browser language detection.
+ *
+ * @group language
+ */
+class LanguageBrowserDetectionTest extends BrowserTestBase {
+
+  public static $modules = ['language'];
+
+  /**
+   * Tests for adding, editing and deleting mappings between browser language
+   * codes and Drupal language codes.
+   */
+  public function testUIBrowserLanguageMappings() {
+    // User to manage languages.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+    $this->drupalLogin($admin_user);
+
+    // Check that the configure link exists.
+    $this->drupalGet('admin/config/regional/language/detection');
+    $this->assertLinkByHref('admin/config/regional/language/detection/browser');
+
+    // Check that defaults are loaded from language.mappings.yml.
+    $this->drupalGet('admin/config/regional/language/detection/browser');
+    $this->assertField('edit-mappings-zh-cn-browser-langcode', 'zh-cn', 'Chinese browser language code found.');
+    $this->assertField('edit-mappings-zh-cn-drupal-langcode', 'zh-hans-cn', 'Chinese Drupal language code found.');
+
+    // Delete zh-cn language code.
+    $browser_langcode = 'zh-cn';
+    $this->drupalGet('admin/config/regional/language/detection/browser/delete/' . $browser_langcode);
+    $message = t('Are you sure you want to delete @browser_langcode?', [
+      '@browser_langcode' => $browser_langcode,
+    ]);
+    $this->assertRaw($message);
+
+    // Confirm the delete.
+    $edit = [];
+    $this->drupalPostForm('admin/config/regional/language/detection/browser/delete/' . $browser_langcode, $edit, t('Confirm'));
+
+    // We need raw here because %browser will add HTML.
+    $t_args = [
+      '%browser' => $browser_langcode,
+    ];
+    $this->assertRaw(t('The mapping for the %browser browser language code has been deleted.', $t_args), 'The test browser language code has been deleted.');
+
+    // Check we went back to the browser negotiation mapping overview.
+    $this->assertUrl(\Drupal::url('language.negotiation_browser', [], ['absolute' => TRUE]));
+    // Check that ch-zn no longer exists.
+    $this->assertNoField('edit-mappings-zh-cn-browser-langcode', 'Chinese browser language code no longer exists.');
+
+    // Add a new custom mapping.
+    $edit = [
+      'new_mapping[browser_langcode]' => 'xx',
+      'new_mapping[drupal_langcode]' => 'en',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection/browser', $edit, t('Save configuration'));
+    $this->assertUrl(\Drupal::url('language.negotiation_browser', [], ['absolute' => TRUE]));
+    $this->assertField('edit-mappings-xx-browser-langcode', 'xx', 'Browser language code found.');
+    $this->assertField('edit-mappings-xx-drupal-langcode', 'en', 'Drupal language code found.');
+
+    // Add the same custom mapping again.
+    $this->drupalPostForm('admin/config/regional/language/detection/browser', $edit, t('Save configuration'));
+    $this->assertText('Browser language codes must be unique.');
+
+    // Change browser language code of our custom mapping to zh-sg.
+    $edit = [
+      'mappings[xx][browser_langcode]' => 'zh-sg',
+      'mappings[xx][drupal_langcode]' => 'en',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection/browser', $edit, t('Save configuration'));
+    $this->assertText(t('Browser language codes must be unique.'));
+
+    // Change Drupal language code of our custom mapping to zh-hans.
+    $edit = [
+      'mappings[xx][browser_langcode]' => 'xx',
+      'mappings[xx][drupal_langcode]' => 'zh-hans',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection/browser', $edit, t('Save configuration'));
+    $this->assertUrl(\Drupal::url('language.negotiation_browser', [], ['absolute' => TRUE]));
+    $this->assertField('edit-mappings-xx-browser-langcode', 'xx', 'Browser language code found.');
+    $this->assertField('edit-mappings-xx-drupal-langcode', 'zh-hans', 'Drupal language code found.');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageConfigOverrideImportTest.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Ensures the language config overrides can be synchronized.
+ *
+ * @group language
+ */
+class LanguageConfigOverrideImportTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'config', 'locale', 'config_translation'];
+
+  /**
+   * Tests that language can be enabled and overrides are created during a sync.
+   */
+  public function testConfigOverrideImport() {
+    ConfigurableLanguage::createFromLangcode('fr')->save();
+    /* @var \Drupal\Core\Config\StorageInterface $sync */
+    $sync = \Drupal::service('config.storage.sync');
+    $this->copyConfig(\Drupal::service('config.storage'), $sync);
+
+    // Uninstall the language module and its dependencies so we can test
+    // enabling the language module and creating overrides at the same time
+    // during a configuration synchronization.
+    \Drupal::service('module_installer')->uninstall(['language']);
+    // Ensure that the current site has no overrides registered to the
+    // ConfigFactory.
+    $this->rebuildContainer();
+
+    /* @var \Drupal\Core\Config\StorageInterface $override_sync */
+    $override_sync = $sync->createCollection('language.fr');
+    // Create some overrides in sync.
+    $override_sync->write('system.site', ['name' => 'FR default site name']);
+    $override_sync->write('system.maintenance', ['message' => 'FR message: @site is currently under maintenance. We should be back shortly. Thank you for your patience']);
+
+    $this->configImporter()->import();
+    $this->rebuildContainer();
+    \Drupal::service('router.builder')->rebuild();
+
+    $override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'system.site');
+    $this->assertEqual('FR default site name', $override->get('name'));
+    $this->drupalGet('fr');
+    $this->assertText('FR default site name');
+
+    $this->drupalLogin($this->rootUser);
+    $this->drupalGet('admin/config/development/maintenance/translate/fr/edit');
+    $this->assertText('FR message: @site is currently under maintenance. We should be back shortly. Thank you for your patience');
+  }
+
+  /**
+   * Tests that configuration events are not fired during a sync of overrides.
+   */
+  public function testConfigOverrideImportEvents() {
+    // Enable the config_events_test module so we can record events occurring.
+    \Drupal::service('module_installer')->install(['config_events_test']);
+    $this->rebuildContainer();
+
+    ConfigurableLanguage::createFromLangcode('fr')->save();
+
+    /* @var \Drupal\Core\Config\StorageInterface $sync */
+    $sync = \Drupal::service('config.storage.sync');
+    $this->copyConfig(\Drupal::service('config.storage'), $sync);
+
+    /* @var \Drupal\Core\Config\StorageInterface $override_sync */
+    $override_sync = $sync->createCollection('language.fr');
+    // Create some overrides in sync.
+    $override_sync->write('system.site', ['name' => 'FR default site name']);
+    \Drupal::state()->set('config_events_test.event', FALSE);
+
+    $this->configImporter()->import();
+    $this->rebuildContainer();
+    \Drupal::service('router.builder')->rebuild();
+
+    // Test that no config save event has been fired during the import because
+    // language configuration overrides do not fire events.
+    $event_recorder = \Drupal::state()->get('config_events_test.event', FALSE);
+    $this->assertFalse($event_recorder);
+
+    $this->drupalGet('fr');
+    $this->assertText('FR default site name');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageConfigSchemaTest.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Ensures the language config schema is correct.
+ *
+ * @group language
+ */
+class LanguageConfigSchemaTest extends BrowserTestBase {
+
+  use SchemaCheckTestTrait;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'menu_link_content'];
+
+  /**
+   * A user with administrative permissions.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create user.
+    $this->adminUser = $this->drupalCreateUser(['administer languages']);
+    $this->drupalLogin($this->adminUser);
+  }
+
+  /**
+   * Tests whether the language config schema is valid.
+   */
+  public function testValidLanguageConfigSchema() {
+    // Make sure no language configuration available by default.
+    $config_data = $this->config('language.settings')->get();
+    $this->assertTrue(empty($config_data));
+
+    $settings_path = 'admin/config/regional/content-language';
+
+    // Enable translation for menu link.
+    $edit['entity_types[menu_link_content]'] = TRUE;
+    $edit['settings[menu_link_content][menu_link_content][settings][language][language_alterable]'] = TRUE;
+
+    // Enable translation for user.
+    $edit['entity_types[user]'] = TRUE;
+    $edit['settings[user][user][settings][language][language_alterable]'] = TRUE;
+    $edit['settings[user][user][settings][language][langcode]'] = 'en';
+
+    $this->drupalPostForm($settings_path, $edit, t('Save configuration'));
+
+    $config_data = $this->config('language.content_settings.menu_link_content.menu_link_content');
+    // Make sure configuration saved correctly.
+    $this->assertTrue($config_data->get('language_alterable'));
+
+    $this->assertConfigSchema(\Drupal::service('config.typed'), $config_data->getName(), $config_data->get());
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php

@@ -0,0 +1,253 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\language\Entity\ContentLanguageSettings;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests the features of the language configuration element field.
+ *
+ * @group language
+ */
+class LanguageConfigurationElementTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['taxonomy', 'node', 'language', 'language_elements_test', 'field_ui'];
+
+  protected function setUp() {
+    parent::setUp();
+    $user = $this->drupalCreateUser(['access administration pages', 'administer languages', 'administer content types']);
+    $this->drupalLogin($user);
+  }
+
+  /**
+   * Tests the language settings have been saved.
+   */
+  public function testLanguageConfigurationElement() {
+    $this->drupalGet('language-tests/language_configuration_element');
+    $edit['lang_configuration[langcode]'] = 'current_interface';
+    $edit['lang_configuration[language_alterable]'] = FALSE;
+    $this->drupalPostForm(NULL, $edit, 'Save');
+    $lang_conf = ContentLanguageSettings::loadByEntityTypeBundle('entity_test', 'some_bundle');
+
+    // Check that the settings have been saved.
+    $this->assertEqual($lang_conf->getDefaultLangcode(), 'current_interface');
+    $this->assertFalse($lang_conf->isLanguageAlterable());
+    $this->drupalGet('language-tests/language_configuration_element');
+    $this->assertOptionSelected('edit-lang-configuration-langcode', 'current_interface');
+    $this->assertNoFieldChecked('edit-lang-configuration-language-alterable');
+
+    // Reload the page and save again.
+    $this->drupalGet('language-tests/language_configuration_element');
+    $edit['lang_configuration[langcode]'] = 'authors_default';
+    $edit['lang_configuration[language_alterable]'] = TRUE;
+    $this->drupalPostForm(NULL, $edit, 'Save');
+    $lang_conf = ContentLanguageSettings::loadByEntityTypeBundle('entity_test', 'some_bundle');
+
+    // Check that the settings have been saved.
+    $this->assertEqual($lang_conf->getDefaultLangcode(), 'authors_default');
+    $this->assertTrue($lang_conf->isLanguageAlterable());
+    $this->drupalGet('language-tests/language_configuration_element');
+    $this->assertOptionSelected('edit-lang-configuration-langcode', 'authors_default');
+    $this->assertFieldChecked('edit-lang-configuration-language-alterable');
+
+    // Test if content type settings have been saved.
+    $edit = [
+      'name' => 'Page',
+      'type' => 'page',
+      'language_configuration[langcode]' => 'authors_default',
+      'language_configuration[language_alterable]' => TRUE,
+    ];
+    $this->drupalPostForm('admin/structure/types/add', $edit, 'Save and manage fields');
+
+    // Make sure the settings are saved when creating the content type.
+    $this->drupalGet('admin/structure/types/manage/page');
+    $this->assertOptionSelected('edit-language-configuration-langcode', 'authors_default');
+    $this->assertFieldChecked('edit-language-configuration-language-alterable');
+
+  }
+
+  /**
+   * Tests that the language_get_default_langcode() returns the correct values.
+   */
+  public function testDefaultLangcode() {
+    // Add some custom languages.
+    foreach (['aa', 'bb', 'cc'] as $language_code) {
+      ConfigurableLanguage::create([
+        'id' => $language_code,
+        'label' => $this->randomMachineName(),
+      ])->save();
+    }
+
+    // Fixed language.
+    ContentLanguageSettings::loadByEntityTypeBundle('entity_test', 'custom_bundle')
+      ->setLanguageAlterable(TRUE)
+      ->setDefaultLangcode('bb')
+      ->save();
+
+    $langcode = language_get_default_langcode('entity_test', 'custom_bundle');
+    $this->assertEqual($langcode, 'bb');
+
+    // Current interface.
+    ContentLanguageSettings::loadByEntityTypeBundle('entity_test', 'custom_bundle')
+      ->setLanguageAlterable(TRUE)
+      ->setDefaultLangcode('current_interface')
+      ->save();
+
+    $langcode = language_get_default_langcode('entity_test', 'custom_bundle');
+    $language_interface = \Drupal::languageManager()->getCurrentLanguage();
+    $this->assertEqual($langcode, $language_interface->getId());
+
+    // Site's default.
+    $old_default = \Drupal::languageManager()->getDefaultLanguage();
+    // Ensure the language entity default value is correct.
+    $configurable_language = ConfigurableLanguage::load($old_default->getId());
+    $this->assertTrue($configurable_language->isDefault(), 'The en language entity is flagged as the default language.');
+
+    $this->config('system.site')->set('default_langcode', 'cc')->save();
+    ContentLanguageSettings::loadByEntityTypeBundle('entity_test', 'custom_bundle')
+      ->setLanguageAlterable(TRUE)
+      ->setDefaultLangcode(LanguageInterface::LANGCODE_SITE_DEFAULT)
+      ->save();
+    $langcode = language_get_default_langcode('entity_test', 'custom_bundle');
+    $this->assertEqual($langcode, 'cc');
+
+    // Ensure the language entity default value is correct.
+    $configurable_language = ConfigurableLanguage::load($old_default->getId());
+    $this->assertFalse($configurable_language->isDefault(), 'The en language entity is not flagged as the default language.');
+    $configurable_language = ConfigurableLanguage::load('cc');
+    // Check calling the
+    // \Drupal\language\ConfigurableLanguageInterface::isDefault() method
+    // directly.
+    $this->assertTrue($configurable_language->isDefault(), 'The cc language entity is flagged as the default language.');
+
+    // Check the default value of a language field when authors preferred option
+    // is selected.
+    // Create first an user and assign a preferred langcode to him.
+    $some_user = $this->drupalCreateUser();
+    $some_user->preferred_langcode = 'bb';
+    $some_user->save();
+    $this->drupalLogin($some_user);
+    ContentLanguageSettings::create([
+      'target_entity_type_id' => 'entity_test',
+      'target_bundle' => 'some_bundle',
+    ])->setLanguageAlterable(TRUE)
+      ->setDefaultLangcode('authors_default')
+      ->save();
+
+    $this->drupalGet('language-tests/language_configuration_element_test');
+    $this->assertOptionSelected('edit-langcode', 'bb');
+  }
+
+  /**
+   * Tests that the configuration is retained when the node type is updated.
+   */
+  public function testNodeTypeUpdate() {
+    // Create the article content type first if the profile used is not the
+    // standard one.
+    if ($this->profile != 'standard') {
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+    }
+    $admin_user = $this->drupalCreateUser(['administer content types']);
+    $this->drupalLogin($admin_user);
+    $edit = [
+      'language_configuration[langcode]' => 'current_interface',
+      'language_configuration[language_alterable]' => TRUE,
+    ];
+    $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
+    // Check the language default configuration for the articles.
+    $configuration = ContentLanguageSettings::loadByEntityTypeBundle('node', 'article');
+    $uuid = $configuration->uuid();
+    $this->assertEqual($configuration->getDefaultLangcode(), 'current_interface', 'The default language configuration has been saved on the Article content type.');
+    $this->assertTrue($configuration->isLanguageAlterable(), 'The alterable language configuration has been saved on the Article content type.');
+    // Update the article content type by changing the title label.
+    $edit = [
+      'title_label' => 'Name',
+    ];
+    $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
+    // Check that we still have the settings for the updated node type.
+    $configuration = ContentLanguageSettings::loadByEntityTypeBundle('node', 'article');
+    $this->assertEqual($configuration->getDefaultLangcode(), 'current_interface', 'The default language configuration has been kept on the updated Article content type.');
+    $this->assertTrue($configuration->isLanguageAlterable(), 'The alterable language configuration has been kept on the updated Article content type.');
+    $this->assertEqual($configuration->uuid(), $uuid, 'The language configuration uuid has been kept on the updated Article content type.');
+  }
+
+  /**
+   * Tests the language settings are deleted on bundle delete.
+   */
+  public function testNodeTypeDelete() {
+    // Create the article content type first if the profile used is not the
+    // standard one.
+    if ($this->profile != 'standard') {
+      $this->drupalCreateContentType([
+        'type' => 'article',
+        'name' => 'Article',
+      ]);
+    }
+    $admin_user = $this->drupalCreateUser(['administer content types']);
+    $this->drupalLogin($admin_user);
+
+    // Create language configuration for the articles.
+    $edit = [
+      'language_configuration[langcode]' => 'authors_default',
+      'language_configuration[language_alterable]' => TRUE,
+    ];
+    $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
+
+    // Check the language default configuration for articles is present.
+    $configuration = \Drupal::entityManager()->getStorage('language_content_settings')->load('node.article');
+    $this->assertTrue($configuration, 'The language configuration is present.');
+
+    // Delete 'article' bundle.
+    $this->drupalPostForm('admin/structure/types/manage/article/delete', [], t('Delete'));
+
+    // Check that the language configuration has been deleted.
+    \Drupal::entityManager()->getStorage('language_content_settings')->resetCache();
+    $configuration = \Drupal::entityManager()->getStorage('language_content_settings')->load('node.article');
+    $this->assertFalse($configuration, 'The language configuration was deleted after bundle was deleted.');
+  }
+
+  /**
+   * Tests that the configuration is retained when a vocabulary is updated.
+   */
+  public function testTaxonomyVocabularyUpdate() {
+    $vocabulary = Vocabulary::create([
+      'name' => 'Country',
+      'vid' => 'country',
+    ]);
+    $vocabulary->save();
+
+    $admin_user = $this->drupalCreateUser(['administer taxonomy']);
+    $this->drupalLogin($admin_user);
+    $edit = [
+      'default_language[langcode]' => 'current_interface',
+      'default_language[language_alterable]' => TRUE,
+    ];
+    $this->drupalPostForm('admin/structure/taxonomy/manage/country', $edit, t('Save'));
+
+    // Check the language default configuration.
+    $configuration = ContentLanguageSettings::loadByEntityTypeBundle('taxonomy_term', 'country');
+    $uuid = $configuration->uuid();
+    $this->assertEqual($configuration->getDefaultLangcode(), 'current_interface', 'The default language configuration has been saved on the Country vocabulary.');
+    $this->assertTrue($configuration->isLanguageAlterable(), 'The alterable language configuration has been saved on the Country vocabulary.');
+    // Update the vocabulary.
+    $edit = [
+      'name' => 'Nation',
+    ];
+    $this->drupalPostForm('admin/structure/taxonomy/manage/country', $edit, t('Save'));
+    // Check that we still have the settings for the updated vocabulary.
+    $configuration = ContentLanguageSettings::loadByEntityTypeBundle('taxonomy_term', 'country');
+    $this->assertEqual($configuration->getDefaultLangcode(), 'current_interface', 'The default language configuration has been kept on the updated Country vocabulary.');
+    $this->assertTrue($configuration->isLanguageAlterable(), 'The alterable language configuration has been kept on the updated Country vocabulary.');
+    $this->assertEqual($configuration->uuid(), $uuid, 'The language configuration uuid has been kept on the updated Country vocabulary.');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php

@@ -0,0 +1,218 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Adds and configures languages to check negotiation changes.
+ *
+ * @group language
+ */
+class LanguageConfigurationTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language'];
+
+  /**
+   * Functional tests for adding, editing and deleting languages.
+   */
+  public function testLanguageConfiguration() {
+    // Ensure the after installing the language module the weight of the English
+    // language is still 0.
+    $this->assertEqual(ConfigurableLanguage::load('en')->getWeight(), 0, 'The English language has a weight of 0.');
+
+    // User to add and remove language.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+    $this->drupalLogin($admin_user);
+
+    // Check if the Default English language has no path prefix.
+    $this->drupalGet('admin/config/regional/language/detection/url');
+    $this->assertFieldByXPath('//input[@name="prefix[en]"]', '', 'Default English has no path prefix.');
+
+    // Check that Add language is a primary button.
+    $this->drupalGet('admin/config/regional/language/add');
+    $this->assertFieldByXPath('//input[contains(@class, "button--primary")]', 'Add language', 'Add language is a primary button');
+
+    // Add predefined language.
+    $edit = [
+      'predefined_langcode' => 'fr',
+    ];
+    $this->drupalPostForm(NULL, $edit, 'Add language');
+    $this->assertText('French');
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
+    // Langcode for Languages is always 'en'.
+    $language = $this->config('language.entity.fr')->get();
+    $this->assertEqual($language['langcode'], 'en');
+
+    // Check if the Default English language has no path prefix.
+    $this->drupalGet('admin/config/regional/language/detection/url');
+    $this->assertFieldByXPath('//input[@name="prefix[en]"]', '', 'Default English has no path prefix.');
+    // Check if French has a path prefix.
+    $this->drupalGet('admin/config/regional/language/detection/url');
+    $this->assertFieldByXPath('//input[@name="prefix[fr]"]', 'fr', 'French has a path prefix.');
+
+    // Check if we can change the default language.
+    $this->drupalGet('admin/config/regional/language');
+    $this->assertFieldChecked('edit-site-default-language-en', 'English is the default language.');
+
+    // Change the default language.
+    $edit = [
+      'site_default_language' => 'fr',
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
+    $this->rebuildContainer();
+    $this->assertFieldChecked('edit-site-default-language-fr', 'Default language updated.');
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'langcode' => 'fr']), [], 'Correct page redirection.');
+
+    // Check if a valid language prefix is added after changing the default
+    // language.
+    $this->drupalGet('admin/config/regional/language/detection/url');
+    $this->assertFieldByXPath('//input[@name="prefix[en]"]', 'en', 'A valid path prefix has been added to the previous default language.');
+    // Check if French still has a path prefix.
+    $this->drupalGet('admin/config/regional/language/detection/url');
+    $this->assertFieldByXPath('//input[@name="prefix[fr]"]', 'fr', 'French still has a path prefix.');
+
+    // Check that prefix can be changed.
+    $edit = [
+      'prefix[fr]' => 'french',
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
+    $this->assertFieldByXPath('//input[@name="prefix[fr]"]', 'french', 'French path prefix has changed.');
+
+    // Check that the prefix can be removed.
+    $edit = [
+      'prefix[fr]' => '',
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
+    $this->assertNoText(t('The prefix may only be left blank for the selected detection fallback language.'), 'The path prefix can be removed for the default language');
+
+    // Change default negotiation language.
+    $this->config('language.negotiation')->set('selected_langcode', 'fr')->save();
+    // Check that the prefix of a language that is not the negotiation one
+    // cannot be changed to empty string.
+    $edit = [
+      'prefix[en]' => '',
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
+    $this->assertText(t('The prefix may only be left blank for the selected detection fallback language.'));
+
+    //  Check that prefix cannot be changed to contain a slash.
+    $edit = [
+      'prefix[en]' => 'foo/bar',
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
+    $this->assertText(t('The prefix may not contain a slash.'), 'English prefix cannot be changed to contain a slash.');
+
+    // Remove English language and add a new Language to check if langcode of
+    // Language entity is 'en'.
+    $this->drupalPostForm('admin/config/regional/language/delete/en', [], t('Delete'));
+    $this->rebuildContainer();
+    $this->assertRaw(t('The %language (%langcode) language has been removed.', ['%language' => 'English', '%langcode' => 'en']));
+
+    // Ensure that French language has a weight of 1 after being created through
+    // the UI.
+    $french = ConfigurableLanguage::load('fr');
+    $this->assertEqual($french->getWeight(), 1, 'The French language has a weight of 1.');
+    // Ensure that French language can now have a weight of 0.
+    $french->setWeight(0)->save();
+    $this->assertEqual($french->getWeight(), 0, 'The French language has a weight of 0.');
+    // Ensure that new languages created through the API get a weight of 0.
+    $afrikaans = ConfigurableLanguage::createFromLangcode('af');
+    $afrikaans->save();
+    $this->assertEqual($afrikaans->getWeight(), 0, 'The Afrikaans language has a weight of 0.');
+    // Ensure that a new language can be created with any weight.
+    $arabic = ConfigurableLanguage::createFromLangcode('ar');
+    $arabic->setWeight(4)->save();
+    $this->assertEqual($arabic->getWeight(), 4, 'The Arabic language has a weight of 0.');
+
+    $edit = [
+      'predefined_langcode' => 'de',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, 'Add language');
+    $language = $this->config('language.entity.de')->get();
+    $this->assertEqual($language['langcode'], 'fr');
+
+    // Ensure that German language has a weight of 5 after being created through
+    // the UI.
+    $french = ConfigurableLanguage::load('de');
+    $this->assertEqual($french->getWeight(), 5, 'The German language has a weight of 5.');
+  }
+
+  /**
+   * Functional tests for setting system language weight on adding, editing and deleting languages.
+   */
+  public function testLanguageConfigurationWeight() {
+    // User to add and remove language.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+    $this->drupalLogin($admin_user);
+    $this->checkConfigurableLanguageWeight();
+
+    // Add predefined language.
+    $edit = [
+      'predefined_langcode' => 'fr',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, 'Add language');
+    $this->checkConfigurableLanguageWeight('after adding new language');
+
+    // Re-ordering languages.
+    $edit = [
+      'languages[en][weight]' => $this->getHighestConfigurableLanguageWeight() + 1,
+    ];
+    $this->drupalPostForm('admin/config/regional/language', $edit, 'Save configuration');
+    $this->checkConfigurableLanguageWeight('after re-ordering');
+
+    // Remove predefined language.
+    $this->drupalPostForm('admin/config/regional/language/delete/fr', [], 'Delete');
+    $this->checkConfigurableLanguageWeight('after deleting a language');
+  }
+
+  /**
+   * Validates system languages are ordered after configurable languages.
+   *
+   * @param string $state
+   *   (optional) A string for customizing assert messages, containing the
+   *   description of the state of the check, for example: 'after re-ordering'.
+   *   Defaults to 'by default'.
+   */
+  protected function checkConfigurableLanguageWeight($state = 'by default') {
+    // Reset language list.
+    \Drupal::languageManager()->reset();
+    $max_configurable_language_weight = $this->getHighestConfigurableLanguageWeight();
+    $replacements = ['@event' => $state];
+    foreach (\Drupal::languageManager()->getLanguages(LanguageInterface::STATE_LOCKED) as $locked_language) {
+      $replacements['%language'] = $locked_language->getName();
+      $this->assertTrue($locked_language->getWeight() > $max_configurable_language_weight, format_string('System language %language has higher weight than configurable languages @event', $replacements));
+    }
+  }
+
+  /**
+   * Helper to get maximum weight of configurable (unlocked) languages.
+   *
+   * @return int
+   *   Maximum weight of configurable languages.
+   */
+  protected function getHighestConfigurableLanguageWeight() {
+    $max_weight = 0;
+
+    $storage = $this->container->get('entity_type.manager')
+      ->getStorage('configurable_language');
+    $storage->resetCache();
+    /* @var $languages \Drupal\Core\Language\LanguageInterface[] */
+    $languages = $storage->loadMultiple();
+    foreach ($languages as $language) {
+      if (!$language->isLocked()) {
+        $max_weight = max($max_weight, $language->getWeight());
+      }
+    }
+
+    return $max_weight;
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageCustomLanguageConfigurationTest.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Core\Language\Language;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Adds and configures custom languages.
+ *
+ * @group language
+ */
+class LanguageCustomLanguageConfigurationTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language'];
+
+  /**
+   * Functional tests for adding, editing and deleting languages.
+   */
+  public function testLanguageConfiguration() {
+
+    // Create user with permissions to add and remove languages.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+    $this->drupalLogin($admin_user);
+
+    // Add custom language.
+    $edit = [
+      'predefined_langcode' => 'custom',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+    // Test validation on missing values.
+    $this->assertText(t('@name field is required.', ['@name' => t('Language code')]));
+    $this->assertText(t('@name field is required.', ['@name' => t('Language name')]));
+    $empty_language = new Language();
+    $this->assertFieldChecked('edit-direction-' . $empty_language->getDirection(), 'Consistent usage of language direction.');
+    $this->assertUrl(\Drupal::url('language.add', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
+
+    // Test validation of invalid values.
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => 'white space',
+      'label' => '<strong>evil markup</strong>',
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+
+    $this->assertRaw(t('%field must be a valid language tag as <a href=":url">defined by the W3C</a>.', [
+      '%field' => t('Language code'),
+      ':url' => 'http://www.w3.org/International/articles/language-tags/',
+    ]));
+
+    $this->assertRaw(t('%field cannot contain any markup.', ['%field' => t('Language name')]));
+    $this->assertUrl(\Drupal::url('language.add', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
+
+    // Test adding a custom language with a numeric region code.
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => 'es-419',
+      'label' => 'Latin American Spanish',
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+    $this->assertRaw(t(
+      'The language %language has been created and can now be used.',
+      ['%language' => $edit['label']]
+    ));
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
+
+    // Test validation of existing language values.
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => 'de',
+      'label' => 'German',
+      'direction' => LanguageInterface::DIRECTION_LTR,
+    ];
+
+    // Add the language the first time.
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+    $this->assertRaw(t(
+      'The language %language has been created and can now be used.',
+      ['%language' => $edit['label']]
+    ));
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
+
+    // Add the language a second time and confirm that this is not allowed.
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+    $this->assertRaw(t(
+      'The language %language (%langcode) already exists.',
+      ['%language' => $edit['label'], '%langcode' => $edit['langcode']]
+    ));
+    $this->assertUrl(\Drupal::url('language.add', [], ['absolute' => TRUE]), [], 'Correct page redirection.');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests enabling Language if a module exists that calls
+ * LanguageManager::getLanguages() during installation.
+ *
+ * @group language
+ */
+class LanguageListModuleInstallTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language_test'];
+
+  /**
+   * Tests enabling Language.
+   */
+  public function testModuleInstallLanguageList() {
+    // Since LanguageManager::getLanguages() uses static caches we need to do
+    // this by enabling the module using the UI.
+    $admin_user = $this->drupalCreateUser(['access administration pages', 'administer modules']);
+    $this->drupalLogin($admin_user);
+    $edit = [];
+    $edit['modules[language][enable]'] = 'language';
+    $this->drupalPostForm('admin/modules', $edit, t('Install'));
+
+    $this->assertEqual(\Drupal::state()->get('language_test.language_count_preinstall', 0), 1, 'Using LanguageManager::getLanguages() returns 1 language during Language installation.');
+
+    // Get updated module list by rebuilding container.
+    $this->rebuildContainer();
+    $this->assertTrue(\Drupal::moduleHandler()->moduleExists('language'), 'Language module is enabled');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageListTest.php

@@ -0,0 +1,220 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Core\Language\Language;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Adds a new language and tests changing its status and the default language.
+ *
+ * @group language
+ */
+class LanguageListTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language'];
+
+  /**
+   * Functional tests for adding, editing and deleting languages.
+   */
+  public function testLanguageList() {
+
+    // User to add and remove language.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+    $this->drupalLogin($admin_user);
+
+    // Get the weight of the last language.
+    $languages = \Drupal::service('language_manager')->getLanguages();
+    $last_language_weight = end($languages)->getWeight();
+
+    // Add predefined language.
+    $edit = [
+      'predefined_langcode' => 'fr',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+    $this->assertText('French', 'Language added successfully.');
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]));
+
+    // Get the weight of the last language and check that the weight is one unit
+    // heavier than the last configurable language.
+    $this->rebuildContainer();
+    $languages = \Drupal::service('language_manager')->getLanguages();
+    $last_language = end($languages);
+    $this->assertEqual($last_language->getWeight(), $last_language_weight + 1);
+    $this->assertEqual($last_language->getId(), $edit['predefined_langcode']);
+
+    // Add custom language.
+    $langcode = 'xx';
+    $name = $this->randomMachineName(16);
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => $langcode,
+      'label' => $name,
+      'direction' => Language::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]));
+    $this->assertRaw('"edit-languages-' . $langcode . '-weight"', 'Language code found.');
+    $this->assertText(t($name), 'Test language added.');
+
+    $language = \Drupal::service('language_manager')->getLanguage($langcode);
+    $english = \Drupal::service('language_manager')->getLanguage('en');
+
+    // Check if we can change the default language.
+    $path = 'admin/config/regional/language';
+    $this->drupalGet($path);
+    $this->assertFieldChecked('edit-site-default-language-en', 'English is the default language.');
+    // Change the default language.
+    $edit = [
+      'site_default_language' => $langcode,
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
+    $this->rebuildContainer();
+    $this->assertNoFieldChecked('edit-site-default-language-en', 'Default language updated.');
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $language]));
+
+    // Ensure we can't delete the default language.
+    $this->drupalGet('admin/config/regional/language/delete/' . $langcode);
+    $this->assertResponse(403, 'Failed to delete the default language.');
+
+    // Ensure 'Edit' link works.
+    $this->drupalGet('admin/config/regional/language');
+    $this->clickLink(t('Edit'));
+    $this->assertTitle(t('Edit language | Drupal'), 'Page title is "Edit language".');
+    // Edit a language.
+    $name = $this->randomMachineName(16);
+    $edit = [
+      'label' => $name,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/edit/' . $langcode, $edit, t('Save language'));
+    $this->assertRaw($name, 'The language has been updated.');
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $language]));
+
+    // Change back the default language.
+    $edit = [
+      'site_default_language' => 'en',
+    ];
+    $this->drupalPostForm($path, $edit, t('Save configuration'));
+    $this->rebuildContainer();
+    // Ensure 'delete' link works.
+    $this->drupalGet('admin/config/regional/language');
+    $this->clickLink(t('Delete'));
+    $this->assertText(t('Are you sure you want to delete the language'), '"Delete" link is correct.');
+    // Delete a language.
+    $this->drupalGet('admin/config/regional/language/delete/' . $langcode);
+    // First test the 'cancel' link.
+    $this->clickLink(t('Cancel'));
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $english]));
+    $this->assertRaw($name, 'The language was not deleted.');
+    // Delete the language for real. This a confirm form, we do not need any
+    // fields changed.
+    $this->drupalPostForm('admin/config/regional/language/delete/' . $langcode, [], t('Delete'));
+    // We need raw here because %language and %langcode will add HTML.
+    $t_args = ['%language' => $name, '%langcode' => $langcode];
+    $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The test language has been removed.');
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $english]));
+    // Verify that language is no longer found.
+    $this->drupalGet('admin/config/regional/language/delete/' . $langcode);
+    $this->assertResponse(404, 'Language no longer found.');
+
+    // Delete French.
+    $this->drupalPostForm('admin/config/regional/language/delete/fr', [], t('Delete'));
+    // Make sure the "language_count" state has been updated correctly.
+    $this->rebuildContainer();
+    // We need raw here because %language and %langcode will add HTML.
+    $t_args = ['%language' => 'French', '%langcode' => 'fr'];
+    $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The French language has been removed.');
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]));
+    // Verify that language is no longer found.
+    $this->drupalGet('admin/config/regional/language/delete/fr');
+    $this->assertResponse(404, 'Language no longer found.');
+    // Make sure the "language_count" state has not changed.
+
+    // Ensure we can delete the English language. Right now English is the only
+    // language so we must add a new language and make it the default before
+    // deleting English.
+    $langcode = 'xx';
+    $name = $this->randomMachineName(16);
+    $edit = [
+      'predefined_langcode' => 'custom',
+      'langcode' => $langcode,
+      'label' => $name,
+      'direction' => Language::DIRECTION_LTR,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]));
+    $this->assertText($name, 'Name found.');
+
+    // Check if we can change the default language.
+    $path = 'admin/config/regional/language';
+    $this->drupalGet($path);
+    $this->assertFieldChecked('edit-site-default-language-en', 'English is the default language.');
+    // Change the default language.
+    $edit = [
+      'site_default_language' => $langcode,
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
+    $this->rebuildContainer();
+    $this->assertNoFieldChecked('edit-site-default-language-en', 'Default language updated.');
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $language]));
+
+    $this->drupalPostForm('admin/config/regional/language/delete/en', [], t('Delete'));
+    // We need raw here because %language and %langcode will add HTML.
+    $t_args = ['%language' => 'English', '%langcode' => 'en'];
+    $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The English language has been removed.');
+    $this->rebuildContainer();
+
+    // Ensure we can't delete a locked language.
+    $this->drupalGet('admin/config/regional/language/delete/und');
+    $this->assertResponse(403, 'Can not delete locked language');
+
+    // Ensure that NL cannot be set default when it's not available.
+    // First create the NL language.
+    $edit = [
+      'predefined_langcode' => 'nl',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, 'Add language');
+
+    // Load the form which has now the additional NL language option.
+    $this->drupalGet('admin/config/regional/language');
+
+    // Delete the NL language in the background.
+    $language_storage = $this->container->get('entity_type.manager')->getStorage('configurable_language');
+    $language_storage->load('nl')->delete();
+
+    $this->drupalPostForm(NULL, ['site_default_language' => 'nl'], 'Save configuration');
+    $this->assertText(t('Selected default language no longer exists.'));
+    $this->assertNoFieldChecked('edit-site-default-language-xx', 'The previous default language got deselected.');
+  }
+
+  /**
+   * Functional tests for the language states (locked or configurable).
+   */
+  public function testLanguageStates() {
+    // Add some languages, and also lock some of them.
+    ConfigurableLanguage::create(['label' => $this->randomMachineName(), 'id' => 'l1'])->save();
+    ConfigurableLanguage::create(['label' => $this->randomMachineName(), 'id' => 'l2', 'locked' => TRUE])->save();
+    ConfigurableLanguage::create(['label' => $this->randomMachineName(), 'id' => 'l3'])->save();
+    ConfigurableLanguage::create(['label' => $this->randomMachineName(), 'id' => 'l4', 'locked' => TRUE])->save();
+    $expected_locked_languages = ['l4' => 'l4', 'l2' => 'l2', 'und' => 'und', 'zxx' => 'zxx'];
+    $expected_all_languages = ['l4' => 'l4', 'l3' => 'l3', 'l2' => 'l2', 'l1' => 'l1', 'en' => 'en', 'und' => 'und', 'zxx' => 'zxx'];
+    $expected_conf_languages = ['l3' => 'l3', 'l1' => 'l1', 'en' => 'en'];
+
+    $locked_languages = $this->container->get('language_manager')->getLanguages(LanguageInterface::STATE_LOCKED);
+    $this->assertEqual(array_diff_key($expected_locked_languages, $locked_languages), [], 'Locked languages loaded correctly.');
+
+    $all_languages = $this->container->get('language_manager')->getLanguages(LanguageInterface::STATE_ALL);
+    $this->assertEqual(array_diff_key($expected_all_languages, $all_languages), [], 'All languages loaded correctly.');
+
+    $conf_languages = $this->container->get('language_manager')->getLanguages();
+    $this->assertEqual(array_diff_key($expected_conf_languages, $conf_languages), [], 'Configurable languages loaded correctly.');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageLocaleListTest.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Adds a new language with translations and tests language list order.
+ *
+ * @group language
+ */
+class LanguageLocaleListTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'locale'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    // Add a default locale storage for all these tests.
+    $this->storage = $this->container->get('locale.storage');
+  }
+
+  /**
+   * Tests adding, editing, and deleting languages.
+   */
+  public function testLanguageLocaleList() {
+    // User to add and remove language.
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+    $this->drupalLogin($admin_user);
+
+    // Add predefined language.
+    $edit = [
+      'predefined_langcode' => 'fr',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+    $this->assertText('The language French has been created and can now be used');
+    $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE]));
+    $this->rebuildContainer();
+
+    // Translate Spanish language to French (Espagnol).
+    $source = $this->storage->createString([
+      'source' => 'Spanish',
+      'context' => '',
+    ])->save();
+    $this->storage->createTranslation([
+      'lid' => $source->lid,
+      'language' => 'fr',
+      'translation' => 'Espagnol',
+    ])->save();
+
+    // Get language list displayed in select list.
+    $this->drupalGet('fr/admin/config/regional/language/add');
+    $option_elements = $this->xpath('//select[@id="edit-predefined-langcode/option"]');
+    $options = [];
+    foreach ($option_elements as $option_element) {
+      $options[] = $option_element->getText();
+    }
+    // Remove the 'Custom language...' option form the end.
+    array_pop($options);
+    // Order language list.
+    $options_ordered = $options;
+    natcasesort($options_ordered);
+
+    // Check the language list displayed is ordered.
+    $this->assertTrue($options === $options_ordered, 'Language list is ordered.');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageNegotiationContentEntityTest.php

@@ -0,0 +1,177 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationContentEntity;
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
+use Drupal\Tests\BrowserTestBase;
+use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Tests language negotiation with the language negotiator content entity.
+ *
+ * @group language
+ */
+class LanguageNegotiationContentEntityTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'language_test', 'entity_test', 'system'];
+
+  /**
+   * The entity being used for testing.
+   *
+   * @var \Drupal\Core\Entity\ContentEntityInterface
+   */
+  protected $entity;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    ConfigurableLanguage::create(['id' => 'es'])->save();
+    ConfigurableLanguage::create(['id' => 'fr'])->save();
+
+    // In order to reflect the changes for a multilingual site in the container
+    // we have to rebuild it.
+    $this->rebuildContainer();
+
+    $this->createTranslatableEntity();
+
+    $user = $this->drupalCreateUser(['view test entity']);
+    $this->drupalLogin($user);
+  }
+
+  /**
+   * Tests default with content language remaining same as interface language.
+   */
+  public function testDefaultConfiguration() {
+    $translation = $this->entity;
+    $this->drupalGet($translation->urlInfo());
+    $last = $this->container->get('state')->get('language_test.language_negotiation_last');
+    $last_content_language = $last[LanguageInterface::TYPE_CONTENT];
+    $last_interface_language = $last[LanguageInterface::TYPE_INTERFACE];
+    $this->assertTrue(($last_interface_language == $last_content_language) && ($last_content_language == $translation->language()->getId()), new FormattableMarkup('Interface language %interface_language and Content language %content_language are the same as the translation language %translation_language of the entity.', ['%interface_language' => $last_interface_language, '%content_language' => $last_content_language, '%translation_language' => $translation->language()->getId()]));
+
+    $translation = $this->entity->getTranslation('es');
+    $this->drupalGet($translation->urlInfo());
+    $last = $this->container->get('state')->get('language_test.language_negotiation_last');
+    $last_content_language = $last[LanguageInterface::TYPE_CONTENT];
+    $last_interface_language = $last[LanguageInterface::TYPE_INTERFACE];
+    $this->assertTrue(($last_interface_language == $last_content_language) && ($last_content_language == $translation->language()->getId()), new FormattableMarkup('Interface language %interface_language and Content language %content_language are the same as the translation language %translation_language of the entity.', ['%interface_language' => $last_interface_language, '%content_language' => $last_content_language, '%translation_language' => $translation->language()->getId()]));
+
+    $translation = $this->entity->getTranslation('fr');
+    $this->drupalGet($translation->urlInfo());
+    $last = $this->container->get('state')->get('language_test.language_negotiation_last');
+    $last_content_language = $last[LanguageInterface::TYPE_CONTENT];
+    $last_interface_language = $last[LanguageInterface::TYPE_INTERFACE];
+    $this->assertTrue(($last_interface_language == $last_content_language) && ($last_content_language == $translation->language()->getId()), new FormattableMarkup('Interface language %interface_language and Content language %content_language are the same as the translation language %translation_language of the entity.', ['%interface_language' => $last_interface_language, '%content_language' => $last_content_language, '%translation_language' => $translation->language()->getId()]));
+  }
+
+  /**
+   * Tests enabling the language negotiator language_content_entity.
+   */
+  public function testEnabledLanguageContentNegotiator() {
+    // Define the method language-url with a higher priority than
+    // language-content-entity. This configuration should match the default one,
+    // where the language-content-entity is turned off.
+    $config = $this->config('language.types');
+    $config->set('configurable', [LanguageInterface::TYPE_INTERFACE, LanguageInterface::TYPE_CONTENT]);
+    $config->set('negotiation.language_content.enabled', [
+      LanguageNegotiationUrl::METHOD_ID => 0,
+      LanguageNegotiationContentEntity::METHOD_ID => 1,
+    ]);
+    $config->save();
+
+    // In order to reflect the changes for a multilingual site in the container
+    // we have to rebuild it.
+    $this->rebuildContainer();
+
+    // The tests for the default configuration should still pass.
+    $this->testDefaultConfiguration();
+
+    // Define the method language-content-entity with a higher priority than
+    // language-url.
+    $config->set('negotiation.language_content.enabled', [
+      LanguageNegotiationContentEntity::METHOD_ID => 0,
+      LanguageNegotiationUrl::METHOD_ID => 1,
+    ]);
+    $config->save();
+
+    // In order to reflect the changes for a multilingual site in the container
+    // we have to rebuild it.
+    $this->rebuildContainer();
+
+    // The method language-content-entity should run before language-url and
+    // append query parameter for the content language and prevent language-url
+    // from overwriting the URL.
+    $default_site_langcode = $this->config('system.site')->get('default_langcode');
+
+    // Now switching to an entity route, so that the URL links are generated
+    // while being on an entity route.
+    $this->setCurrentRequestForRoute('/entity_test/{entity_test}', 'entity.entity_test.canonical');
+
+    $translation = $this->entity;
+    $this->drupalGet($translation->urlInfo());
+    $last = $this->container->get('state')->get('language_test.language_negotiation_last');
+    $last_content_language = $last[LanguageInterface::TYPE_CONTENT];
+    $last_interface_language = $last[LanguageInterface::TYPE_INTERFACE];
+    $this->assertTrue(($last_interface_language == $default_site_langcode) && ($last_interface_language == $last_content_language) && ($last_content_language == $translation->language()->getId()), 'Interface language and Content language are the same as the default translation language of the entity.');
+    $this->assertTrue($last_interface_language == $default_site_langcode, 'Interface language did not change from the default site language.');
+    $this->assertTrue($last_content_language == $translation->language()->getId(), 'Content language matches the current entity translation language.');
+
+    $translation = $this->entity->getTranslation('es');
+    $this->drupalGet($translation->urlInfo());
+    $last = $this->container->get('state')->get('language_test.language_negotiation_last');
+    $last_content_language = $last[LanguageInterface::TYPE_CONTENT];
+    $last_interface_language = $last[LanguageInterface::TYPE_INTERFACE];
+    $this->assertTrue($last_interface_language == $default_site_langcode, 'Interface language did not change from the default site language.');
+    $this->assertTrue($last_content_language == $translation->language()->getId(), 'Content language matches the current entity translation language.');
+
+    $translation = $this->entity->getTranslation('fr');
+    $this->drupalGet($translation->urlInfo());
+    $last = $this->container->get('state')->get('language_test.language_negotiation_last');
+    $last_content_language = $last[LanguageInterface::TYPE_CONTENT];
+    $last_interface_language = $last[LanguageInterface::TYPE_INTERFACE];
+    $this->assertTrue($last_interface_language == $default_site_langcode, 'Interface language did not change from the default site language.');
+    $this->assertTrue($last_content_language == $translation->language()->getId(), 'Content language matches the current entity translation language.');
+  }
+
+  /**
+   * Creates a translated entity.
+   */
+  protected function createTranslatableEntity() {
+    $this->entity = EntityTest::create();
+    $this->entity->addTranslation('es', ['name' => 'name spanish']);
+    $this->entity->addTranslation('fr', ['name' => 'name french']);
+    $this->entity->save();
+  }
+
+  /**
+   * Sets the current request to a specific path with the corresponding route.
+   *
+   * @param string $path
+   *   The path for which the current request should be created.
+   * @param string $route_name
+   *   The route name for which the route object for the request should be
+   *   created.
+   */
+  protected function setCurrentRequestForRoute($path, $route_name) {
+    $request = Request::create($path);
+    $request->attributes->set(RouteObjectInterface::ROUTE_NAME, $route_name);
+    $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route($path));
+    $this->container->get('request_stack')->push($request);
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageNegotiationInfoTest.php

@@ -0,0 +1,205 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUI;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests alterations to language types/negotiation info.
+ *
+ * @group language
+ */
+class LanguageNegotiationInfoTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'content_translation'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $admin_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'view the administration theme', 'administer modules']);
+    $this->drupalLogin($admin_user);
+    $this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'it'], t('Add language'));
+  }
+
+  /**
+   * Returns the configurable language manager.
+   *
+   * @return \Drupal\language\ConfigurableLanguageManager
+   */
+  protected function languageManager() {
+    return $this->container->get('language_manager');
+  }
+
+  /**
+   * Sets state flags for language_test module.
+   *
+   * Ensures to correctly update data both in the child site and the test runner
+   * environment.
+   *
+   * @param array $values
+   *   The key/value pairs to set in state.
+   */
+  protected function stateSet(array $values) {
+    // Set the new state values.
+    $this->container->get('state')->setMultiple($values);
+    // Refresh in-memory static state/config caches and static variables.
+    $this->refreshVariables();
+    // Refresh/rewrite language negotiation configuration, in order to pick up
+    // the manipulations performed by language_test module's info alter hooks.
+    $this->container->get('language_negotiator')->purgeConfiguration();
+  }
+
+  /**
+   * Tests alterations to language types/negotiation info.
+   */
+  public function testInfoAlterations() {
+    $this->stateSet([
+      // Enable language_test type info.
+      'language_test.language_types' => TRUE,
+      // Enable language_test negotiation info (not altered yet).
+      'language_test.language_negotiation_info' => TRUE,
+      // Alter LanguageInterface::TYPE_CONTENT to be configurable.
+      'language_test.content_language_type' => TRUE,
+    ]);
+    $this->container->get('module_installer')->install(['language_test']);
+    $this->resetAll();
+
+    // Check that fixed language types are properly configured without the need
+    // of saving the language negotiation settings.
+    $this->checkFixedLanguageTypes();
+
+    $type = LanguageInterface::TYPE_CONTENT;
+    $language_types = $this->languageManager()->getLanguageTypes();
+    $this->assertTrue(in_array($type, $language_types), 'Content language type is configurable.');
+
+    // Enable some core and custom language negotiation methods. The test
+    // language type is supposed to be configurable.
+    $test_type = 'test_language_type';
+    $interface_method_id = LanguageNegotiationUI::METHOD_ID;
+    $test_method_id = 'test_language_negotiation_method';
+    $form_field = $type . '[enabled][' . $interface_method_id . ']';
+    $edit = [
+      $form_field => TRUE,
+      $type . '[enabled][' . $test_method_id . ']' => TRUE,
+      $test_type . '[enabled][' . $test_method_id . ']' => TRUE,
+      $test_type . '[configurable]' => TRUE,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+
+    // Alter language negotiation info to remove interface language negotiation
+    // method.
+    $this->stateSet([
+      'language_test.language_negotiation_info_alter' => TRUE,
+    ]);
+
+    $negotiation = $this->config('language.types')->get('negotiation.' . $type . '.enabled');
+    $this->assertFalse(isset($negotiation[$interface_method_id]), 'Interface language negotiation method removed from the stored settings.');
+
+    $this->drupalGet('admin/config/regional/language/detection');
+    $this->assertNoFieldByName($form_field, NULL, 'Interface language negotiation method unavailable.');
+
+    // Check that type-specific language negotiation methods can be assigned
+    // only to the corresponding language types.
+    foreach ($this->languageManager()->getLanguageTypes() as $type) {
+      $form_field = $type . '[enabled][test_language_negotiation_method_ts]';
+      if ($type == $test_type) {
+        $this->assertFieldByName($form_field, NULL, format_string('Type-specific test language negotiation method available for %type.', ['%type' => $type]));
+      }
+      else {
+        $this->assertNoFieldByName($form_field, NULL, format_string('Type-specific test language negotiation method unavailable for %type.', ['%type' => $type]));
+      }
+    }
+
+    // Check language negotiation results.
+    $this->drupalGet('');
+    $last = $this->container->get('state')->get('language_test.language_negotiation_last');
+    foreach ($this->languageManager()->getDefinedLanguageTypes() as $type) {
+      $langcode = $last[$type];
+      $value = $type == LanguageInterface::TYPE_CONTENT || strpos($type, 'test') !== FALSE ? 'it' : 'en';
+      $this->assertEqual($langcode, $value, format_string('The negotiated language for %type is %language', ['%type' => $type, '%language' => $value]));
+    }
+
+    // Uninstall language_test and check that everything is set back to the
+    // original status.
+    $this->container->get('module_installer')->uninstall(['language_test']);
+    $this->rebuildContainer();
+
+    // Check that only the core language types are available.
+    foreach ($this->languageManager()->getDefinedLanguageTypes() as $type) {
+      $this->assertTrue(strpos($type, 'test') === FALSE, format_string('The %type language is still available', ['%type' => $type]));
+    }
+
+    // Check that fixed language types are properly configured, even those
+    // previously set to configurable.
+    $this->checkFixedLanguageTypes();
+
+    // Check that unavailable language negotiation methods are not present in
+    // the negotiation settings.
+    $negotiation = $this->config('language.types')->get('negotiation.' . $type . '.enabled');
+    $this->assertFalse(isset($negotiation[$test_method_id]), 'The disabled test language negotiation method is not part of the content language negotiation settings.');
+
+    // Check that configuration page presents the correct options and settings.
+    $this->assertNoRaw(t('Test language detection'), 'No test language type configuration available.');
+    $this->assertNoRaw(t('This is a test language negotiation method'), 'No test language negotiation method available.');
+  }
+
+  /**
+   * Check that language negotiation for fixed types matches the stored one.
+   */
+  protected function checkFixedLanguageTypes() {
+    $configurable = $this->languageManager()->getLanguageTypes();
+    foreach ($this->languageManager()->getDefinedLanguageTypesInfo() as $type => $info) {
+      if (!in_array($type, $configurable) && isset($info['fixed'])) {
+        $negotiation = $this->config('language.types')->get('negotiation.' . $type . '.enabled');
+        $equal = array_keys($negotiation) === array_values($info['fixed']);
+        $this->assertTrue($equal, format_string('language negotiation for %type is properly set up', ['%type' => $type]));
+      }
+    }
+  }
+
+  /**
+   * Tests altering config of configurable language types.
+   */
+  public function testConfigLangTypeAlterations() {
+    // Default of config.
+    $test_type = LanguageInterface::TYPE_CONTENT;
+    $this->assertFalse($this->isLanguageTypeConfigurable($test_type), 'Language type is not configurable.');
+
+    // Editing config.
+    $edit = [$test_type . '[configurable]' => TRUE];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+    $this->assertTrue($this->isLanguageTypeConfigurable($test_type), 'Language type is now configurable.');
+
+    // After installing another module, the config should be the same.
+    $this->drupalPostForm('admin/modules', ['modules[test_module][enable]' => 1], t('Install'));
+    $this->assertTrue($this->isLanguageTypeConfigurable($test_type), 'Language type is still configurable.');
+
+    // After uninstalling the other module, the config should be the same.
+    $this->drupalPostForm('admin/modules/uninstall', ['uninstall[test_module]' => 1], t('Uninstall'));
+    $this->assertTrue($this->isLanguageTypeConfigurable($test_type), 'Language type is still configurable.');
+  }
+
+  /**
+   * Checks whether the given language type is configurable.
+   *
+   * @param string $type
+   *   The language type.
+   *
+   * @return bool
+   *   TRUE if the specified language type is configurable, FALSE otherwise.
+   */
+  protected function isLanguageTypeConfigurable($type) {
+    $configurable_types = $this->config('language.types')->get('configurable');
+    return in_array($type, $configurable_types);
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageNegotiationUrlTest.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * @coversDefaultClass \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl
+ * @group language
+ */
+class LanguageNegotiationUrlTest extends BrowserTestBase {
+
+  use StringTranslationTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'language',
+    'node',
+    'path',
+  ];
+
+  /**
+   * @var \Drupal\user\Entity\User
+   */
+  protected $user;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create an Article node type.
+    if ($this->profile != 'standard') {
+      $this->drupalCreateContentType(['type' => 'article']);
+    }
+
+    $this->user = $this->drupalCreateUser([
+      'administer languages',
+      'access administration pages',
+      'view the administration theme',
+      'administer nodes',
+      'create article content',
+      'create url aliases',
+    ]);
+    $this->drupalLogin($this->user);
+
+    $this->drupalPostForm('admin/config/regional/language/add', ['predefined_langcode' => 'de'], $this->t('Add language'));
+  }
+
+  /**
+   * @covers ::processInbound
+   */
+  public function testDomain() {
+    // Check if paths that contain language prefixes can be reached when
+    // language is taken from the domain.
+    $edit = [
+      'language_negotiation_url_part' => 'domain',
+      'prefix[en]' => 'eng',
+      'prefix[de]' => 'de',
+      'domain[en]' => $_SERVER['HTTP_HOST'],
+      'domain[de]' => "de.$_SERVER[HTTP_HOST]",
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, $this->t('Save configuration'));
+
+    $nodeValues = [
+      'title[0][value]' => 'Test',
+      'path[0][alias]' => '/eng/test',
+    ];
+    $this->drupalPostForm('node/add/article', $nodeValues, $this->t('Save'));
+    $this->assertSession()->statusCodeEquals(200);
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Confirm that paths are not changed on monolingual non-English sites.
+ *
+ * @group language
+ */
+class LanguagePathMonolingualTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['block', 'language', 'path'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create and log in user.
+    $web_user = $this->drupalCreateUser(['administer languages', 'access administration pages', 'administer site configuration']);
+    $this->drupalLogin($web_user);
+
+    // Enable French language.
+    $edit = [];
+    $edit['predefined_langcode'] = 'fr';
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    // Make French the default language.
+    $edit = [
+      'site_default_language' => 'fr',
+    ];
+    $this->drupalPostForm('admin/config/regional/language', $edit, t('Save configuration'));
+
+    // Delete English.
+    $this->drupalPostForm('admin/config/regional/language/delete/en', [], t('Delete'));
+
+    // Changing the default language causes a container rebuild. Therefore need
+    // to rebuild the container in the test environment.
+    $this->rebuildContainer();
+
+    // Verify that French is the only language.
+    $this->container->get('language_manager')->reset();
+    $this->assertFalse(\Drupal::languageManager()->isMultilingual(), 'Site is mono-lingual');
+    $this->assertEqual(\Drupal::languageManager()->getDefaultLanguage()->getId(), 'fr', 'French is the default language');
+
+    // Set language detection to URL.
+    $edit = ['language_interface[enabled][language-url]' => TRUE];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+    $this->drupalPlaceBlock('local_actions_block');
+  }
+
+  /**
+   * Verifies that links do not have language prefixes in them.
+   */
+  public function testPageLinks() {
+    // Navigate to 'admin/config' path.
+    $this->drupalGet('admin/config');
+
+    // Verify that links in this page do not have a 'fr/' prefix.
+    $this->assertNoLinkByHref('/fr/', 'Links do not contain language prefix');
+
+    // Verify that links in this page can be followed and work.
+    $this->clickLink(t('Languages'));
+    $this->assertResponse(200, 'Clicked link results in a valid page');
+    $this->assertText(t('Add language'), 'Page contains the add language text');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageSelectorTranslatableTest.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests the content translation settings language selector options.
+ *
+ * @group language
+ */
+class LanguageSelectorTranslatableTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = [
+    'language',
+    'content_translation',
+    'node',
+    'comment',
+    'field_ui',
+    'entity_test',
+    'locale',
+  ];
+
+  /**
+   * The user with administrator privileges.
+   *
+   * @var \Drupal\user\Entity\User
+   */
+  public $administrator;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create user and set permissions.
+    $this->administrator = $this->drupalCreateUser($this->getAdministratorPermissions(), 'administrator');
+    $this->drupalLogin($this->administrator);
+  }
+
+  /**
+   * Returns an array of permissions needed for the translator.
+   */
+  protected function getAdministratorPermissions() {
+    return array_filter(
+      ['translate interface',
+        'administer content translation',
+        'create content translations',
+        'update content translations',
+        'delete content translations',
+        'administer languages',
+      ]
+    );
+  }
+
+  /**
+   * Tests content translation language selectors are correctly translated.
+   */
+  public function testLanguageStringSelector() {
+    // Add another language.
+    $edit = ['predefined_langcode' => 'es'];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    // Translate the string English in Spanish (Inglés). Override config entity.
+    $name_translation = 'Inglés';
+    \Drupal::languageManager()
+      ->getLanguageConfigOverride('es', 'language.entity.en')
+      ->set('label', $name_translation)
+      ->save();
+
+    // Check content translation overview selector.
+    $path = 'es/admin/config/regional/content-language';
+    $this->drupalGet($path);
+
+    // Get en language from selector.
+    $elements = $this->xpath('//select[@id=:id]//option[@value=:option]', [':id' => 'edit-settings-user-user-settings-language-langcode', ':option' => 'en']);
+
+    // Check that the language text is translated.
+    $this->assertEqual($elements[0]->getText(), $name_translation, 'Checking the option string English is translated to Spanish.');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php

@@ -0,0 +1,461 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
+use Drupal\menu_link_content\Entity\MenuLinkContent;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Functional tests for the language switching feature.
+ *
+ * @group language
+ */
+class LanguageSwitchingTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['locale', 'locale_test', 'language', 'block', 'language_test', 'menu_ui'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create and log in user.
+    $admin_user = $this->drupalCreateUser(['administer blocks', 'administer languages', 'access administration pages']);
+    $this->drupalLogin($admin_user);
+  }
+
+  /**
+   * Functional tests for the language switcher block.
+   */
+  public function testLanguageBlock() {
+    // Add language.
+    $edit = [
+      'predefined_langcode' => 'fr',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    // Set the native language name.
+    $this->saveNativeLanguageName('fr', 'français');
+
+    // Enable URL language detection and selection.
+    $edit = ['language_interface[enabled][language-url]' => '1'];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+
+    // Enable the language switching block.
+    $block = $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_INTERFACE, [
+      'id' => 'test_language_block',
+      // Ensure a 2-byte UTF-8 sequence is in the tested output.
+      'label' => $this->randomMachineName(8) . '×',
+    ]);
+
+    $this->doTestLanguageBlockAuthenticated($block->label());
+    $this->doTestLanguageBlockAnonymous($block->label());
+  }
+
+  /**
+   * For authenticated users, the "active" class is set by JavaScript.
+   *
+   * @param string $block_label
+   *   The label of the language switching block.
+   *
+   * @see testLanguageBlock()
+   */
+  protected function doTestLanguageBlockAuthenticated($block_label) {
+    // Assert that the language switching block is displayed on the frontpage.
+    $this->drupalGet('');
+    $this->assertText($block_label, 'Language switcher block found.');
+
+    // Assert that each list item and anchor element has the appropriate data-
+    // attributes.
+    $language_switchers = $this->xpath('//div[@id=:id]/ul/li', [':id' => 'block-test-language-block']);
+    $list_items = [];
+    $anchors = [];
+    $labels = [];
+    foreach ($language_switchers as $list_item) {
+      $classes = explode(" ", $list_item->getAttribute('class'));
+      list($langcode) = array_intersect($classes, ['en', 'fr']);
+      $list_items[] = [
+        'langcode_class' => $langcode,
+        'data-drupal-link-system-path' => $list_item->getAttribute('data-drupal-link-system-path'),
+      ];
+
+      $link = $list_item->find('xpath', 'a');
+      $anchors[] = [
+         'hreflang' => $link->getAttribute('hreflang'),
+         'data-drupal-link-system-path' => $link->getAttribute('data-drupal-link-system-path'),
+      ];
+      $labels[] = $link->getText();
+    }
+    $expected_list_items = [
+      0 => ['langcode_class' => 'en', 'data-drupal-link-system-path' => 'user/2'],
+      1 => ['langcode_class' => 'fr', 'data-drupal-link-system-path' => 'user/2'],
+    ];
+    $this->assertIdentical($list_items, $expected_list_items, 'The list items have the correct attributes that will allow the drupal.active-link library to mark them as active.');
+    $expected_anchors = [
+      0 => ['hreflang' => 'en', 'data-drupal-link-system-path' => 'user/2'],
+      1 => ['hreflang' => 'fr', 'data-drupal-link-system-path' => 'user/2'],
+    ];
+    $this->assertIdentical($anchors, $expected_anchors, 'The anchors have the correct attributes that will allow the drupal.active-link library to mark them as active.');
+    $settings = $this->getDrupalSettings();
+    $this->assertIdentical($settings['path']['currentPath'], 'user/2', 'drupalSettings.path.currentPath is set correctly to allow drupal.active-link to mark the correct links as active.');
+    $this->assertIdentical($settings['path']['isFront'], FALSE, 'drupalSettings.path.isFront is set correctly to allow drupal.active-link to mark the correct links as active.');
+    $this->assertIdentical($settings['path']['currentLanguage'], 'en', 'drupalSettings.path.currentLanguage is set correctly to allow drupal.active-link to mark the correct links as active.');
+    $this->assertIdentical($labels, ['English', 'français'], 'The language links labels are in their own language on the language switcher block.');
+  }
+
+  /**
+   * For anonymous users, the "active" class is set by PHP.
+   *
+   * @param string $block_label
+   *   The label of the language switching block.
+   *
+   * @see testLanguageBlock()
+   */
+  protected function doTestLanguageBlockAnonymous($block_label) {
+    $this->drupalLogout();
+
+    // Assert that the language switching block is displayed on the frontpage
+    // and ensure that the active class is added when query params are present.
+    $this->drupalGet('', ['query' => ['foo' => 'bar']]);
+    $this->assertText($block_label, 'Language switcher block found.');
+
+    // Assert that only the current language is marked as active.
+    $language_switchers = $this->xpath('//div[@id=:id]/ul/li', [':id' => 'block-test-language-block']);
+    $links = [
+      'active' => [],
+      'inactive' => [],
+    ];
+    $anchors = [
+      'active' => [],
+      'inactive' => [],
+    ];
+    $labels = [];
+    foreach ($language_switchers as $list_item) {
+      $classes = explode(" ", $list_item->getAttribute('class'));
+      list($langcode) = array_intersect($classes, ['en', 'fr']);
+      if (in_array('is-active', $classes)) {
+        $links['active'][] = $langcode;
+      }
+      else {
+        $links['inactive'][] = $langcode;
+      }
+
+      $link = $list_item->find('xpath', 'a');
+      $anchor_classes = explode(" ", $link->getAttribute('class'));
+      if (in_array('is-active', $anchor_classes)) {
+        $anchors['active'][] = $langcode;
+      }
+      else {
+        $anchors['inactive'][] = $langcode;
+      }
+      $labels[] = $link->getText();
+    }
+    $this->assertIdentical($links, ['active' => ['en'], 'inactive' => ['fr']], 'Only the current language list item is marked as active on the language switcher block.');
+    $this->assertIdentical($anchors, ['active' => ['en'], 'inactive' => ['fr']], 'Only the current language anchor is marked as active on the language switcher block.');
+    $this->assertIdentical($labels, ['English', 'français'], 'The language links labels are in their own language on the language switcher block.');
+  }
+
+  /**
+   * Test language switcher links for domain based negotiation.
+   */
+  public function testLanguageBlockWithDomain() {
+    // Add the Italian language.
+    ConfigurableLanguage::createFromLangcode('it')->save();
+
+    // Rebuild the container so that the new language is picked up by services
+    // that hold a list of languages.
+    $this->rebuildContainer();
+
+    $languages = $this->container->get('language_manager')->getLanguages();
+
+    // Enable browser and URL language detection.
+    $edit = [
+      'language_interface[enabled][language-url]' => TRUE,
+      'language_interface[weight][language-url]' => -10,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+
+    // Do not allow blank domain.
+    $edit = [
+      'language_negotiation_url_part' => LanguageNegotiationUrl::CONFIG_DOMAIN,
+      'domain[en]' => '',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
+    $this->assertText(t('The domain may not be left blank for English'), 'The form does not allow blank domains.');
+
+    // Change the domain for the Italian language.
+    $edit = [
+      'language_negotiation_url_part' => LanguageNegotiationUrl::CONFIG_DOMAIN,
+      'domain[en]' => \Drupal::request()->getHost(),
+      'domain[it]' => 'it.example.com',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
+    $this->assertText(t('The configuration options have been saved'), 'Domain configuration is saved.');
+
+    // Enable the language switcher block.
+    $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_INTERFACE, ['id' => 'test_language_block']);
+
+    $this->drupalGet('');
+
+    /** @var \Drupal\Core\Routing\UrlGenerator $generator */
+    $generator = $this->container->get('url_generator');
+
+    // Verify the English URL is correct
+    list($english_link) = $this->xpath('//div[@id=:id]/ul/li/a[@hreflang=:hreflang]', [
+      ':id' => 'block-test-language-block',
+      ':hreflang' => 'en',
+    ]);
+    $english_url = $generator->generateFromRoute('entity.user.canonical', ['user' => 2], ['language' => $languages['en']]);
+    $this->assertEqual($english_url, $english_link->getAttribute('href'));
+
+    // Verify the Italian URL is correct
+    list($italian_link) = $this->xpath('//div[@id=:id]/ul/li/a[@hreflang=:hreflang]', [
+      ':id' => 'block-test-language-block',
+      ':hreflang' => 'it',
+    ]);
+    $italian_url = $generator->generateFromRoute('entity.user.canonical', ['user' => 2], ['language' => $languages['it']]);
+    $this->assertEqual($italian_url, $italian_link->getAttribute('href'));
+  }
+
+  /**
+   * Test active class on links when switching languages.
+   */
+  public function testLanguageLinkActiveClass() {
+    // Add language.
+    $edit = [
+      'predefined_langcode' => 'fr',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    // Enable URL language detection and selection.
+    $edit = ['language_interface[enabled][language-url]' => '1'];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+
+    $this->doTestLanguageLinkActiveClassAuthenticated();
+    $this->doTestLanguageLinkActiveClassAnonymous();
+  }
+
+  /**
+   * Check the path-admin class, as same as on default language.
+   */
+  public function testLanguageBodyClass() {
+    $searched_class = 'path-admin';
+
+    // Add language.
+    $edit = [
+      'predefined_langcode' => 'fr',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    // Enable URL language detection and selection.
+    $edit = ['language_interface[enabled][language-url]' => '1'];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+
+    // Check if the default (English) admin/config page has the right class.
+    $this->drupalGet('admin/config');
+    $class = $this->xpath('//body[contains(@class, :class)]', [':class' => $searched_class]);
+    $this->assertTrue(isset($class[0]), t('The path-admin class appears on default language.'));
+
+    // Check if the French admin/config page has the right class.
+    $this->drupalGet('fr/admin/config');
+    $class = $this->xpath('//body[contains(@class, :class)]', [':class' => $searched_class]);
+    $this->assertTrue(isset($class[0]), t('The path-admin class same as on default language.'));
+
+    // The testing profile sets the user/login page as the frontpage. That
+    // redirects authenticated users to their profile page, so check with an
+    // anonymous user instead.
+    $this->drupalLogout();
+
+    // Check if the default (English) frontpage has the right class.
+    $this->drupalGet('<front>');
+    $class = $this->xpath('//body[contains(@class, :class)]', [':class' => 'path-frontpage']);
+    $this->assertTrue(isset($class[0]), 'path-frontpage class found on the body tag');
+
+    // Check if the French frontpage has the right class.
+    $this->drupalGet('fr');
+    $class = $this->xpath('//body[contains(@class, :class)]', [':class' => 'path-frontpage']);
+    $this->assertTrue(isset($class[0]), 'path-frontpage class found on the body tag with french as the active language');
+
+  }
+
+  /**
+   * For authenticated users, the "active" class is set by JavaScript.
+   *
+   * @see testLanguageLinkActiveClass()
+   */
+  protected function doTestLanguageLinkActiveClassAuthenticated() {
+    $function_name = '#type link';
+    $path = 'language_test/type-link-active-class';
+
+    // Test links generated by the link generator on an English page.
+    $current_language = 'English';
+    $this->drupalGet($path);
+
+    // Language code 'none' link should be active.
+    $langcode = 'none';
+    $links = $this->xpath('//a[@id = :id and @data-drupal-link-system-path = :path]', [':id' => 'no_lang_link', ':path' => $path]);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to mark it as active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
+
+    // Language code 'en' link should be active.
+    $langcode = 'en';
+    $links = $this->xpath('//a[@id = :id and @hreflang = :lang and @data-drupal-link-system-path = :path]', [':id' => 'en_link', ':lang' => 'en', ':path' => $path]);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to mark it as active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
+
+    // Language code 'fr' link should not be active.
+    $langcode = 'fr';
+    $links = $this->xpath('//a[@id = :id and @hreflang = :lang and @data-drupal-link-system-path = :path]', [':id' => 'fr_link', ':lang' => 'fr', ':path' => $path]);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to NOT mark it as active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
+
+    // Verify that drupalSettings contains the correct values.
+    $settings = $this->getDrupalSettings();
+    $this->assertIdentical($settings['path']['currentPath'], $path, 'drupalSettings.path.currentPath is set correctly to allow drupal.active-link to mark the correct links as active.');
+    $this->assertIdentical($settings['path']['isFront'], FALSE, 'drupalSettings.path.isFront is set correctly to allow drupal.active-link to mark the correct links as active.');
+    $this->assertIdentical($settings['path']['currentLanguage'], 'en', 'drupalSettings.path.currentLanguage is set correctly to allow drupal.active-link to mark the correct links as active.');
+
+    // Test links generated by the link generator on a French page.
+    $current_language = 'French';
+    $this->drupalGet('fr/language_test/type-link-active-class');
+
+    // Language code 'none' link should be active.
+    $langcode = 'none';
+    $links = $this->xpath('//a[@id = :id and @data-drupal-link-system-path = :path]', [':id' => 'no_lang_link', ':path' => $path]);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to mark it as active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
+
+    // Language code 'en' link should not be active.
+    $langcode = 'en';
+    $links = $this->xpath('//a[@id = :id and @hreflang = :lang and @data-drupal-link-system-path = :path]', [':id' => 'en_link', ':lang' => 'en', ':path' => $path]);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to NOT mark it as active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
+
+    // Language code 'fr' link should be active.
+    $langcode = 'fr';
+    $links = $this->xpath('//a[@id = :id and @hreflang = :lang and @data-drupal-link-system-path = :path]', [':id' => 'fr_link', ':lang' => 'fr', ':path' => $path]);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode has the correct attributes that will allow the drupal.active-link library to mark it as active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
+
+    // Verify that drupalSettings contains the correct values.
+    $settings = $this->getDrupalSettings();
+    $this->assertIdentical($settings['path']['currentPath'], $path, 'drupalSettings.path.currentPath is set correctly to allow drupal.active-link to mark the correct links as active.');
+    $this->assertIdentical($settings['path']['isFront'], FALSE, 'drupalSettings.path.isFront is set correctly to allow drupal.active-link to mark the correct links as active.');
+    $this->assertIdentical($settings['path']['currentLanguage'], 'fr', 'drupalSettings.path.currentLanguage is set correctly to allow drupal.active-link to mark the correct links as active.');
+  }
+
+  /**
+   * For anonymous users, the "active" class is set by PHP.
+   *
+   * @see testLanguageLinkActiveClass()
+   */
+  protected function doTestLanguageLinkActiveClassAnonymous() {
+    $function_name = '#type link';
+
+    $this->drupalLogout();
+
+    // Test links generated by the link generator on an English page.
+    $current_language = 'English';
+    $this->drupalGet('language_test/type-link-active-class');
+
+    // Language code 'none' link should be active.
+    $langcode = 'none';
+    $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', [':id' => 'no_lang_link', ':class' => 'is-active']);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
+
+    // Language code 'en' link should be active.
+    $langcode = 'en';
+    $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', [':id' => 'en_link', ':class' => 'is-active']);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
+
+    // Language code 'fr' link should not be active.
+    $langcode = 'fr';
+    $links = $this->xpath('//a[@id = :id and not(contains(@class, :class))]', [':id' => 'fr_link', ':class' => 'is-active']);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is NOT marked active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
+
+    // Test links generated by the link generator on a French page.
+    $current_language = 'French';
+    $this->drupalGet('fr/language_test/type-link-active-class');
+
+    // Language code 'none' link should be active.
+    $langcode = 'none';
+    $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', [':id' => 'no_lang_link', ':class' => 'is-active']);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
+
+    // Language code 'en' link should not be active.
+    $langcode = 'en';
+    $links = $this->xpath('//a[@id = :id and not(contains(@class, :class))]', [':id' => 'en_link', ':class' => 'is-active']);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is NOT marked active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
+
+    // Language code 'fr' link should be active.
+    $langcode = 'fr';
+    $links = $this->xpath('//a[@id = :id and contains(@class, :class)]', [':id' => 'fr_link', ':class' => 'is-active']);
+    $this->assertTrue(isset($links[0]), t('A link generated by :function to the current :language page with langcode :langcode is marked active.', [':function' => $function_name, ':language' => $current_language, ':langcode' => $langcode]));
+  }
+
+  /**
+   * Tests language switcher links for session based negotiation.
+   */
+  public function testLanguageSessionSwitchLinks() {
+    // Add language.
+    $edit = [
+      'predefined_langcode' => 'fr',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    // Enable session language detection and selection.
+    $edit = [
+      'language_interface[enabled][language-url]' => FALSE,
+      'language_interface[enabled][language-session]' => TRUE,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+
+    // Enable the language switching block.
+    $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_INTERFACE, [
+      'id' => 'test_language_block',
+    ]);
+
+    // Enable the main menu block.
+    $this->drupalPlaceBlock('system_menu_block:main', [
+      'id' => 'test_menu',
+    ]);
+
+    // Add a link to the homepage.
+    $link = MenuLinkContent::create([
+      'title' => 'Home',
+      'menu_name' => 'main',
+      'bundle' => 'menu_link_content',
+      'link' => [['uri' => 'entity:user/2']],
+    ]);
+    $link->save();
+
+    // Go to the homepage.
+    $this->drupalGet('');
+    // Click on the French link.
+    $this->clickLink(t('French'));
+    // There should be a query parameter to set the session language.
+    $this->assertUrl('user/2', ['query' => ['language' => 'fr']]);
+    // Click on the 'Home' Link.
+    $this->clickLink(t('Home'));
+    // There should be no query parameter.
+    $this->assertUrl('user/2');
+    // Click on the French link.
+    $this->clickLink(t('French'));
+    // There should be no query parameter.
+    $this->assertUrl('user/2');
+  }
+
+  /**
+   * Saves the native name of a language entity in configuration as a label.
+   *
+   * @param string $langcode
+   *   The language code of the language.
+   * @param string $label
+   *   The native name of the language.
+   */
+  protected function saveNativeLanguageName($langcode, $label) {
+    \Drupal::service('language.config_factory_override')
+      ->getOverride($langcode, 'language.entity.' . $langcode)->set('label', $label)->save();
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageTourTest.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Tests\tour\Functional\TourTestBase;
+
+/**
+ * Tests tour functionality.
+ *
+ * @group tour
+ */
+class LanguageTourTest extends TourTestBase {
+
+  /**
+   * An admin user with administrative permissions for views.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $adminUser;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['block', 'language', 'tour'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->adminUser = $this->drupalCreateUser(['administer languages', 'access tour']);
+    $this->drupalLogin($this->adminUser);
+    $this->drupalPlaceBlock('local_actions_block');
+  }
+
+  /**
+   * Tests language tour tip availability.
+   */
+  public function testLanguageTour() {
+    $this->drupalGet('admin/config/regional/language');
+    $this->assertTourTips();
+  }
+
+  /**
+   * Go to add language page and check the tour tooltips.
+   */
+  public function testLanguageAddTour() {
+    $this->drupalGet('admin/config/regional/language/add');
+    $this->assertTourTips();
+  }
+
+  /**
+   * Go to edit language page and check the tour tooltips.
+   */
+  public function testLanguageEditTour() {
+    $this->drupalGet('admin/config/regional/language/edit/en');
+    $this->assertTourTips();
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php

@@ -0,0 +1,578 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Url;
+use Drupal\file\Entity\File;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationBrowser;
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationSelected;
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationSession;
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
+use Drupal\Tests\BrowserTestBase;
+use Drupal\user\Plugin\LanguageNegotiation\LanguageNegotiationUser;
+use Drupal\user\Plugin\LanguageNegotiation\LanguageNegotiationUserAdmin;
+use Drupal\Core\Language\Language;
+use Drupal\Core\Language\LanguageInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Drupal\language\LanguageNegotiatorInterface;
+use Drupal\block\Entity\Block;
+
+/**
+ * Tests the language UI for language switching.
+ *
+ * The uses cases that get tested, are:
+ * - URL (path) > default: Test that the URL prefix setting gets precedence over
+ *   the default language. The browser language preference does not have any
+ *   influence.
+ * - URL (path) > browser > default: Test that the URL prefix setting gets
+ *   precedence over the browser language preference, which in turn gets
+ *   precedence over the default language.
+ * - URL (domain) > default: Tests that the URL domain setting gets precedence
+ *   over the default language.
+ *
+ * The paths that are used for each of these, are:
+ * - admin/config: Tests the UI using the precedence rules.
+ * - zh-hans/admin/config: Tests the UI in Chinese.
+ * - blah-blah/admin/config: Tests the 404 page.
+ *
+ * @group language
+ */
+class LanguageUILanguageNegotiationTest extends BrowserTestBase {
+
+  /**
+   * The admin user for testing.
+   *
+   * @var \Drupal\user\Entity\User
+   */
+  protected $adminUser;
+
+  /**
+   * Modules to enable.
+   *
+   * We marginally use interface translation functionality here, so need to use
+   * the locale module instead of language only, but the 90% of the test is
+   * about the negotiation process which is solely in language module.
+   *
+   * @var array
+   */
+  public static $modules = ['locale', 'language_test', 'block', 'user', 'content_translation'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->adminUser = $this->drupalCreateUser(['administer languages', 'translate interface', 'access administration pages', 'administer blocks']);
+    $this->drupalLogin($this->adminUser);
+  }
+
+  /**
+   * Tests for language switching by URL path.
+   */
+  public function testUILanguageNegotiation() {
+    // A few languages to switch to.
+    // This one is unknown, should get the default lang version.
+    $langcode_unknown = 'blah-blah';
+    // For testing browser lang preference.
+    $langcode_browser_fallback = 'vi';
+    // For testing path prefix.
+    $langcode = 'zh-hans';
+    // For setting browser language preference to 'vi'.
+    $http_header_browser_fallback = ["Accept-Language" => "$langcode_browser_fallback;q=1"];
+    // For setting browser language preference to some unknown.
+    $http_header_blah = ["Accept-Language" => "blah;q=1"];
+
+    // Create a private file for testing accessible by the admin user.
+    drupal_mkdir($this->privateFilesDirectory . '/test');
+    $filepath = 'private://test/private-file-test.txt';
+    $contents = "file_put_contents() doesn't seem to appreciate empty strings so let's put in some data.";
+    file_put_contents($filepath, $contents);
+    $file = File::create([
+      'uri' => $filepath,
+      'uid' => $this->adminUser->id(),
+    ]);
+    $file->save();
+
+    // Setup the site languages by installing two languages.
+    // Set the default language in order for the translated string to be registered
+    // into database when seen by t(). Without doing this, our target string
+    // is for some reason not found when doing translate search. This might
+    // be some bug.
+    $default_language = \Drupal::languageManager()->getDefaultLanguage();
+    ConfigurableLanguage::createFromLangcode($langcode_browser_fallback)->save();
+    $this->config('system.site')->set('default_langcode', $langcode_browser_fallback)->save();
+    ConfigurableLanguage::createFromLangcode($langcode)->save();
+
+    // We will look for this string in the admin/config screen to see if the
+    // corresponding translated string is shown.
+    $default_string = 'Hide descriptions';
+
+    // First visit this page to make sure our target string is searchable.
+    $this->drupalGet('admin/config');
+
+    // Now the t()'ed string is in db so switch the language back to default.
+    // This will rebuild the container so we need to rebuild the container in
+    // the test environment.
+    $this->config('system.site')->set('default_langcode', $default_language->getId())->save();
+    $this->config('language.negotiation')->set('url.prefixes.en', '')->save();
+    $this->rebuildContainer();
+
+    // Translate the string.
+    $language_browser_fallback_string = "In $langcode_browser_fallback In $langcode_browser_fallback In $langcode_browser_fallback";
+    $language_string = "In $langcode In $langcode In $langcode";
+    // Do a translate search of our target string.
+    $search = [
+      'string' => $default_string,
+      'langcode' => $langcode_browser_fallback,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $textarea = current($this->xpath('//textarea'));
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => $language_browser_fallback_string,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+
+    $search = [
+      'string' => $default_string,
+      'langcode' => $langcode,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
+    $textarea = current($this->xpath('//textarea'));
+    $lid = $textarea->getAttribute('name');
+    $edit = [
+      $lid => $language_string,
+    ];
+    $this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
+
+    // Configure selected language negotiation to use zh-hans.
+    $edit = ['selected_langcode' => $langcode];
+    $this->drupalPostForm('admin/config/regional/language/detection/selected', $edit, t('Save configuration'));
+    $test = [
+      'language_negotiation' => [LanguageNegotiationSelected::METHOD_ID],
+      'path' => 'admin/config',
+      'expect' => $language_string,
+      'expected_method_id' => LanguageNegotiationSelected::METHOD_ID,
+      'http_header' => $http_header_browser_fallback,
+      'message' => 'SELECTED: UI language is switched based on selected language.',
+    ];
+    $this->doRunTest($test);
+
+    // An invalid language is selected.
+    $this->config('language.negotiation')->set('selected_langcode', NULL)->save();
+    $test = [
+      'language_negotiation' => [LanguageNegotiationSelected::METHOD_ID],
+      'path' => 'admin/config',
+      'expect' => $default_string,
+      'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
+      'http_header' => $http_header_browser_fallback,
+      'message' => 'SELECTED > DEFAULT: UI language is switched based on selected language.',
+    ];
+    $this->doRunTest($test);
+
+    // No selected language is available.
+    $this->config('language.negotiation')->set('selected_langcode', $langcode_unknown)->save();
+    $test = [
+      'language_negotiation' => [LanguageNegotiationSelected::METHOD_ID],
+      'path' => 'admin/config',
+      'expect' => $default_string,
+      'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
+      'http_header' => $http_header_browser_fallback,
+      'message' => 'SELECTED > DEFAULT: UI language is switched based on selected language.',
+    ];
+    $this->doRunTest($test);
+
+    $tests = [
+      // Default, browser preference should have no influence.
+      [
+        'language_negotiation' => [LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
+        'path' => 'admin/config',
+        'expect' => $default_string,
+        'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
+        'http_header' => $http_header_browser_fallback,
+        'message' => 'URL (PATH) > DEFAULT: no language prefix, UI language is default and the browser language preference setting is not used.',
+      ],
+      // Language prefix.
+      [
+        'language_negotiation' => [LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
+        'path' => "$langcode/admin/config",
+        'expect' => $language_string,
+        'expected_method_id' => LanguageNegotiationUrl::METHOD_ID,
+        'http_header' => $http_header_browser_fallback,
+        'message' => 'URL (PATH) > DEFAULT: with language prefix, UI language is switched based on path prefix',
+      ],
+      // Default, go by browser preference.
+      [
+        'language_negotiation' => [LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationBrowser::METHOD_ID],
+        'path' => 'admin/config',
+        'expect' => $language_browser_fallback_string,
+        'expected_method_id' => LanguageNegotiationBrowser::METHOD_ID,
+        'http_header' => $http_header_browser_fallback,
+        'message' => 'URL (PATH) > BROWSER: no language prefix, UI language is determined by browser language preference',
+      ],
+      // Prefix, switch to the language.
+      [
+        'language_negotiation' => [LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationBrowser::METHOD_ID],
+        'path' => "$langcode/admin/config",
+        'expect' => $language_string,
+        'expected_method_id' => LanguageNegotiationUrl::METHOD_ID,
+        'http_header' => $http_header_browser_fallback,
+        'message' => 'URL (PATH) > BROWSER: with language prefix, UI language is based on path prefix',
+      ],
+      // Default, browser language preference is not one of site's lang.
+      [
+        'language_negotiation' => [LanguageNegotiationUrl::METHOD_ID, LanguageNegotiationBrowser::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
+        'path' => 'admin/config',
+        'expect' => $default_string,
+        'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
+        'http_header' => $http_header_blah,
+        'message' => 'URL (PATH) > BROWSER > DEFAULT: no language prefix and browser language preference set to unknown language should use default language',
+      ],
+    ];
+
+    foreach ($tests as $test) {
+      $this->doRunTest($test);
+    }
+
+    // Unknown language prefix should return 404.
+    $definitions = \Drupal::languageManager()->getNegotiator()->getNegotiationMethods();
+    // Enable only methods, which are either not limited to a specific language
+    // type or are supporting the interface language type.
+    $language_interface_method_definitions = array_filter($definitions, function ($method_definition) {
+      return !isset($method_definition['types']) || (isset($method_definition['types']) && in_array(LanguageInterface::TYPE_INTERFACE, $method_definition['types']));
+    });
+    $this->config('language.types')
+      ->set('negotiation.' . LanguageInterface::TYPE_INTERFACE . '.enabled', array_flip(array_keys($language_interface_method_definitions)))
+      ->save();
+    $this->drupalGet("$langcode_unknown/admin/config", [], $http_header_browser_fallback);
+    $this->assertResponse(404, "Unknown language path prefix should return 404");
+
+    // Set preferred langcode for user to NULL.
+    $account = $this->loggedInUser;
+    $account->preferred_langcode = NULL;
+    $account->save();
+
+    $test = [
+      'language_negotiation' => [LanguageNegotiationUser::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
+      'path' => 'admin/config',
+      'expect' => $default_string,
+      'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
+      'http_header' => [],
+      'message' => 'USER > DEFAULT: no preferred user language setting, the UI language is default',
+    ];
+    $this->doRunTest($test);
+
+    // Set preferred langcode for user to default langcode.
+    $account = $this->loggedInUser;
+    $account->preferred_langcode = $default_language->getId();
+    $account->save();
+
+    $test = [
+      'language_negotiation' => [LanguageNegotiationUser::METHOD_ID, LanguageNegotiationUrl::METHOD_ID],
+      'path' => "$langcode/admin/config",
+      'expect' => $default_string,
+      'expected_method_id' => LanguageNegotiationUser::METHOD_ID,
+      'http_header' => [],
+      'message' => 'USER > URL: User has default language as preferred user language setting, the UI language is default',
+    ];
+    $this->doRunTest($test);
+
+    // Set preferred langcode for user to unknown language.
+    $account = $this->loggedInUser;
+    $account->preferred_langcode = $langcode_unknown;
+    $account->save();
+
+    $test = [
+      'language_negotiation' => [LanguageNegotiationUser::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
+      'path' => 'admin/config',
+      'expect' => $default_string,
+      'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
+      'http_header' => [],
+      'message' => 'USER > DEFAULT: invalid preferred user language setting, the UI language is default',
+    ];
+    $this->doRunTest($test);
+
+    // Set preferred langcode for user to non default.
+    $account->preferred_langcode = $langcode;
+    $account->save();
+
+    $test = [
+      'language_negotiation' => [LanguageNegotiationUser::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
+      'path' => 'admin/config',
+      'expect' => $language_string,
+      'expected_method_id' => LanguageNegotiationUser::METHOD_ID,
+      'http_header' => [],
+      'message' => 'USER > DEFAULT: defined preferred user language setting, the UI language is based on user setting',
+    ];
+    $this->doRunTest($test);
+
+    // Set preferred admin langcode for user to NULL.
+    $account->preferred_admin_langcode = NULL;
+    $account->save();
+
+    $test = [
+      'language_negotiation' => [LanguageNegotiationUserAdmin::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
+      'path' => 'admin/config',
+      'expect' => $default_string,
+      'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
+      'http_header' => [],
+      'message' => 'USER ADMIN > DEFAULT: no preferred user admin language setting, the UI language is default',
+    ];
+    $this->doRunTest($test);
+
+    // Set preferred admin langcode for user to unknown language.
+    $account->preferred_admin_langcode = $langcode_unknown;
+    $account->save();
+
+    $test = [
+      'language_negotiation' => [LanguageNegotiationUserAdmin::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
+      'path' => 'admin/config',
+      'expect' => $default_string,
+      'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
+      'http_header' => [],
+      'message' => 'USER ADMIN > DEFAULT: invalid preferred user admin language setting, the UI language is default',
+    ];
+    $this->doRunTest($test);
+
+    // Set preferred admin langcode for user to non default.
+    $account->preferred_admin_langcode = $langcode;
+    $account->save();
+
+    $test = [
+      'language_negotiation' => [LanguageNegotiationUserAdmin::METHOD_ID, LanguageNegotiationSelected::METHOD_ID],
+      'path' => 'admin/config',
+      'expect' => $language_string,
+      'expected_method_id' => LanguageNegotiationUserAdmin::METHOD_ID,
+      'http_header' => [],
+      'message' => 'USER ADMIN > DEFAULT: defined preferred user admin language setting, the UI language is based on user setting',
+    ];
+    $this->doRunTest($test);
+
+    // Go by session preference.
+    $language_negotiation_session_param = $this->randomMachineName();
+    $edit = ['language_negotiation_session_param' => $language_negotiation_session_param];
+    $this->drupalPostForm('admin/config/regional/language/detection/session', $edit, t('Save configuration'));
+    $tests = [
+      [
+        'language_negotiation' => [LanguageNegotiationSession::METHOD_ID],
+        'path' => "admin/config",
+        'expect' => $default_string,
+        'expected_method_id' => LanguageNegotiatorInterface::METHOD_ID,
+        'http_header' => $http_header_browser_fallback,
+        'message' => 'SESSION > DEFAULT: no language given, the UI language is default',
+      ],
+      [
+        'language_negotiation' => [LanguageNegotiationSession::METHOD_ID],
+        'path' => 'admin/config',
+        'path_options' => ['query' => [$language_negotiation_session_param => $langcode]],
+        'expect' => $language_string,
+        'expected_method_id' => LanguageNegotiationSession::METHOD_ID,
+        'http_header' => $http_header_browser_fallback,
+        'message' => 'SESSION > DEFAULT: language given, UI language is determined by session language preference',
+      ],
+    ];
+    foreach ($tests as $test) {
+      $this->doRunTest($test);
+    }
+  }
+
+  protected function doRunTest($test) {
+    $test += ['path_options' => []];
+    if (!empty($test['language_negotiation'])) {
+      $method_weights = array_flip($test['language_negotiation']);
+      $this->container->get('language_negotiator')->saveConfiguration(LanguageInterface::TYPE_INTERFACE, $method_weights);
+    }
+    if (!empty($test['language_negotiation_url_part'])) {
+      $this->config('language.negotiation')
+        ->set('url.source', $test['language_negotiation_url_part'])
+        ->save();
+    }
+    if (!empty($test['language_test_domain'])) {
+      \Drupal::state()->set('language_test.domain', $test['language_test_domain']);
+    }
+    $this->container->get('language_manager')->reset();
+    $this->drupalGet($test['path'], $test['path_options'], $test['http_header']);
+    $this->assertText($test['expect'], $test['message']);
+    $this->assertText(t('Language negotiation method: @name', ['@name' => $test['expected_method_id']]));
+
+    // Get the private file and ensure it is a 200. It is important to
+    // invalidate the router cache to ensure the routing system runs a full
+    // match.
+    Cache::invalidateTags(['route_match']);
+    $this->drupalGet('system/files/test/private-file-test.txt');
+    $this->assertResponse(200);
+  }
+
+  /**
+   * Test URL language detection when the requested URL has no language.
+   */
+  public function testUrlLanguageFallback() {
+    // Add the Italian language.
+    $langcode_browser_fallback = 'it';
+    ConfigurableLanguage::createFromLangcode($langcode_browser_fallback)->save();
+    $languages = $this->container->get('language_manager')->getLanguages();
+
+    // Enable the path prefix for the default language: this way any unprefixed
+    // URL must have a valid fallback value.
+    $edit = ['prefix[en]' => 'en'];
+    $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
+
+    // Enable browser and URL language detection.
+    $edit = [
+      'language_interface[enabled][language-browser]' => TRUE,
+      'language_interface[enabled][language-url]' => TRUE,
+      'language_interface[weight][language-browser]' => -8,
+      'language_interface[weight][language-url]' => -10,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+    $this->drupalGet('admin/config/regional/language/detection');
+
+    // Enable the language switcher block.
+    $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_INTERFACE, ['id' => 'test_language_block']);
+
+    // Log out, because for anonymous users, the "active" class is set by PHP
+    // (which means we can easily test it here), whereas for authenticated users
+    // it is set by JavaScript.
+    $this->drupalLogout();
+
+    // Place a site branding block in the header region.
+    $this->drupalPlaceBlock('system_branding_block', ['region' => 'header']);
+
+    // Access the front page without specifying any valid URL language prefix
+    // and having as browser language preference a non-default language.
+    $http_header = ["Accept-Language" => "$langcode_browser_fallback;q=1"];
+    $language = new Language(['id' => '']);
+    $this->drupalGet('', ['language' => $language], $http_header);
+
+    // Check that the language switcher active link matches the given browser
+    // language.
+    $args = [':id' => 'block-test-language-block', ':url' => \Drupal::url('<front>') . $langcode_browser_fallback];
+    $fields = $this->xpath('//div[@id=:id]//a[@class="language-link is-active" and starts-with(@href, :url)]', $args);
+    $this->assertSame($fields[0]->getText(), $languages[$langcode_browser_fallback]->getName(), 'The browser language is the URL active language');
+
+    // Check that URLs are rewritten using the given browser language.
+    $fields = $this->xpath('//div[@class="site-name"]/a[@rel="home" and @href=:url]', $args);
+    $this->assertSame($fields[0]->getText(), 'Drupal', 'URLs are rewritten using the browser language.');
+  }
+
+  /**
+   * Tests URL handling when separate domains are used for multiple languages.
+   */
+  public function testLanguageDomain() {
+    global $base_url;
+
+    // Get the current host URI we're running on.
+    $base_url_host = parse_url($base_url, PHP_URL_HOST);
+
+    // Add the Italian language.
+    ConfigurableLanguage::createFromLangcode('it')->save();
+
+    $languages = $this->container->get('language_manager')->getLanguages();
+
+    // Enable browser and URL language detection.
+    $edit = [
+      'language_interface[enabled][language-url]' => TRUE,
+      'language_interface[weight][language-url]' => -10,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+
+    // Do not allow blank domain.
+    $edit = [
+      'language_negotiation_url_part' => LanguageNegotiationUrl::CONFIG_DOMAIN,
+      'domain[en]' => '',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
+    $this->assertText('The domain may not be left blank for English', 'The form does not allow blank domains.');
+    $this->rebuildContainer();
+
+    // Change the domain for the Italian language.
+    $edit = [
+      'language_negotiation_url_part' => LanguageNegotiationUrl::CONFIG_DOMAIN,
+      'domain[en]' => $base_url_host,
+      'domain[it]' => 'it.example.com',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
+    $this->assertText('The configuration options have been saved', 'Domain configuration is saved.');
+    $this->rebuildContainer();
+
+    // Try to use an invalid domain.
+    $edit = [
+      'language_negotiation_url_part' => LanguageNegotiationUrl::CONFIG_DOMAIN,
+      'domain[en]' => $base_url_host,
+      'domain[it]' => 'it.example.com/',
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
+    $this->assertRaw(t('The domain for %language may only contain the domain name, not a trailing slash, protocol and/or port.', ['%language' => 'Italian']));
+
+    // Build the link we're going to test.
+    $link = 'it.example.com' . rtrim(base_path(), '/') . '/admin';
+
+    // Test URL in another language: http://it.example.com/admin.
+    // Base path gives problems on the testbot, so $correct_link is hard-coded.
+    // @see UrlAlterFunctionalTest::assertUrlOutboundAlter (path.test).
+    $italian_url = Url::fromRoute('system.admin', [], ['language' => $languages['it']])->toString();
+    $url_scheme = \Drupal::request()->isSecure() ? 'https://' : 'http://';
+    $correct_link = $url_scheme . $link;
+    $this->assertEqual($italian_url, $correct_link, format_string('The right URL (@url) in accordance with the chosen language', ['@url' => $italian_url]));
+
+    // Test HTTPS via options.
+    $italian_url = Url::fromRoute('system.admin', [], ['https' => TRUE, 'language' => $languages['it']])->toString();
+    $correct_link = 'https://' . $link;
+    $this->assertTrue($italian_url == $correct_link, format_string('The right HTTPS URL (via options) (@url) in accordance with the chosen language', ['@url' => $italian_url]));
+
+    // Test HTTPS via current URL scheme.
+    $request = Request::create('', 'GET', [], [], [], ['HTTPS' => 'on']);
+    $this->container->get('request_stack')->push($request);
+    $italian_url = Url::fromRoute('system.admin', [], ['language' => $languages['it']])->toString();
+    $correct_link = 'https://' . $link;
+    $this->assertTrue($italian_url == $correct_link, format_string('The right URL (via current URL scheme) (@url) in accordance with the chosen language', ['@url' => $italian_url]));
+  }
+
+  /**
+   * Tests persistence of negotiation settings for the content language type.
+   */
+  public function testContentCustomization() {
+    // Customize content language settings from their defaults.
+    $edit = [
+      'language_content[configurable]' => TRUE,
+      'language_content[enabled][language-url]' => FALSE,
+      'language_content[enabled][language-session]' => TRUE,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+
+    // Check if configurability persisted.
+    $config = $this->config('language.types');
+    $this->assertTrue(in_array('language_interface', $config->get('configurable')), 'Interface language is configurable.');
+    $this->assertTrue(in_array('language_content', $config->get('configurable')), 'Content language is configurable.');
+
+    // Ensure configuration was saved.
+    $this->assertFalse(array_key_exists('language-url', $config->get('negotiation.language_content.enabled')), 'URL negotiation is not enabled for content.');
+    $this->assertTrue(array_key_exists('language-session', $config->get('negotiation.language_content.enabled')), 'Session negotiation is enabled for content.');
+  }
+
+  /**
+   * Tests if the language switcher block gets deleted when a language type has been made not configurable.
+   */
+  public function testDisableLanguageSwitcher() {
+    $block_id = 'test_language_block';
+
+    // Enable the language switcher block.
+    $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_CONTENT, ['id' => $block_id]);
+
+    // Check if the language switcher block has been created.
+    $block = Block::load($block_id);
+    $this->assertTrue($block, 'Language switcher block was created.');
+
+    // Make sure language_content is not configurable.
+    $edit = [
+      'language_content[configurable]' => FALSE,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+    $this->assertResponse(200);
+
+    // Check if the language switcher block has been removed.
+    $block = Block::load($block_id);
+    $this->assertFalse($block, 'Language switcher block was removed.');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php

@@ -0,0 +1,158 @@
+<?php
+
+namespace Drupal\Tests\language\Functional;
+
+use Drupal\Core\Language\Language;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Url;
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
+use Drupal\Tests\BrowserTestBase;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Tests that URL rewriting works as expected.
+ *
+ * @group language
+ */
+class LanguageUrlRewritingTest extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'language_test'];
+
+  /**
+   * An user with permissions to administer languages.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $webUser;
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create and log in user.
+    $this->webUser = $this->drupalCreateUser(['administer languages', 'access administration pages']);
+    $this->drupalLogin($this->webUser);
+
+    // Install French language.
+    $edit = [];
+    $edit['predefined_langcode'] = 'fr';
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    // Enable URL language detection and selection.
+    $edit = ['language_interface[enabled][language-url]' => 1];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+
+    // Check that drupalSettings contains path prefix.
+    $this->drupalGet('fr/admin/config/regional/language/detection');
+    $this->assertRaw('"pathPrefix":"fr\/"', 'drupalSettings path prefix contains language code.');
+  }
+
+  /**
+   * Check that non-installed languages are not considered.
+   */
+  public function testUrlRewritingEdgeCases() {
+    // Check URL rewriting with a non-installed language.
+    $non_existing = new Language(['id' => $this->randomMachineName()]);
+    $this->checkUrl($non_existing, 'Path language is ignored if language is not installed.', 'URL language negotiation does not work with non-installed languages');
+
+    // Check that URL rewriting is not applied to subrequests.
+    $this->drupalGet('language_test/subrequest');
+    $this->assertText($this->webUser->getUsername(), 'Page correctly retrieved');
+  }
+
+  /**
+   * Check URL rewriting for the given language.
+   *
+   * The test is performed with a fixed URL (the default front page) to simply
+   * check that language prefixes are not added to it and that the prefixed URL
+   * is actually not working.
+   *
+   * @param \Drupal\Core\Language\LanguageInterface $language
+   *   The language object.
+   * @param string $message1
+   *   Message to display in assertion that language prefixes are not added.
+   * @param string $message2
+   *   The message to display confirming prefixed URL is not working.
+   */
+  private function checkUrl(LanguageInterface $language, $message1, $message2) {
+    $options = ['language' => $language, 'script' => ''];
+    $base_path = trim(base_path(), '/');
+    $rewritten_path = trim(str_replace($base_path, '', \Drupal::url('<front>', [], $options)), '/');
+    $segments = explode('/', $rewritten_path, 2);
+    $prefix = $segments[0];
+    $path = isset($segments[1]) ? $segments[1] : $prefix;
+
+    // If the rewritten URL has not a language prefix we pick a random prefix so
+    // we can always check the prefixed URL.
+    $prefixes = language_negotiation_url_prefixes();
+    $stored_prefix = isset($prefixes[$language->getId()]) ? $prefixes[$language->getId()] : $this->randomMachineName();
+    $this->assertNotEqual($stored_prefix, $prefix, $message1);
+    $prefix = $stored_prefix;
+
+    $this->drupalGet("$prefix/$path");
+    $this->assertResponse(404, $message2);
+  }
+
+  /**
+   * Check URL rewriting when using a domain name and a non-standard port.
+   */
+  public function testDomainNameNegotiationPort() {
+    global $base_url;
+    $language_domain = 'example.fr';
+    // Get the current host URI we're running on.
+    $base_url_host = parse_url($base_url, PHP_URL_HOST);
+    $edit = [
+      'language_negotiation_url_part' => LanguageNegotiationUrl::CONFIG_DOMAIN,
+      'domain[en]' => $base_url_host,
+      'domain[fr]' => $language_domain,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
+    // Rebuild the container so that the new language gets picked up by services
+    // that hold the list of languages.
+    $this->rebuildContainer();
+
+    // Enable domain configuration.
+    $this->config('language.negotiation')
+      ->set('url.source', LanguageNegotiationUrl::CONFIG_DOMAIN)
+      ->save();
+
+    // Reset static caching.
+    $this->container->get('language_manager')->reset();
+
+    // In case index.php is part of the URLs, we need to adapt the asserted
+    // URLs as well.
+    $index_php = strpos(\Drupal::url('<front>', [], ['absolute' => TRUE]), 'index.php') !== FALSE;
+
+    $request = Request::createFromGlobals();
+    $server = $request->server->all();
+    $request = $this->prepareRequestForGenerator(TRUE, ['HTTP_HOST' => $server['HTTP_HOST'] . ':88']);
+
+    // Create an absolute French link.
+    $language = \Drupal::languageManager()->getLanguage('fr');
+    $url = Url::fromRoute('<front>', [], [
+      'absolute' => TRUE,
+      'language' => $language,
+    ])->toString();
+
+    $expected = ($index_php ? 'http://example.fr:88/index.php' : 'http://example.fr:88') . rtrim(base_path(), '/') . '/';
+
+    $this->assertEqual($url, $expected, 'The right port is used.');
+
+    // If we set the port explicitly, it should not be overridden.
+    $url = Url::fromRoute('<front>', [], [
+      'absolute' => TRUE,
+      'language' => $language,
+      'base_url' => $request->getBaseUrl() . ':90',
+    ])->toString();
+
+    $expected = $index_php ? 'http://example.fr:90/index.php' : 'http://example.fr:90' . rtrim(base_path(), '/') . '/';
+
+    $this->assertEqual($url, $expected, 'A given port is not overridden.');
+
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/Migrate/MigrateLanguageTest.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Migrate;
+
+use Drupal\language\ConfigurableLanguageInterface;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * @group migrate_drupal_6
+ */
+class MigrateLanguageTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language'];
+
+  /**
+   * Asserts various properties of a configurable language entity.
+   *
+   * @param string $id
+   *   The language ID.
+   * @param string $label
+   *   The language name.
+   * @param string $direction
+   *   (optional) The language's direction (one of the DIRECTION_* constants in
+   *   ConfigurableLanguageInterface). Defaults to LTR.
+   * @param int $weight
+   *   (optional) The weight of the language. Defaults to 0.
+   */
+  protected function assertLanguage($id, $label, $direction = ConfigurableLanguageInterface::DIRECTION_LTR, $weight = 0) {
+    /** @var \Drupal\language\ConfigurableLanguageInterface $language */
+    $language = ConfigurableLanguage::load($id);
+    $this->assertTrue($language instanceof ConfigurableLanguageInterface);
+    $this->assertIdentical($label, $language->label());
+    $this->assertIdentical($direction, $language->getDirection());
+    $this->assertIdentical(0, $language->getWeight());
+    $this->assertFalse($language->isLocked());
+  }
+
+  /**
+   * Tests migration of Drupal 6 languages to configurable language entities.
+   */
+  public function testLanguageMigration() {
+    $this->executeMigration('language');
+    $this->assertLanguage('en', 'English');
+    $this->assertLanguage('fr', 'French');
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageJsonAnonTest.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+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';
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageJsonBasicAuthTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+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';
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageJsonCookieTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+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';
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageResourceTestBase.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Url;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+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);
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageXmlAnonTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+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';
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageXmlBasicAuthTest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+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';
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ConfigurableLanguageXmlCookieTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+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';
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsJsonAnonTest.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+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';
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsJsonBasicAuthTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+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';
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsJsonCookieTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+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';
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsResourceTestBase.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+use Drupal\language\Entity\ContentLanguageSettings;
+use Drupal\node\Entity\NodeType;
+use Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase;
+
+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',
+    ];
+  }
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsXmlAnonTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+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';
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsXmlBasicAuthTest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+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';
+
+}

2017/web/core/modules/language/tests/src/Functional/Rest/ContentLanguageSettingsXmlCookieTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Rest;
+
+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';
+
+}

2017/web/core/modules/language/tests/src/Functional/Update/LanguageSelectWidgetUpdateTest.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Drupal\Tests\language\Functional\Update;
+
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\FunctionalTests\Update\UpdatePathTestBase;
+
+/**
+ * Tests the update path for the language_select widget.
+ *
+ * @group Update
+ * @group legacy
+ */
+class LanguageSelectWidgetUpdateTest extends UpdatePathTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setDatabaseDumpFiles() {
+    $this->databaseDumpFiles = [
+      __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.filled.standard.php.gz',
+    ];
+  }
+
+  /**
+   * Tests language_post_update_language_select_widget().
+   */
+  public function testLanguagePostUpdateLanguageSelectWidget() {
+    // Tests before the update.
+    $content_before = EntityFormDisplay::load('node.page.default')->get('content');
+    $this->assertEqual([], $content_before['langcode']['settings']);
+
+    // Run the update.
+    $this->runUpdates();
+
+    // Tests after the update.
+    $content_after = EntityFormDisplay::load('node.page.default')->get('content');
+    $this->assertEqual(['include_locked' => TRUE], $content_after['langcode']['settings']);
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Condition;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests that the language condition, provided by the language module, is
+ * working properly.
+ *
+ * @group language
+ */
+class LanguageConditionTest extends KernelTestBase {
+
+  /**
+   * The condition plugin manager.
+   *
+   * @var \Drupal\Core\Condition\ConditionManager
+   */
+  protected $manager;
+
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['system', 'language'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(['language']);
+    // Setup Italian.
+    ConfigurableLanguage::createFromLangcode('it')->save();
+
+    $this->manager = $this->container->get('plugin.manager.condition');
+  }
+
+  /**
+   * Test the language condition.
+   */
+  public function testConditions() {
+    // Grab the language condition and configure it to check the content
+    // language.
+    $language = \Drupal::languageManager()->getLanguage('en');
+    $condition = $this->manager->createInstance('language')
+      ->setConfig('langcodes', ['en' => 'en', 'it' => 'it'])
+      ->setContextValue('language', $language);
+    $this->assertTrue($condition->execute(), 'Language condition passes as expected.');
+    // Check for the proper summary.
+    $this->assertEqual($condition->summary(), 'The language is English, Italian.');
+
+    // Change to Italian only.
+    $condition->setConfig('langcodes', ['it' => 'it']);
+    $this->assertFalse($condition->execute(), 'Language condition fails as expected.');
+    // Check for the proper summary.
+    $this->assertEqual($condition->summary(), 'The language is Italian.');
+
+    // Negate the condition
+    $condition->setConfig('negate', TRUE);
+    $this->assertTrue($condition->execute(), 'Language condition passes as expected.');
+    // Check for the proper summary.
+    $this->assertEqual($condition->summary(), 'The language is not Italian.');
+
+    // Change the default language to Italian.
+    $language = \Drupal::languageManager()->getLanguage('it');
+
+    $condition = $this->manager->createInstance('language')
+      ->setConfig('langcodes', ['en' => 'en', 'it' => 'it'])
+      ->setContextValue('language', $language);
+
+    $this->assertTrue($condition->execute(), 'Language condition passes as expected.');
+    // Check for the proper summary.
+    $this->assertEqual($condition->summary(), 'The language is English, Italian.');
+
+    // Change to Italian only.
+    $condition->setConfig('langcodes', ['it' => 'it']);
+    $this->assertTrue($condition->execute(), 'Language condition passes as expected.');
+    // Check for the proper summary.
+    $this->assertEqual($condition->summary(), 'The language is Italian.');
+
+    // Negate the condition
+    $condition->setConfig('negate', TRUE);
+    $this->assertFalse($condition->execute(), 'Language condition fails as expected.');
+    // Check for the proper summary.
+    $this->assertEqual($condition->summary(), 'The language is not Italian.');
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/ConfigurableLanguageManagerTest.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Url;
+
+/**
+ * Tests the ConfigurableLanguage entity.
+ *
+ * @group language
+ * @coversDefaultClass \Drupal\language\ConfigurableLanguageManager
+ */
+class ConfigurableLanguageManagerTest extends LanguageTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['user'];
+
+  /**
+   * The language negotiator.
+   *
+   * @var \Drupal\language\LanguageNegotiatorInterface
+   */
+  protected $languageNegotiator;
+
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\language\ConfigurableLanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installSchema('system', ['sequence']);
+    $this->installEntitySchema('user');
+
+    $this->languageNegotiator = $this->container->get('language_negotiator');
+    $this->languageManager = $this->container->get('language_manager');
+  }
+
+  /**
+   * @covers ::getLanguageSwitchLinks
+   */
+  public function testLanguageSwitchLinks() {
+    $this->languageNegotiator->setCurrentUser($this->prophesize('Drupal\Core\Session\AccountInterface')->reveal());
+    $this->languageManager->getLanguageSwitchLinks(LanguageInterface::TYPE_INTERFACE, new Url('<current>'));
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/ConfigurableLanguageTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+/**
+ * Tests the ConfigurableLanguage entity.
+ *
+ * @group language
+ * @see \Drupal\language\Entity\ConfigurableLanguage.
+ */
+class ConfigurableLanguageTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language'];
+
+  /**
+   * Tests configurable language name methods.
+   */
+  public function testName() {
+    $name = $this->randomMachineName();
+    $language_code = $this->randomMachineName(2);
+    $configurableLanguage = new ConfigurableLanguage(['label' => $name, 'id' => $language_code], 'configurable_language');
+    $this->assertEqual($configurableLanguage->getName(), $name);
+    $this->assertEqual($configurableLanguage->setName('Test language')->getName(), 'Test language');
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/EntityDefaultLanguageTest.php

@@ -0,0 +1,141 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\language\Entity\ContentLanguageSettings;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests default language code is properly generated for entities.
+ *
+ * @group language
+ */
+class EntityDefaultLanguageTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'node', 'field', 'text', 'user', 'system'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('user');
+
+    // Activate Spanish language, so there are two languages activated.
+    $language = $this->container->get('entity.manager')->getStorage('configurable_language')->create([
+      'id' => 'es',
+    ]);
+    $language->save();
+
+    // Create a new content type which has Undefined language by default.
+    $this->createContentType('ctund', LanguageInterface::LANGCODE_NOT_SPECIFIED);
+    // Create a new content type which has Spanish language by default.
+    $this->createContentType('ctes', 'es');
+  }
+
+  /**
+   * Tests that default language code is properly set for new nodes.
+   */
+  public function testEntityTranslationDefaultLanguageViaCode() {
+    // With language module activated, and a content type that is configured to
+    // have no language by default, a new node of this content type will have
+    // "und" language code when language is not specified.
+    $node = $this->createNode('ctund');
+    $this->assertEqual($node->langcode->value, LanguageInterface::LANGCODE_NOT_SPECIFIED);
+    // With language module activated, and a content type that is configured to
+    // have no language by default, a new node of this content type will have
+    // "es" language code when language is specified as "es".
+    $node = $this->createNode('ctund', 'es');
+    $this->assertEqual($node->langcode->value, 'es');
+
+    // With language module activated, and a content type that is configured to
+    // have language "es" by default, a new node of this content type will have
+    // "es" language code when language is not specified.
+    $node = $this->createNode('ctes');
+    $this->assertEqual($node->langcode->value, 'es');
+    // With language module activated, and a content type that is configured to
+    // have language "es" by default, a new node of this content type will have
+    // "en" language code when language "en" is specified.
+    $node = $this->createNode('ctes', 'en');
+    $this->assertEqual($node->langcode->value, 'en');
+
+    // Disable language module.
+    $this->disableModules(['language']);
+
+    // With language module disabled, and a content type that is configured to
+    // have no language specified by default, a new node of this content type
+    // will have site's default language code when language is not specified.
+    $node = $this->createNode('ctund');
+    $this->assertEqual($node->langcode->value, 'en');
+    // With language module disabled, and a content type that is configured to
+    // have no language specified by default, a new node of this type will have
+    // "es" language code when language "es" is specified.
+    $node = $this->createNode('ctund', 'es');
+    $this->assertEqual($node->langcode->value, 'es');
+
+    // With language module disabled, and a content type that is configured to
+    // have language "es" by default, a new node of this type will have site's
+    // default language code when language is not specified.
+    $node = $this->createNode('ctes');
+    $this->assertEqual($node->langcode->value, 'en');
+    // With language module disabled, and a content type that is configured to
+    // have language "es" by default, a new node of this type will have "en"
+    // language code when language "en" is specified.
+    $node = $this->createNode('ctes', 'en');
+    $this->assertEqual($node->langcode->value, 'en');
+  }
+
+  /**
+   * Creates a new node content type.
+   *
+   * @param string $name
+   *   The content type name.
+   * @param string $langcode
+   *   Default language code of the nodes of this type.
+   */
+  protected function createContentType($name, $langcode) {
+    $content_type = $this->container->get('entity.manager')->getStorage('node_type')->create([
+      'name' => 'Test ' . $name,
+      'title_label' => 'Title',
+      'type' => $name,
+      'create_body' => FALSE,
+    ]);
+    $content_type->save();
+    ContentLanguageSettings::loadByEntityTypeBundle('node', $name)
+      ->setLanguageAlterable(FALSE)
+      ->setDefaultLangcode($langcode)
+      ->save();
+
+  }
+
+  /**
+   * Creates a new node of given type and language using Entity API.
+   *
+   * @param string $type
+   *   The node content type.
+   * @param string $langcode
+   *   (optional) Language code to pass to entity create.
+   *
+   * @return \Drupal\node\NodeInterface
+   *   The node created.
+   */
+  protected function createNode($type, $langcode = NULL) {
+    $values = [
+      'type' => $type,
+      'title' => $this->randomString(),
+    ];
+    if (!empty($langcode)) {
+      $values['langcode'] = $langcode;
+    }
+    $node = $this->container->get('entity.manager')->getStorage('node')->create($values);
+    return $node;
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php

@@ -0,0 +1,136 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationContentEntity;
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
+use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Tests the language of entity URLs.
+ * @group language
+ */
+class EntityUrlLanguageTest extends LanguageTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['entity_test', 'user'];
+
+  /**
+   * The entity being used for testing.
+   *
+   * @var \Drupal\Core\Entity\ContentEntityInterface
+   */
+  protected $entity;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('configurable_language');
+    \Drupal::service('router.builder')->rebuild();
+
+    // In order to reflect the changes for a multilingual site in the container
+    // we have to rebuild it.
+    ConfigurableLanguage::create(['id' => 'es'])->save();
+    ConfigurableLanguage::create(['id' => 'fr'])->save();
+
+    $config = $this->config('language.negotiation');
+    $config->set('url.prefixes', ['en' => 'en', 'es' => 'es', 'fr' => 'fr'])
+      ->save();
+
+    \Drupal::service('kernel')->rebuildContainer();
+
+    $this->createTranslatableEntity();
+  }
+
+  /**
+   * Ensures that entity URLs in a language have the right language prefix.
+   */
+  public function testEntityUrlLanguage() {
+    $this->assertTrue(strpos($this->entity->urlInfo()->toString(), '/en/entity_test/' . $this->entity->id()) !== FALSE);
+    $this->assertTrue(strpos($this->entity->getTranslation('es')->urlInfo()->toString(), '/es/entity_test/' . $this->entity->id()) !== FALSE);
+    $this->assertTrue(strpos($this->entity->getTranslation('fr')->urlInfo()->toString(), '/fr/entity_test/' . $this->entity->id()) !== FALSE);
+  }
+
+  /**
+   * Ensures correct entity URLs with the method language-content-entity enabled.
+   *
+   * Test case with the method language-content-entity enabled and configured
+   * with higher and also with lower priority than the method language-url.
+   */
+  public function testEntityUrlLanguageWithLanguageContentEnabled() {
+    // Define the method language-content-entity with a higher priority than
+    // language-url.
+    $config = $this->config('language.types');
+    $config->set('configurable', [LanguageInterface::TYPE_INTERFACE, LanguageInterface::TYPE_CONTENT]);
+    $config->set('negotiation.language_content.enabled', [
+      LanguageNegotiationContentEntity::METHOD_ID => 0,
+      LanguageNegotiationUrl::METHOD_ID => 1,
+    ]);
+    $config->save();
+
+    // Without being on an content entity route the default entity URL tests
+    // should still pass.
+    $this->testEntityUrlLanguage();
+
+    // Now switching to an entity route, so that the URL links are generated
+    // while being on an entity route.
+    $this->setCurrentRequestForRoute('/entity_test/{entity_test}', 'entity.entity_test.canonical');
+
+    // The method language-content-entity should run before language-url and
+    // append query parameter for the content language and prevent language-url
+    // from overwriting the url.
+    $this->assertTrue(strpos($this->entity->urlInfo('canonical')->toString(), '/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=en') !== FALSE);
+    $this->assertTrue(strpos($this->entity->getTranslation('es')->urlInfo('canonical')->toString(), '/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=es') !== FALSE);
+    $this->assertTrue(strpos($this->entity->getTranslation('fr')->urlInfo('canonical')->toString(), '/en/entity_test/' . $this->entity->id() . '?' . LanguageNegotiationContentEntity::QUERY_PARAMETER . '=fr') !== FALSE);
+
+    // Define the method language-url with a higher priority than
+    // language-content-entity. This configuration should match the default one,
+    // where the language-content-entity is turned off.
+    $config->set('negotiation.language_content.enabled', [
+      LanguageNegotiationUrl::METHOD_ID => 0,
+      LanguageNegotiationContentEntity::METHOD_ID => 1,
+    ]);
+    $config->save();
+
+    // The default entity URL tests should pass again with the current
+    // configuration.
+    $this->testEntityUrlLanguage();
+  }
+
+  /**
+   * Creates a translated entity.
+   */
+  protected function createTranslatableEntity() {
+    $this->entity = EntityTest::create();
+    $this->entity->addTranslation('es', ['name' => 'name spanish']);
+    $this->entity->addTranslation('fr', ['name' => 'name french']);
+    $this->entity->save();
+  }
+
+  /**
+   * Sets the current request to a specific path with the corresponding route.
+   *
+   * @param string $path
+   *   The path for which the current request should be created.
+   * @param string $route_name
+   *   The route name for which the route object for the request should be
+   *   created.
+   */
+  protected function setCurrentRequestForRoute($path, $route_name) {
+    $request = Request::create($path);
+    $request->attributes->set(RouteObjectInterface::ROUTE_NAME, $route_name);
+    $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route($path));
+    $this->container->get('request_stack')->push($request);
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/LanguageConfigFactoryOverrideTest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests \Drupal\language\Config\LanguageConfigFactoryOverride.
+ *
+ * @group language
+ */
+class LanguageConfigFactoryOverrideTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['system', 'language'];
+
+  /**
+   * Tests language.config_factory_override service has the default language.
+   */
+  public function testLanguageConfigFactoryOverride() {
+    $this->installConfig('system');
+    $this->installConfig('language');
+
+    /** @var \Drupal\language\Config\LanguageConfigFactoryOverride $config_factory_override */
+    $config_factory_override = \Drupal::service('language.config_factory_override');
+    $this->assertEquals('en', $config_factory_override->getLanguage()->getId());
+
+    ConfigurableLanguage::createFromLangcode('de')->save();
+
+    // Invalidate the container.
+    $this->config('system.site')->set('default_langcode', 'de')->save();
+    drupal_flush_all_caches();
+
+    $config_factory_override = \Drupal::service('language.config_factory_override');
+    $this->assertEquals('de', $config_factory_override->getLanguage()->getId());
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/LanguageConfigOverrideInstallTest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Ensures the language config overrides can be installed.
+ *
+ * @group language
+ */
+class LanguageConfigOverrideInstallTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['language', 'config_events_test'];
+
+  /**
+   * Tests the configuration events are not fired during install of overrides.
+   */
+  public function testLanguageConfigOverrideInstall() {
+    ConfigurableLanguage::createFromLangcode('de')->save();
+    // Need to enable test module after creating the language otherwise saving
+    // the language will install the configuration.
+    $this->enableModules(['language_config_override_test']);
+    \Drupal::state()->set('config_events_test.event', FALSE);
+    $this->installConfig(['language_config_override_test']);
+    $event_recorder = \Drupal::state()->get('config_events_test.event', FALSE);
+    $this->assertFalse($event_recorder);
+    $config = \Drupal::service('language.config_factory_override')->getOverride('de', 'language_config_override_test.settings');
+    $this->assertEqual($config->get('name'), 'Deutsch');
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\language\Exception\DeleteDefaultLanguageException;
+
+/**
+ * Compares the default language from $GLOBALS against the dependency injected
+ * language object.
+ *
+ * @group language
+ */
+class LanguageDependencyInjectionTest extends LanguageTestBase {
+
+  /**
+   * Test dependency injected languages against a new Language object.
+   *
+   * @see \Drupal\Core\Language\LanguageInterface
+   */
+  public function testDependencyInjectedNewLanguage() {
+    $expected = $this->languageManager->getDefaultLanguage();
+    $result = $this->languageManager->getCurrentLanguage();
+    foreach ($expected as $property => $value) {
+      $this->assertEqual($expected->$property, $result->$property, format_string('The dependency injected language object %prop property equals the new Language object %prop property.', ['%prop' => $property]));
+    }
+  }
+
+  /**
+   * Test dependency injected Language object against a new default language
+   * object.
+   *
+   * @see \Drupal\Core\Language\Language
+   */
+  public function testDependencyInjectedNewDefaultLanguage() {
+    $default_language = ConfigurableLanguage::load(\Drupal::languageManager()->getDefaultLanguage()->getId());
+    // Change the language default object to different values.
+    ConfigurableLanguage::createFromLangcode('fr')->save();
+    $this->config('system.site')->set('default_langcode', 'fr')->save();
+
+    // The language system creates a Language object which contains the
+    // same properties as the new default language object.
+    $result = \Drupal::languageManager()->getCurrentLanguage();
+    $this->assertIdentical($result->getId(), 'fr');
+
+    // Delete the language to check that we fallback to the default.
+    try {
+      entity_delete_multiple('configurable_language', ['fr']);
+      $this->fail('Expected DeleteDefaultLanguageException thrown.');
+    }
+    catch (DeleteDefaultLanguageException $e) {
+      $this->pass('Expected DeleteDefaultLanguageException thrown.');
+    }
+
+    // Re-save the previous default language and the delete should work.
+    $this->config('system.site')->set('default_langcode', $default_language->getId())->save();
+
+    entity_delete_multiple('configurable_language', ['fr']);
+    $result = \Drupal::languageManager()->getCurrentLanguage();
+    $this->assertIdentical($result->getId(), $default_language->getId());
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/LanguageFallbackTest.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+/**
+ * Tests the language fallback behavior.
+ *
+ * @group language
+ */
+class LanguageFallbackTest extends LanguageTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $i = 0;
+    foreach (['af', 'am', 'ar'] as $langcode) {
+      $language = ConfigurableLanguage::createFromLangcode($langcode);
+      $language->set('weight', $i--);
+      $language->save();
+    }
+  }
+
+  /**
+   * Tests language fallback candidates.
+   */
+  public function testCandidates() {
+    $language_list = $this->languageManager->getLanguages();
+    $expected = array_keys($language_list + [LanguageInterface::LANGCODE_NOT_SPECIFIED => NULL]);
+
+    // Check that language fallback candidates by default are all the available
+    // languages sorted by weight.
+    $candidates = $this->languageManager->getFallbackCandidates();
+    $this->assertEqual(array_values($candidates), $expected, 'Language fallback candidates are properly returned.');
+
+    // Check that candidates are alterable.
+    $this->state->set('language_test.fallback_alter.candidates', TRUE);
+    $expected = array_slice($expected, 0, count($expected) - 1);
+    $candidates = $this->languageManager->getFallbackCandidates();
+    $this->assertEqual(array_values($candidates), $expected, 'Language fallback candidates are alterable.');
+
+    // Check that candidates are alterable for specific operations.
+    $this->state->set('language_test.fallback_alter.candidates', FALSE);
+    $this->state->set('language_test.fallback_operation_alter.candidates', TRUE);
+    $expected[] = LanguageInterface::LANGCODE_NOT_SPECIFIED;
+    $expected[] = LanguageInterface::LANGCODE_NOT_APPLICABLE;
+    $candidates = $this->languageManager->getFallbackCandidates(['operation' => 'test']);
+    $this->assertEqual(array_values($candidates), $expected, 'Language fallback candidates are alterable for specific operations.');
+
+    // Check that when the site is monolingual no language fallback is applied.
+    $langcodes_to_delete = [];
+    foreach ($language_list as $langcode => $language) {
+      if (!$language->isDefault()) {
+        $langcodes_to_delete[] = $langcode;
+      }
+    }
+    entity_delete_multiple('configurable_language', $langcodes_to_delete);
+    $candidates = $this->languageManager->getFallbackCandidates();
+    $this->assertEqual(array_values($candidates), [LanguageInterface::LANGCODE_DEFAULT], 'Language fallback is not applied when the Language module is not enabled.');
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/LanguageSelectWidgetTest.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel;
+
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Tests the language select widget.
+ *
+ * @group language
+ */
+class LanguageSelectWidgetTest extends KernelTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'entity_test',
+    'language',
+    'user',
+    'system',
+  ];
+
+  /**
+   * The entity form display.
+   *
+   * @var \Drupal\Core\Entity\Entity\EntityFormDisplay
+   */
+  protected $entityFormDisplay;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installEntitySchema('entity_test');
+    $this->installEntitySchema('user');
+
+    $storage = $this->container->get('entity_type.manager')->getStorage('entity_form_display');
+    $this->entityFormDisplay = $storage->create([
+      'targetEntityType' => 'entity_test',
+      'bundle' => 'entity_test',
+      'mode' => 'default',
+      'status' => TRUE,
+    ]);
+  }
+
+  /**
+   * Tests the widget with the locked languages.
+   */
+  public function testWithIncludedLockedLanguage() {
+    $this->entityFormDisplay->setComponent('langcode', [
+      'type' => 'language_select',
+    ])->save();
+    $entity = EntityTest::create(['name' => $this->randomString()]);
+    $form = $this->container->get('entity.form_builder')->getForm($entity);
+    $options = array_keys($form['langcode']['widget'][0]['value']['#options']);
+    $this->assertSame(['en', 'und', 'zxx'], $options);
+  }
+
+  /**
+   * Test the widget without the locked languages.
+   */
+  public function testWithoutIncludedLockedLanguage() {
+    $this->entityFormDisplay->setComponent('langcode', [
+      'type' => 'language_select',
+      'settings' => ['include_locked' => FALSE],
+    ])->save();
+    $entity = EntityTest::create(['name' => $this->randomString()]);
+    $form = $this->container->get('entity.form_builder')->getForm($entity);
+    $options = array_keys($form['langcode']['widget'][0]['value']['#options']);
+    $this->assertSame(['en'], $options);
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/LanguageTestBase.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * Test for dependency injected language object.
+ */
+abstract class LanguageTestBase extends KernelTestBase {
+
+  public static $modules = ['system', 'language', 'language_test'];
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * The state storage service.
+   *
+   * @var \Drupal\Core\State\StateInterface
+   */
+  protected $state;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(['language']);
+
+    $this->state = $this->container->get('state');
+
+    // Ensure we are building a new Language object for each test.
+    $this->languageManager = $this->container->get('language_manager');
+    $this->languageManager->reset();
+  }
+
+}

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

@@ -0,0 +1,89 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Migrate\d6;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests the default language variable migration.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateDefaultLanguageTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language'];
+
+  /**
+   * Tests language_default migration with an existing language.
+   */
+  public function testMigrationWithExistingLanguage() {
+    $this->setDefaultLanguage('fr');
+    $this->startCollectingMessages();
+    $this->executeMigrations(['language', 'default_language']);
+
+    // Tests the language is loaded and is the default language.
+    $default_language = ConfigurableLanguage::load('fr');
+    $this->assertNotNull($default_language);
+    $this->assertSame('fr', $this->config('system.site')->get('default_langcode'));
+  }
+
+  /**
+   * Tests language_default migration with a non-existing language.
+   */
+  public function testMigrationWithNonExistentLanguage() {
+    $this->setDefaultLanguage('tv');
+    $this->startCollectingMessages();
+    $this->executeMigrations(['language', 'default_language']);
+
+    // Tests the migration log contains an error message.
+    $messages = $this->migration->getIdMap()->getMessageIterator();
+    $count = 0;
+    foreach ($messages as $message) {
+      $count++;
+      $this->assertSame("The language 'tv' does not exist on this site.", $message->message);
+      $this->assertSame(MigrationInterface::MESSAGE_ERROR, (int) $message->level);
+    }
+    $this->assertSame(1, $count);
+  }
+
+  /**
+   * Tests language_default migration with unset default language variable.
+   */
+  public function testMigrationWithUnsetVariable() {
+    // Delete the language_default variable.
+    $this->sourceDatabase->delete('variable')
+      ->condition('name', 'language_default')
+      ->execute();
+    $this->startCollectingMessages();
+    $this->executeMigrations(['language', 'default_language']);
+
+    $messages = $this->migration->getIdMap()->getMessageIterator()->fetchAll();
+    // Make sure there's no migration exceptions.
+    $this->assertEmpty($messages);
+    // Make sure the default langcode is 'en', as it was the default on D6 & D7.
+    $this->assertSame('en', $this->config('system.site')->get('default_langcode'));
+  }
+
+  /**
+   * Helper method to test the migration.
+   *
+   * @param string $langcode
+   *   The langcode of the default language.
+   */
+  protected function setDefaultLanguage($langcode) {
+    // 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(['value' => $value])
+      ->condition('name', 'language_default')
+      ->execute();
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentMenuSettingsTest.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Migrate\d6;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\language\Entity\ContentLanguageSettings;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests migration of the ability to translate menu content.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateLanguageContentMenuSettingsTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'language',
+    'content_translation',
+    'menu_link_content',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    // Create some languages.
+    ConfigurableLanguage::createFromLangcode('en')->save();
+    ConfigurableLanguage::createFromLangcode('fr')->save();
+    $this->executeMigrations(['d6_language_content_menu_settings']);
+  }
+
+  /**
+   * Tests migration of menu translation ability.
+   */
+  public function testLanguageMenuContent() {
+    $config = ContentLanguageSettings::load('menu_link_content.menu_link_content');
+    $this->assertInstanceOf(ContentLanguageSettings::class, $config);
+    $this->assertSame('menu_link_content', $config->getTargetEntityTypeId());
+    $this->assertSame('menu_link_content', $config->getTargetBundle());
+    $this->assertSame(LanguageInterface::LANGCODE_SITE_DEFAULT, $config->getDefaultLangcode());
+    $this->assertTrue($config->isLanguageAlterable());
+
+    // Test that menus are not alterable when the i18nmenu is not enabled.
+    $this->sourceDatabase->update('system')
+      ->fields(['status' => 0])
+      ->condition('name', 'i18nmenu')
+      ->execute();
+
+    /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
+    $migration = $this->getMigration('d6_language_content_menu_settings');
+    // Indicate we're rerunning a migration that's already run.
+    $migration->getIdMap()->prepareUpdate();
+    $this->executeMigration($migration);
+
+    $config = ContentLanguageSettings::load('menu_link_content.menu_link_content');
+    $this->assertInstanceOf(ContentLanguageSettings::class, $config);
+    $this->assertSame('menu_link_content', $config->getTargetEntityTypeId());
+    $this->assertSame('menu_link_content', $config->getTargetBundle());
+    $this->assertSame(LanguageInterface::LANGCODE_SITE_DEFAULT, $config->getDefaultLangcode());
+    $this->assertFalse($config->isLanguageAlterable());
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Migrate\d6;
+
+use Drupal\language\Entity\ContentLanguageSettings;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests migration of language content setting variables,
+ * language_content_type_$type, i18n_node_options_* and i18n_lock_node_*.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateLanguageContentSettingsTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'text', 'language', 'content_translation', 'menu_ui'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(['node']);
+    $this->installEntitySchema('node');
+    $this->executeMigrations(['d6_node_type', 'd6_language_content_settings']);
+  }
+
+  /**
+   * Tests migration of content language settings.
+   */
+  public function testLanguageContent() {
+    // Assert that a translatable content is still translatable.
+    $config = $this->config('language.content_settings.node.article');
+    $this->assertSame($config->get('target_entity_type_id'), 'node');
+    $this->assertSame($config->get('target_bundle'), 'article');
+    $this->assertSame($config->get('default_langcode'), 'current_interface');
+    $this->assertTrue($config->get('third_party_settings.content_translation.enabled'));
+
+    // Assert that a non-translatable content is not translatable.
+    $config = ContentLanguageSettings::loadByEntityTypeBundle('node', 'company');
+    $this->assertTrue($config->isDefaultConfiguration());
+    $this->assertFalse($config->isLanguageAlterable());
+    $this->assertSame($config->getDefaultLangcode(), 'site_default');
+  }
+
+  /**
+   * Tests migration of content language settings when there is no language lock.
+   */
+  public function testLanguageContentWithNoLanguageLock() {
+    // Assert that a we can assign a language.
+    $config = ContentLanguageSettings::loadByEntityTypeBundle('node', 'employee');
+    $this->assertSame($config->getDefaultLangcode(), 'current_interface');
+    $this->assertTrue($config->isLanguageAlterable());
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentTaxonomyVocabularySettingsTest.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Migrate\d6;
+
+use Drupal\language\Entity\ContentLanguageSettings;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests migration of i18ntaxonomy vocabulary settings.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateLanguageContentTaxonomyVocabularySettingsTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'language',
+    'content_translation',
+    'taxonomy',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installEntitySchema('taxonomy_term');
+    $this->executeMigrations([
+      'language',
+      'd6_taxonomy_vocabulary',
+      'd6_language_content_taxonomy_vocabulary_settings',
+    ]);
+  }
+
+  /**
+   * Tests migration of 18ntaxonomy vocabulary settings.
+   */
+  public function testLanguageContentTaxonomy() {
+    $target_entity = 'taxonomy_term';
+    // Per Language.
+    $this->assertLanguageContentSettings($target_entity, 'vocabulary_1_i_0_', LanguageInterface::LANGCODE_SITE_DEFAULT, TRUE, ['enabled' => FALSE]);
+    // Set language to vocabulary.
+    $this->assertLanguageContentSettings($target_entity, 'vocabulary_2_i_1_', 'fr', FALSE, ['enabled' => FALSE]);
+    // Localize terms.
+    $this->assertLanguageContentSettings($target_entity, 'vocabulary_3_i_2_', LanguageInterface::LANGCODE_SITE_DEFAULT, TRUE, ['enabled' => FALSE]);
+    // None translation enabled.
+    $this->assertLanguageContentSettings($target_entity, 'vocabulary_name_much_longer_than', LanguageInterface::LANGCODE_SITE_DEFAULT, TRUE, ['enabled' => TRUE]);
+    $this->assertLanguageContentSettings($target_entity, 'tags', LanguageInterface::LANGCODE_SITE_DEFAULT, FALSE, ['enabled' => FALSE]);
+    $this->assertLanguageContentSettings($target_entity, 'forums', LanguageInterface::LANGCODE_SITE_DEFAULT, FALSE, ['enabled' => FALSE]);
+    $this->assertLanguageContentSettings($target_entity, 'type', LanguageInterface::LANGCODE_SITE_DEFAULT, FALSE, ['enabled' => FALSE]);
+  }
+
+  /**
+   * Asserts a content language settings configuration.
+   *
+   * @param string $target_entity
+   *   The expected target entity type.
+   * @param string $bundle
+   *   The expected bundle.
+   * @param string $default_langcode
+   *   The default language code.
+   * @param bool $language_alterable
+   *   The expected state of language alterable.
+   * @param array $third_party_settings
+   *   The content translation setting.
+   */
+  public function assertLanguageContentSettings($target_entity, $bundle, $default_langcode, $language_alterable, array $third_party_settings) {
+    $config = ContentLanguageSettings::load($target_entity . "." . $bundle);
+    $this->assertInstanceOf(ContentLanguageSettings::class, $config);
+    $this->assertSame($target_entity, $config->getTargetEntityTypeId());
+    $this->assertSame($bundle, $config->getTargetBundle());
+    $this->assertSame($default_langcode, $config->getDefaultLangcode());
+    $this->assertSame($language_alterable, $config->isLanguageAlterable());
+    $this->assertSame($third_party_settings, $config->getThirdPartySettings('content_translation'));
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageNegotiationSettingsTest.php

@@ -0,0 +1,167 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Migrate\d6;
+
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
+use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
+
+/**
+ * Tests the migration of language negotiation and language types.
+ *
+ * @group migrate_drupal_6
+ */
+class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal6TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language'];
+
+  /**
+   * Tests the migration with LANGUAGE_NEGOTIATION_PATH_DEFAULT.
+   */
+  public function testLanguageNegotiationWithDefaultPathPrefix() {
+    $this->executeMigrations([
+      'language',
+      'd6_language_negotiation_settings',
+      'language_prefixes_and_domains',
+      'd6_language_types',
+    ]);
+
+    $config = $this->config('language.negotiation');
+    $this->assertSame('language', $config->get('session.parameter'));
+    $this->assertSame(LanguageNegotiationUrl::CONFIG_PATH_PREFIX, $config->get('url.source'));
+    $this->assertSame('site_default', $config->get('selected_langcode'));
+    $expected_prefixes = [
+      'en' => '',
+      'fr' => 'fr',
+      'zu' => 'zu',
+    ];
+    $this->assertSame($expected_prefixes, $config->get('url.prefixes'));
+
+    $config = $this->config('language.types');
+    $this->assertSame(['language_interface', 'language_content', 'language_url'], $config->get('all'));
+    $this->assertSame(['language_interface'], $config->get('configurable'));
+    $this->assertSame(['language-interface' => 0], $config->get('negotiation.language_content.enabled'));
+    $this->assertSame(['language-url' => 0, 'language-url-fallback' => 1], $config->get('negotiation.language_url.enabled'));
+    $expected_language_interface = [
+      'language-url' => 0,
+      'language-selected' => 1,
+    ];
+    $this->assertSame($expected_language_interface, $config->get('negotiation.language_interface.enabled'));
+  }
+
+  /**
+   * Tests the migration with LANGUAGE_NEGOTIATION_NONE.
+   */
+  public function testLanguageNegotiationWithNoNegotiation() {
+    $this->sourceDatabase->update('variable')
+      ->fields(['value' => serialize(0)])
+      ->condition('name', 'language_negotiation')
+      ->execute();
+
+    $this->executeMigrations([
+      'language',
+      'd6_language_negotiation_settings',
+      'language_prefixes_and_domains',
+      'd6_language_types',
+    ]);
+
+    $config = $this->config('language.negotiation');
+    $this->assertSame('language', $config->get('session.parameter'));
+    $this->assertSame(LanguageNegotiationUrl::CONFIG_PATH_PREFIX, $config->get('url.source'));
+    $this->assertSame('site_default', $config->get('selected_langcode'));
+
+    $config = $this->config('language.types');
+    $this->assertSame(['language_interface', 'language_content', 'language_url'], $config->get('all'));
+    $this->assertSame(['language_interface'], $config->get('configurable'));
+    $this->assertSame(['language-interface' => 0], $config->get('negotiation.language_content.enabled'));
+    $this->assertSame(['language-url' => 0, 'language-url-fallback' => 1], $config->get('negotiation.language_url.enabled'));
+    $expected_language_interface = [
+      'language-selected' => 0,
+    ];
+    $this->assertSame($expected_language_interface, $config->get('negotiation.language_interface.enabled'));
+  }
+
+  /**
+   * Tests the migration with LANGUAGE_NEGOTIATION_PATH.
+   */
+  public function testLanguageNegotiationWithPathPrefix() {
+    $this->sourceDatabase->update('variable')
+      ->fields(['value' => serialize(2)])
+      ->condition('name', 'language_negotiation')
+      ->execute();
+
+    $this->executeMigrations([
+      'language',
+      'd6_language_negotiation_settings',
+      'language_prefixes_and_domains',
+      'd6_language_types',
+    ]);
+
+    $config = $this->config('language.negotiation');
+    $this->assertSame('language', $config->get('session.parameter'));
+    $this->assertSame(LanguageNegotiationUrl::CONFIG_PATH_PREFIX, $config->get('url.source'));
+    $this->assertSame('site_default', $config->get('selected_langcode'));
+    $expected_prefixes = [
+      'en' => '',
+      'fr' => 'fr',
+      'zu' => 'zu',
+    ];
+    $this->assertSame($expected_prefixes, $config->get('url.prefixes'));
+
+    $config = $this->config('language.types');
+    $this->assertSame(['language_interface', 'language_content', 'language_url'], $config->get('all'));
+    $this->assertSame(['language_interface'], $config->get('configurable'));
+    $this->assertSame(['language-interface' => 0], $config->get('negotiation.language_content.enabled'));
+    $this->assertSame(['language-url' => 0, 'language-url-fallback' => 1], $config->get('negotiation.language_url.enabled'));
+    $expected_language_interface = [
+      'language-url' => 0,
+      'language-user' => 1,
+      'language-browser' => 2,
+      'language-selected' => 3,
+    ];
+    $this->assertSame($expected_language_interface, $config->get('negotiation.language_interface.enabled'));
+  }
+
+  /**
+   * Tests the migration with LANGUAGE_NEGOTIATION_DOMAIN.
+   */
+  public function testLanguageNegotiationWithDomain() {
+    $this->sourceDatabase->update('variable')
+      ->fields(['value' => serialize(3)])
+      ->condition('name', 'language_negotiation')
+      ->execute();
+
+    $this->executeMigrations([
+      'language',
+      'd6_language_negotiation_settings',
+      'language_prefixes_and_domains',
+      'd6_language_types',
+    ]);
+
+    global $base_url;
+    $config = $this->config('language.negotiation');
+    $this->assertSame('language', $config->get('session.parameter'));
+    $this->assertSame(LanguageNegotiationUrl::CONFIG_DOMAIN, $config->get('url.source'));
+    $this->assertSame('site_default', $config->get('selected_langcode'));
+    $expected_domains = [
+      'en' => parse_url($base_url, PHP_URL_HOST),
+      'fr' => 'fr.drupal.org',
+      'zu' => 'zu.drupal.org',
+    ];
+    $this->assertSame($expected_domains, $config->get('url.domains'));
+
+    $config = $this->config('language.types');
+    $this->assertSame(['language_interface', 'language_content', 'language_url'], $config->get('all'));
+    $this->assertSame(['language_interface'], $config->get('configurable'));
+    $this->assertSame(['language-interface' => 0], $config->get('negotiation.language_content.enabled'));
+    $this->assertSame(['language-url' => 0, 'language-url-fallback' => 1], $config->get('negotiation.language_url.enabled'));
+    $expected_language_interface = [
+      'language-url' => 0,
+      'language-selected' => 1,
+    ];
+    $this->assertSame($expected_language_interface, $config->get('negotiation.language_interface.enabled'));
+  }
+
+}

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

@@ -0,0 +1,89 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Migrate\d7;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests the default language variable migration.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateDefaultLanguageTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language'];
+
+  /**
+   * Tests language_default migration with a non-existing language.
+   */
+  public function testMigrationWithExistingLanguage() {
+    $this->setDefaultLanguage('is');
+    $this->startCollectingMessages();
+    $this->executeMigrations(['language', 'default_language']);
+
+    // Tests the language is loaded and is the default language.
+    $default_language = ConfigurableLanguage::load('is');
+    $this->assertNotNull($default_language);
+    $this->assertSame('is', $this->config('system.site')->get('default_langcode'));
+  }
+
+  /**
+   * Tests language_default migration with a non-existing language.
+   */
+  public function testMigrationWithNonExistentLanguage() {
+    $this->setDefaultLanguage('tv');
+    $this->startCollectingMessages();
+    $this->executeMigrations(['language', 'default_language']);
+
+    // Tests the migration log contains an error message.
+    $messages = $this->migration->getIdMap()->getMessageIterator();
+    $count = 0;
+    foreach ($messages as $message) {
+      $count++;
+      $this->assertSame("The language 'tv' does not exist on this site.", $message->message);
+      $this->assertSame(MigrationInterface::MESSAGE_ERROR, (int) $message->level);
+    }
+    $this->assertSame(1, $count);
+  }
+
+  /**
+   * Tests language_default migration with unset default language variable.
+   */
+  public function testMigrationWithUnsetVariable() {
+    // Delete the language_default variable.
+    $this->sourceDatabase->delete('variable')
+      ->condition('name', 'language_default')
+      ->execute();
+    $this->startCollectingMessages();
+    $this->executeMigrations(['language', 'default_language']);
+
+    $messages = $this->migration->getIdMap()->getMessageIterator()->fetchAll();
+    // Make sure there's no migration exceptions.
+    $this->assertEmpty($messages);
+    // Make sure the default langcode is 'en', as it was the default on D6 & D7.
+    $this->assertSame('en', $this->config('system.site')->get('default_langcode'));
+  }
+
+  /**
+   * Helper method to test the migration.
+   *
+   * @param string $langcode
+   *   The langcode of the default language.
+   */
+  protected function setDefaultLanguage($langcode) {
+    // 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(['value' => $value])
+      ->condition('name', 'language_default')
+      ->execute();
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Migrate\d7;
+
+use Drupal\language\Entity\ContentLanguageSettings;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests migration of language content setting variables,
+ * language_content_type_$type, i18n_node_options_* and i18n_lock_node_*.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateLanguageContentSettingsTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['node', 'text', 'language', 'content_translation', 'menu_ui'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->installConfig(['node']);
+    $this->installEntitySchema('node');
+    $this->executeMigrations(['d7_node_type', 'd7_language_content_settings']);
+  }
+
+  /**
+   * Tests migration of content language settings.
+   */
+  public function testLanguageContent() {
+    // Assert that a translatable content is still translatable.
+    $config = $this->config('language.content_settings.node.blog');
+    $this->assertSame($config->get('target_entity_type_id'), 'node');
+    $this->assertSame($config->get('target_bundle'), 'blog');
+    $this->assertSame($config->get('default_langcode'), 'current_interface');
+    $this->assertFalse($config->get('language_alterable'));
+    $this->assertTrue($config->get('third_party_settings.content_translation.enabled'));
+
+    // Assert that a non-translatable content is not translatable.
+    $config = ContentLanguageSettings::loadByEntityTypeBundle('node', 'page');
+    $this->assertTrue($config->isDefaultConfiguration());
+    $this->assertFalse($config->isLanguageAlterable());
+    $this->assertSame($config->getDefaultLangcode(), 'site_default');
+
+    // Make sure there's no migration exceptions.
+    $messages = $this->migration->getIdMap()->getMessageIterator()->fetchAll();
+    $this->assertEmpty($messages);
+
+    // Assert that a content type translatable with entity_translation is still
+    // translatable.
+    $config = $this->config('language.content_settings.node.test_content_type');
+    $this->assertTrue($config->get('third_party_settings.content_translation.enabled'));
+    $this->assertSame($config->get('default_langcode'), 'und');
+
+    // Assert that a content type without a 'language_content_type' variable is
+    // not translatable
+    $config = ContentLanguageSettings::loadByEntityTypeBundle('node', 'book');
+    $this->assertTrue($config->isDefaultConfiguration());
+    $this->assertFalse($config->isLanguageAlterable());
+    $this->assertSame($config->getDefaultLangcode(), 'site_default');
+
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageNegotiationSettingsTest.php

@@ -0,0 +1,142 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Migrate\d7;
+
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
+use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
+
+/**
+ * Tests the migration of language negotiation.
+ *
+ * @group migrate_drupal_7
+ */
+class MigrateLanguageNegotiationSettingsTest extends MigrateDrupal7TestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language'];
+
+  /**
+   * Tests migration of language types variables to language.types.yml.
+   */
+  public function testLanguageTypes() {
+    $this->executeMigrations([
+      'language',
+      'd7_language_negotiation_settings',
+      'd7_language_types',
+    ]);
+
+    $config = $this->config('language.types');
+    $this->assertSame(['language_content', 'language_url', 'language_interface'], $config->get('all'));
+    $this->assertSame(['language_interface'], $config->get('configurable'));
+    $this->assertSame(['enabled' => ['language-interface' => 0]], $config->get('negotiation.language_content'));
+    $this->assertSame(['enabled' => ['language-url' => 0, 'language-url-fallback' => 1]], $config->get('negotiation.language_url'));
+    $expected_language_interface = [
+      'enabled' => [
+        'language-url' => -9,
+        'language-user' => -10,
+        'language-selected' => -6,
+      ],
+      'method_weights' => [
+        'language-url' => -9,
+        'language-session' => -8,
+        'language-user' => -10,
+        'language-browser' => -7,
+        'language-selected' => -6,
+      ],
+    ];
+    $this->assertSame($expected_language_interface, $config->get('negotiation.language_interface'));
+  }
+
+  /**
+   * Tests the migration with prefix negotiation.
+   */
+  public function testLanguageNegotiationWithPrefix() {
+    $this->sourceDatabase->update('languages')
+      ->fields(['domain' => ''])
+      ->execute();
+
+    $this->executeMigrations([
+      'language',
+      'd7_language_negotiation_settings',
+      'language_prefixes_and_domains',
+    ]);
+
+    $config = $this->config('language.negotiation');
+    $this->assertSame('language', $config->get('session.parameter'));
+    $this->assertSame(LanguageNegotiationUrl::CONFIG_PATH_PREFIX, $config->get('url.source'));
+    $this->assertSame('site_default', $config->get('selected_langcode'));
+    $expected_prefixes = [
+      'en' => '',
+      'fr' => 'fr',
+      'is' => 'is',
+    ];
+    $this->assertSame($expected_prefixes, $config->get('url.prefixes'));
+
+    // If prefix negotiation is used, make sure that no domains are migrated.
+    // Otherwise there will be validation errors when trying to save URL
+    // language detection configuration from the UI.
+    $expected_domains = [
+      'en' => '',
+      'fr' => '',
+      'is' => '',
+    ];
+    $this->assertSame($expected_domains, $config->get('url.domains'));
+  }
+
+  /**
+   * Tests the migration with domain negotiation.
+   */
+  public function testLanguageNegotiationWithDomain() {
+    $this->sourceDatabase->update('variable')
+      ->fields(['value' => serialize(1)])
+      ->condition('name', 'locale_language_negotiation_url_part')
+      ->execute();
+
+    $this->executeMigrations([
+      'language',
+      'd7_language_negotiation_settings',
+      'language_prefixes_and_domains',
+    ]);
+
+    global $base_url;
+    $config = $this->config('language.negotiation');
+    $this->assertSame('language', $config->get('session.parameter'));
+    $this->assertSame(LanguageNegotiationUrl::CONFIG_DOMAIN, $config->get('url.source'));
+    $this->assertSame('site_default', $config->get('selected_langcode'));
+    $expected_domains = [
+      'en' => parse_url($base_url, PHP_URL_HOST),
+      'fr' => 'fr.drupal.org',
+      'is' => 'is.drupal.org',
+    ];
+    $this->assertSame($expected_domains, $config->get('url.domains'));
+  }
+
+  /**
+   * Tests the migration with non-existent variables.
+   */
+  public function testLanguageNegotiationWithNonExistentVariables() {
+    $this->sourceDatabase->delete('variable')
+      ->condition('name', ['local_language_negotiation_url_part', 'local_language_negotiation_session_param'], 'IN')
+      ->execute();
+
+    $this->executeMigrations([
+      'language',
+      'd6_language_negotiation_settings',
+      'language_prefixes_and_domains',
+    ]);
+
+    $config = $this->config('language.negotiation');
+    $this->assertSame('language', $config->get('session.parameter'));
+    $this->assertSame(LanguageNegotiationUrl::CONFIG_PATH_PREFIX, $config->get('url.source'));
+    $this->assertSame('site_default', $config->get('selected_langcode'));
+    $expected_prefixes = [
+      'en' => '',
+      'fr' => 'fr',
+      'is' => 'is',
+    ];
+    $this->assertSame($expected_prefixes, $config->get('url.prefixes'));
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Plugin/migrate/source/LanguageTest.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Plugin\migrate\source;
+
+use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
+
+/**
+ * Tests the language source plugin.
+ *
+ * @covers \Drupal\language\Plugin\migrate\source\Language
+ * @group language
+ */
+class LanguageTest extends MigrateSqlSourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language', 'migrate_drupal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providerSource() {
+    $tests = [];
+
+    // The source data.
+    $tests[0]['source_data']['languages'] = [
+      [
+        'language' => 'en',
+        'name' => 'English',
+        'native' => 'English',
+        'direction' => '0',
+        'enabled' => '1',
+        'plurals' => '0',
+        'formula' => '',
+        'domain' => '',
+        'prefix' => '',
+        'weight' => '0',
+        'javascript' => '',
+      ],
+      [
+        'language' => 'fr',
+        'name' => 'French',
+        'native' => 'Français',
+        'direction' => '0',
+        'enabled' => '0',
+        'plurals' => '2',
+        'formula' => '($n>1)',
+        'domain' => '',
+        'prefix' => 'fr',
+        'weight' => '0',
+        'javascript' => '',
+      ],
+    ];
+
+    // The expected results.
+    $tests[0]['expected_data'] = [
+      [
+        'language' => 'en',
+        'name' => 'English',
+        'native' => 'English',
+        'direction' => '0',
+        'enabled' => '1',
+        'plurals' => '0',
+        'formula' => '',
+        'domain' => '',
+        'prefix' => '',
+        'weight' => '0',
+        'javascript' => '',
+      ],
+      [
+        'language' => 'fr',
+        'name' => 'French',
+        'native' => 'Français',
+        'direction' => '0',
+        'enabled' => '0',
+        'plurals' => '2',
+        'formula' => '($n>1)',
+        'domain' => '',
+        'prefix' => 'fr',
+        'weight' => '0',
+        'javascript' => '',
+      ],
+    ];
+
+    return $tests;
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Plugin/migrate/source/d6/LanguageContentSettingsTest.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Plugin\migrate\source\d6;
+
+use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
+
+/**
+ * Tests menu source plugin.
+ *
+ * @covers \Drupal\language\Plugin\migrate\source\d6\LanguageContentSettings
+ *
+ * @group language
+ */
+class LanguageContentSettingsTest extends MigrateSqlSourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language', 'migrate_drupal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providerSource() {
+    $tests = [];
+
+    // The source data.
+    $tests[0]['source_data']['node_type'] = [
+      [
+        'type' => 'article',
+        'name' => 'Article',
+        'module' => 'node',
+        'description' => 'An <em>article</em>, content type.',
+        'help' => '',
+        'has_title' => 1,
+        'title_label' => 'Title',
+        'has_body' => 1,
+        'body_label' => 'Body',
+        'min_word_count' => 0,
+        'custom' => 1,
+        'modified' => 1,
+        'locked' => 0,
+        'orig_type' => 'story',
+      ],
+      [
+        'type' => 'company',
+        'name' => 'Company',
+        'module' => 'node',
+        'description' => 'Company node type',
+        'help' => '',
+        'has_title' => 1,
+        'title_label' => 'Name',
+        'has_body' => 1,
+        'body_label' => 'Description',
+        'min_word_count' => 0,
+        'custom' => 0,
+        'modified' => 1,
+        'locked' => 0,
+        'orig_type' => 'company',
+      ],
+    ];
+
+    foreach ($tests[0]['source_data']['node_type'] as $node_type) {
+      $tests[0]['expected_data'][] = [
+        'type' => $node_type['type'],
+        'language_content_type' => NULL,
+        'i18n_lock_node' => 0,
+      ];
+    }
+
+    return $tests;
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Plugin/migrate/source/d6/LanguageContentTaxonomyVocabularySettingsTest.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Plugin\migrate\source\d6;
+
+use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
+
+/**
+ * Tests i18ntaxonomy vocabulary setting source plugin.
+ *
+ * @covers \Drupal\language\Plugin\migrate\source\d6\LanguageContentSettingsTaxonomyVocabulary
+ *
+ * @group language
+ */
+class LanguageContentTaxonomyVocabularySettingsTest extends MigrateSqlSourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['taxonomy', 'language', 'migrate_drupal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providerSource() {
+    $tests = [];
+
+    // The source data.
+    $tests[0]['source_data']['vocabulary'] = [
+      [
+        'vid' => 1,
+        'name' => 'Tags',
+        'description' => 'Tags description.',
+        'help' => 1,
+        'relations' => 0,
+        'hierarchy' => 0,
+        'multiple' => 0,
+        'required' => 0,
+        'tags' => 1,
+        'module' => 'taxonomy',
+        'weight' => 0,
+        'language' => '',
+      ],
+      [
+        'vid' => 2,
+        'name' => 'Categories',
+        'description' => 'Categories description.',
+        'help' => 1,
+        'relations' => 1,
+        'hierarchy' => 1,
+        'multiple' => 0,
+        'required' => 1,
+        'tags' => 0,
+        'module' => 'taxonomy',
+        'weight' => 0,
+        'language' => 'zu',
+      ],
+    ];
+    $tests[0]['source_data']['variable'] = [
+      [
+        'name' => 'i18ntaxonomy_vocabulary',
+        'value' => 'a:4:{i:1;s:1:"3";i:2;s:1:"2";i:3;s:1:"3";i:5;s:1:"1";}',
+      ],
+    ];
+
+    $tests[0]['expected_data'] = [
+      [
+        'vid' => 1,
+        'language' => '',
+        'state' => 3,
+      ],
+      [
+        'vid' => 2,
+        'language' => 'zu',
+        'state' => 2,
+      ],
+    ];
+
+    return $tests;
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Plugin/migrate/source/d7/LanguageContentSettingsTest.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Plugin\migrate\source\d7;
+
+use Drupal\Tests\migrate\Kernel\MigrateSqlSourceTestBase;
+
+/**
+ * Tests menu source plugin.
+ *
+ * @covers \Drupal\language\Plugin\migrate\source\d7\LanguageContentSettings
+ *
+ * @group language
+ */
+class LanguageContentSettingsTest extends MigrateSqlSourceTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['language', 'migrate_drupal'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function providerSource() {
+    $tests = [];
+
+    // The source data.
+    $tests[0]['source_data']['node_type'] = [
+      [
+        'type' => 'article',
+        'name' => 'Article',
+        'base' => 'node_content',
+        'module' => 'node',
+        'description' => 'Use <em>articles</em> for time-sensitive content like news, press releases or blog posts.',
+        'help' => 'Help text for articles',
+        'has_title' => 1,
+        'title_label' => 'Title',
+        'custom' => 1,
+        'modified' => 1,
+        'locked' => 0,
+        'disabled' => 0,
+        'orig_type' => 'article',
+      ],
+      [
+        'type' => 'blog',
+        'name' => 'Blog entry',
+        'base' => 'blog',
+        'module' => 'blog',
+        'description' => 'Use for multi-user blogs. Every user gets a personal blog.',
+        'help' => 'Blog away, good sir!',
+        'has_title' => 1,
+        'title_label' => 'Title',
+        'custom' => 0,
+        'modified' => 1,
+        'locked' => 1,
+        'disabled' => 0,
+        'orig_type' => 'blog',
+      ],
+    ];
+
+    foreach ($tests[0]['source_data']['node_type'] as $node_type) {
+      $tests[0]['expected_data'][] = [
+        'type' => $node_type['type'],
+        'language_content_type' => NULL,
+        'i18n_lock_node' => 0,
+      ];
+    }
+
+    return $tests;
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Views/ArgumentLanguageTest.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Views;
+
+use Drupal\views\Views;
+
+/**
+ * Tests the argument language handler.
+ *
+ * @group language
+ * @see \Drupal\language\Plugin\views\argument\Language.php
+ */
+class ArgumentLanguageTest extends LanguageTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_view'];
+
+  /**
+   * Tests the language argument.
+   */
+  public function testArgument() {
+    $view = Views::getView('test_view');
+    foreach (['en' => 'John', 'xx-lolspeak' => 'George'] as $langcode => $name) {
+      $view->setDisplay();
+      $view->displayHandlers->get('default')->overrideOption('arguments', [
+        'langcode' => [
+          'id' => 'langcode',
+          'table' => 'views_test_data',
+          'field' => 'langcode',
+        ],
+      ]);
+      $this->executeView($view, [$langcode]);
+
+      $expected = [
+        ['name' => $name],
+      ];
+      $this->assertIdenticalResultset($view, $expected, ['views_test_data_name' => 'name']);
+      $view->destroy();
+    }
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Views/FieldLanguageTest.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Views;
+
+use Drupal\views\Views;
+
+/**
+ * Tests the field language handler.
+ *
+ * @group language
+ * @see \Drupal\language\Plugin\views\field\Language
+ */
+class FieldLanguageTest extends LanguageTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_view'];
+
+  /**
+   * Tests the language field.
+   */
+  public function testField() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+    $view->displayHandlers->get('default')->overrideOption('fields', [
+      'langcode' => [
+        'id' => 'langcode',
+        'table' => 'views_test_data',
+        'field' => 'langcode',
+      ],
+    ]);
+    $this->executeView($view);
+
+    $this->assertEqual($view->field['langcode']->advancedRender($view->result[0]), 'English');
+    $this->assertEqual($view->field['langcode']->advancedRender($view->result[1]), 'Lolspeak');
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Views/FilterLanguageTest.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Views;
+
+use Drupal\views\Views;
+
+/**
+ * Tests the filter language handler.
+ *
+ * @group language
+ * @see \Drupal\language\Plugin\views\filter\Language
+ */
+class FilterLanguageTest extends LanguageTestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_view'];
+
+  /**
+   * Tests the language filter.
+   */
+  public function testFilter() {
+    $view = Views::getView('test_view');
+    foreach (['en' => 'John', 'xx-lolspeak' => 'George'] as $langcode => $name) {
+      $view->setDisplay();
+      $view->displayHandlers->get('default')->overrideOption('filters', [
+        'langcode' => [
+          'id' => 'langcode',
+          'table' => 'views_test_data',
+          'field' => 'langcode',
+          'value' => [$langcode],
+        ],
+      ]);
+      $this->executeView($view);
+
+      $expected = [
+        ['name' => $name],
+      ];
+      $this->assertIdenticalResultset($view, $expected, ['views_test_data_name' => 'name']);
+
+      $expected = [
+        '***LANGUAGE_site_default***',
+        '***LANGUAGE_language_interface***',
+        '***LANGUAGE_language_content***',
+        'en',
+        'xx-lolspeak',
+        'und',
+        'zxx',
+      ];
+      $this->assertIdentical(array_keys($view->filter['langcode']->getValueOptions()), $expected);
+
+      $view->destroy();
+    }
+  }
+
+}

2017/web/core/modules/language/tests/src/Kernel/Views/LanguageTestBase.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace Drupal\Tests\language\Kernel\Views;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
+
+/**
+ * Defines the base class for all Language handler tests.
+ */
+abstract class LanguageTestBase extends ViewsKernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['system', 'language'];
+
+  protected function setUp($import_test_views = TRUE) {
+    parent::setUp();
+    $this->installConfig(['language']);
+
+    // Create another language beside English.
+    ConfigurableLanguage::create(['id' => 'xx-lolspeak', 'label' => 'Lolspeak'])->save();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function schemaDefinition() {
+    $schema = parent::schemaDefinition();
+    $schema['views_test_data']['fields']['langcode'] = [
+      'description' => 'The {language}.langcode of this beatle.',
+      'type' => 'varchar',
+      'length' => 12,
+      'default' => '',
+    ];
+
+    return $schema;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function viewsData() {
+    $data = parent::viewsData();
+    $data['views_test_data']['langcode'] = [
+      'title' => t('Langcode'),
+      'help' => t('Langcode'),
+      'field' => [
+        'id' => 'language',
+      ],
+      'argument' => [
+        'id' => 'language',
+      ],
+      'filter' => [
+        'id' => 'language',
+      ],
+    ];
+
+    return $data;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function dataSet() {
+    $data = parent::dataSet();
+    $data[0]['langcode'] = 'en';
+    $data[1]['langcode'] = 'xx-lolspeak';
+    $data[2]['langcode'] = '';
+    $data[3]['langcode'] = '';
+    $data[4]['langcode'] = '';
+
+    return $data;
+  }
+
+}

2017/web/core/modules/language/tests/src/Unit/Config/LanguageConfigOverrideTest.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace Drupal\Tests\language\Unit\Config;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\language\Config\LanguageConfigOverride;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\language\Config\LanguageConfigOverride
+ * @group Config
+ * @group language
+ */
+class LanguageConfigOverrideTest extends UnitTestCase {
+
+  /**
+   * Language configuration override.
+   *
+   * @var \Drupal\language\Config\LanguageConfigOverride
+   */
+  protected $configTranslation;
+
+  /**
+   * Storage.
+   *
+   * @var \Drupal\Core\Config\StorageInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $storage;
+
+  /**
+   * Event Dispatcher.
+   *
+   * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $eventDispatcher;
+
+  /**
+   * Typed Config.
+   *
+   * @var \Drupal\Core\Config\TypedConfigManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $typedConfig;
+
+  /**
+   * The mocked cache tags invalidator.
+   *
+   * @var \Drupal\Core\Cache\CacheTagsInvalidatorInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $cacheTagsInvalidator;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->storage = $this->getMock('Drupal\Core\Config\StorageInterface');
+    $this->eventDispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface');
+    $this->typedConfig = $this->getMock('\Drupal\Core\Config\TypedConfigManagerInterface');
+    $this->configTranslation = new LanguageConfigOverride('config.test', $this->storage, $this->typedConfig, $this->eventDispatcher);
+    $this->cacheTagsInvalidator = $this->getMock('Drupal\Core\Cache\CacheTagsInvalidatorInterface');
+
+    $container = new ContainerBuilder();
+    $container->set('cache_tags.invalidator', $this->cacheTagsInvalidator);
+    \Drupal::setContainer($container);
+  }
+
+  /**
+   * @covers ::save
+   */
+  public function testSaveNew() {
+    $this->cacheTagsInvalidator->expects($this->once())
+      ->method('invalidateTags')
+      ->with(['config:config.test']);
+    $this->assertTrue($this->configTranslation->isNew());
+    $this->configTranslation->save();
+  }
+
+  /**
+   * @covers ::save
+   */
+  public function testSaveExisting() {
+    $this->cacheTagsInvalidator->expects($this->once())
+      ->method('invalidateTags')
+      ->with(['config:config.test']);
+    $this->configTranslation->initWithData([]);
+    $this->configTranslation->save();
+  }
+
+  /**
+   * @covers ::delete
+   */
+  public function testDelete() {
+    $this->cacheTagsInvalidator->expects($this->once())
+      ->method('invalidateTags')
+      ->with(['config:config.test']);
+    $this->configTranslation->initWithData([]);
+    $this->configTranslation->delete();
+  }
+
+}

2017/web/core/modules/language/tests/src/Unit/ConfigurableLanguageUnitTest.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Drupal\Tests\language\Unit;
+
+use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * Tests the ConfigurableLanguage entity class.
+ *
+ * @group language
+ * @coversDefaultClass \Drupal\language\Entity\ConfigurableLanguage
+ * @see \Drupal\language\Entity\ConfigurableLanguage.
+ */
+class ConfigurableLanguageUnitTest extends UnitTestCase {
+
+  /**
+   * @covers ::getDirection
+   */
+  public function testDirection() {
+    // Direction of language writing, an integer. Usually either
+    // ConfigurableLanguage::DIRECTION_LTR or
+    // ConfigurableLanguage::DIRECTION_RTL.
+    $configurableLanguage = new ConfigurableLanguage(['direction' => ConfigurableLanguage::DIRECTION_LTR], 'configurable_language');
+    $this->assertEquals(ConfigurableLanguage::DIRECTION_LTR, $configurableLanguage->getDirection());
+
+    // Test direction again, setting direction to RTL.
+    $configurableLanguage = new ConfigurableLanguage(['direction' => ConfigurableLanguage::DIRECTION_RTL], 'configurable_language');
+    $this->assertEquals(ConfigurableLanguage::DIRECTION_RTL, $configurableLanguage->getDirection());
+  }
+
+  /**
+   * @covers ::getWeight
+   * @covers ::setWeight
+   */
+  public function testWeight() {
+    // The weight, an integer. Used to order languages with larger positive
+    // weights sinking items toward the bottom of lists.
+    $configurableLanguage = new ConfigurableLanguage(['weight' => -5], 'configurable_language');
+    $this->assertEquals($configurableLanguage->getWeight(), -5);
+    $this->assertEquals($configurableLanguage->setWeight(13)->getWeight(), 13);
+  }
+
+}

2017/web/core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php

@@ -0,0 +1,319 @@
+<?php
+
+namespace Drupal\Tests\language\Unit;
+
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Entity\EntityManager;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\EntityTypeRepositoryInterface;
+use Drupal\language\Entity\ContentLanguageSettings;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\language\Entity\ContentLanguageSettings
+ * @group language
+ */
+class ContentLanguageSettingsUnitTest extends UnitTestCase {
+
+  /**
+   * The entity type used for testing.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $entityType;
+
+  /**
+   * The entity manager used for testing.
+   *
+   * @var \Drupal\Core\Entity\EntityManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $entityManager;
+
+  /**
+   * The entity type manager used for testing.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The ID of the type of the entity under test.
+   *
+   * @var string
+   */
+  protected $entityTypeId;
+
+  /**
+   * The UUID generator used for testing.
+   *
+   * @var \Drupal\Component\Uuid\UuidInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $uuid;
+
+  /**
+   * The typed configuration manager used for testing.
+   *
+   * @var \Drupal\Core\Config\TypedConfigManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $typedConfigManager;
+
+  /**
+   * The typed configuration manager used for testing.
+   *
+   * @var \Drupal\Core\Config\Entity\ConfigEntityStorage|\PHPUnit_Framework_MockObject_MockObject
+   */
+  protected $configEntityStorageInterface;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->entityTypeId = $this->randomMachineName();
+    $this->entityType = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
+
+    $this->entityManager = new EntityManager();
+    $this->entityTypeManager = $this->getMock(EntityTypeManagerInterface::class);
+
+    $this->uuid = $this->getMock('\Drupal\Component\Uuid\UuidInterface');
+
+    $this->typedConfigManager = $this->getMock('Drupal\Core\Config\TypedConfigManagerInterface');
+
+    $this->configEntityStorageInterface = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
+
+    $container = new ContainerBuilder();
+    $container->set('entity.manager', $this->entityManager);
+    $container->set('entity_type.manager', $this->entityTypeManager);
+    $container->set('uuid', $this->uuid);
+    $container->set('config.typed', $this->typedConfigManager);
+    $container->set('config.storage', $this->configEntityStorageInterface);
+    // Inject the container into entity.manager so it can defer to other entity
+    // services.
+    $this->entityManager->setContainer($container);
+    \Drupal::setContainer($container);
+  }
+
+  /**
+   * @covers ::calculateDependencies
+   */
+  public function testCalculateDependencies() {
+    // Mock the interfaces necessary to create a dependency on a bundle entity.
+    $target_entity_type = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
+    $target_entity_type->expects($this->any())
+      ->method('getBundleConfigDependency')
+      ->will($this->returnValue(['type' => 'config', 'name' => 'test.test_entity_type.id']));
+
+    $this->entityTypeManager->expects($this->any())
+      ->method('getDefinition')
+      ->with('test_entity_type')
+      ->will($this->returnValue($target_entity_type));
+
+    $config = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_bundle',
+    ], 'language_content_settings');
+    $dependencies = $config->calculateDependencies()->getDependencies();
+    $this->assertContains('test.test_entity_type.id', $dependencies['config']);
+  }
+
+  /**
+   * @covers ::id
+   */
+  public function testId() {
+    $config = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_bundle',
+    ], 'language_content_settings');
+    $this->assertSame('test_entity_type.test_bundle', $config->id());
+  }
+
+  /**
+   * @covers ::getTargetEntityTypeId
+   */
+  public function testTargetEntityTypeId() {
+    $config = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_bundle',
+    ], 'language_content_settings');
+    $this->assertSame('test_entity_type', $config->getTargetEntityTypeId());
+  }
+
+  /**
+   * @covers ::getTargetBundle
+   */
+  public function testTargetBundle() {
+    $config = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_bundle',
+    ], 'language_content_settings');
+    $this->assertSame('test_bundle', $config->getTargetBundle());
+  }
+
+  /**
+   * @covers ::getDefaultLangcode
+   * @covers ::setDefaultLangcode
+   *
+   * @dataProvider providerDefaultLangcode
+   */
+  public function testDefaultLangcode(ContentLanguageSettings $config, $expected) {
+    $this->assertSame($expected, $config->getDefaultLangcode());
+  }
+
+  public function providerDefaultLangcode() {
+    $langcode = $this->randomMachineName();
+    $config = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_bundle',
+    ], 'language_content_settings');
+    $config->setDefaultLangcode($langcode);
+
+    $defaultConfig = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_default_language_bundle',
+    ], 'language_content_settings');
+
+    return [
+      [$config, $langcode],
+      [$defaultConfig, LanguageInterface::LANGCODE_SITE_DEFAULT],
+    ];
+  }
+
+  /**
+   * @covers ::setLanguageAlterable
+   * @covers ::isLanguageAlterable
+   *
+   * @dataProvider providerLanguageAlterable
+   */
+  public function testLanguageAlterable(ContentLanguageSettings $config, $expected) {
+    $this->assertSame($expected, $config->isLanguageAlterable());
+  }
+
+  public function providerLanguageAlterable() {
+    $alterableConfig = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_bundle',
+    ], 'language_content_settings');
+    $alterableConfig->setLanguageAlterable(TRUE);
+
+    $nonAlterableConfig = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_fixed_language_bundle',
+    ], 'language_content_settings');
+    $nonAlterableConfig->setLanguageAlterable(FALSE);
+
+    $defaultConfig = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_default_language_bundle',
+    ], 'language_content_settings');
+
+    return [
+      [$alterableConfig, TRUE],
+      [$nonAlterableConfig, FALSE],
+      [$defaultConfig, FALSE],
+    ];
+  }
+
+  /**
+   * @covers ::isDefaultConfiguration
+   *
+   * @dataProvider providerIsDefaultConfiguration
+   */
+  public function testIsDefaultConfiguration(ContentLanguageSettings $config, $expected) {
+    $this->assertSame($expected, $config->isDefaultConfiguration());
+  }
+
+  public function providerIsDefaultConfiguration() {
+    $alteredLanguage = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_bundle',
+    ], 'language_content_settings');
+    $alteredLanguage->setLanguageAlterable(TRUE);
+
+    $alteredDefaultLangcode = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_fixed_language_bundle',
+    ], 'language_content_settings');
+    $alteredDefaultLangcode->setDefaultLangcode($this->randomMachineName());
+
+    $defaultConfig = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_default_language_bundle',
+    ], 'language_content_settings');
+
+    return [
+      [$alteredLanguage, FALSE],
+      [$alteredDefaultLangcode, FALSE],
+      [$defaultConfig, TRUE],
+    ];
+  }
+
+  /**
+   * @covers ::loadByEntityTypeBundle
+   *
+   * @dataProvider providerLoadByEntityTypeBundle
+   */
+  public function testLoadByEntityTypeBundle($config_id, ContentLanguageSettings $existing_config = NULL, $expected_langcode, $expected_language_alterable) {
+    list($type, $bundle) = explode('.', $config_id);
+
+    $nullConfig = new ContentLanguageSettings([
+      'target_entity_type_id' => $type,
+      'target_bundle' => $bundle,
+    ], 'language_content_settings');
+    $this->configEntityStorageInterface
+      ->expects($this->any())
+      ->method('load')
+      ->with($config_id)
+      ->will($this->returnValue($existing_config));
+    $this->configEntityStorageInterface
+      ->expects($this->any())
+      ->method('create')
+      ->will($this->returnValue($nullConfig));
+
+    $this->entityTypeManager
+      ->expects($this->any())
+      ->method('getStorage')
+      ->with('language_content_settings')
+      ->will($this->returnValue($this->configEntityStorageInterface));
+
+    $entity_type_repository = $this->getMockForAbstractClass(EntityTypeRepositoryInterface::class);
+    $entity_type_repository->expects($this->any())
+      ->method('getEntityTypeFromClass')
+      ->with(ContentLanguageSettings::class)
+      ->willReturn('language_content_settings');
+
+    \Drupal::getContainer()->set('entity_type.repository', $entity_type_repository);
+
+    $config = ContentLanguageSettings::loadByEntityTypeBundle($type, $bundle);
+
+    $this->assertSame($expected_langcode, $config->getDefaultLangcode());
+    $this->assertSame($expected_language_alterable, $config->isLanguageAlterable());
+  }
+
+  public function providerLoadByEntityTypeBundle() {
+    $alteredLanguage = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_bundle',
+    ], 'language_content_settings');
+    $alteredLanguage->setLanguageAlterable(TRUE);
+
+    $langcode = $this->randomMachineName();
+    $alteredDefaultLangcode = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_fixed_language_bundle',
+    ], 'language_content_settings');
+    $alteredDefaultLangcode->setDefaultLangcode($langcode);
+
+    $defaultConfig = new ContentLanguageSettings([
+      'target_entity_type_id' => 'test_entity_type',
+      'target_bundle' => 'test_default_language_bundle',
+    ], 'language_content_settings');
+
+    return [
+      ['test_entity_type.test_bundle', $alteredLanguage, LanguageInterface::LANGCODE_SITE_DEFAULT, TRUE],
+      ['test_entity_type.test_fixed_language_bundle', $alteredDefaultLangcode, $langcode, FALSE],
+      ['test_entity_type.test_default_language_bundle', $defaultConfig, LanguageInterface::LANGCODE_SITE_DEFAULT, FALSE],
+      ['test_entity_type.null_bundle', NULL, LanguageInterface::LANGCODE_SITE_DEFAULT, FALSE],
+    ];
+  }
+
+}

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

@@ -0,0 +1,264 @@
+<?php
+
+namespace Drupal\Tests\language\Unit;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\Core\Render\BubbleableMetadata;
+use Drupal\Tests\UnitTestCase;
+use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * @coversDefaultClass \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl
+ * @group language
+ */
+class LanguageNegotiationUrlTest extends UnitTestCase {
+
+  protected $languageManager;
+  protected $user;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+
+    // Set up some languages to be used by the language-based path processor.
+    $language_de = $this->getMock('\Drupal\Core\Language\LanguageInterface');
+    $language_de->expects($this->any())
+      ->method('getId')
+      ->will($this->returnValue('de'));
+    $language_en = $this->getMock('\Drupal\Core\Language\LanguageInterface');
+    $language_en->expects($this->any())
+      ->method('getId')
+      ->will($this->returnValue('en'));
+    $languages = [
+      'de' => $language_de,
+      'en' => $language_en,
+    ];
+    $this->languages = $languages;
+
+    // Create a language manager stub.
+    $language_manager = $this->getMockBuilder('Drupal\language\ConfigurableLanguageManagerInterface')
+      ->getMock();
+    $language_manager->expects($this->any())
+      ->method('getLanguages')
+      ->will($this->returnValue($languages));
+    $this->languageManager = $language_manager;
+
+    // Create a user stub.
+    $this->user = $this->getMockBuilder('Drupal\Core\Session\AccountInterface')
+      ->getMock();
+
+    $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
+      ->disableOriginalConstructor()
+      ->getMock();
+    $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE);
+    $container = new ContainerBuilder();
+    $container->set('cache_contexts_manager', $cache_contexts_manager);
+    \Drupal::setContainer($container);
+  }
+
+  /**
+   * Test path prefix language negotiation and outbound path processing.
+   *
+   * @dataProvider providerTestPathPrefix
+   */
+  public function testPathPrefix($prefix, $prefixes, $expected_langcode) {
+    $this->languageManager->expects($this->any())
+      ->method('getCurrentLanguage')
+      ->will($this->returnValue($this->languages[(in_array($expected_langcode, ['en', 'de'])) ? $expected_langcode : 'en']));
+
+    $config = $this->getConfigFactoryStub([
+      'language.negotiation' => [
+        'url' => [
+          'source' => LanguageNegotiationUrl::CONFIG_PATH_PREFIX,
+          'prefixes' => $prefixes,
+        ],
+      ],
+    ]);
+
+    $request = Request::create('/' . $prefix . '/foo', 'GET');
+    $method = new LanguageNegotiationUrl();
+    $method->setLanguageManager($this->languageManager);
+    $method->setConfig($config);
+    $method->setCurrentUser($this->user);
+    $this->assertEquals($expected_langcode, $method->getLangcode($request));
+
+    $cacheability = new BubbleableMetadata();
+    $options = [];
+    $method->processOutbound('foo', $options, $request, $cacheability);
+    $expected_cacheability = new BubbleableMetadata();
+    if ($expected_langcode) {
+      $this->assertSame($prefix . '/', $options['prefix']);
+      $expected_cacheability->setCacheContexts(['languages:' . LanguageInterface::TYPE_URL]);
+    }
+    else {
+      $this->assertFalse(isset($options['prefix']));
+    }
+    $this->assertEquals($expected_cacheability, $cacheability);
+  }
+
+  /**
+   * Provides data for the path prefix test.
+   *
+   * @return array
+   *   An array of data for checking path prefix negotiation.
+   */
+  public function providerTestPathPrefix() {
+    $path_prefix_configuration[] = [
+      'prefix' => 'de',
+      'prefixes' => [
+        'de' => 'de',
+        'en-uk' => 'en',
+      ],
+      'expected_langcode' => 'de',
+    ];
+    $path_prefix_configuration[] = [
+      'prefix' => 'en-uk',
+      'prefixes' => [
+        'de' => 'de',
+        'en' => 'en-uk',
+      ],
+      'expected_langcode' => 'en',
+    ];
+    // No configuration.
+    $path_prefix_configuration[] = [
+      'prefix' => 'de',
+      'prefixes' => [],
+      'expected_langcode' => FALSE,
+    ];
+    // Non-matching prefix.
+    $path_prefix_configuration[] = [
+      'prefix' => 'de',
+      'prefixes' => [
+        'en-uk' => 'en',
+      ],
+      'expected_langcode' => FALSE,
+    ];
+    // Non-existing language.
+    $path_prefix_configuration[] = [
+      'prefix' => 'it',
+      'prefixes' => [
+        'it' => 'it',
+        'en-uk' => 'en',
+      ],
+      'expected_langcode' => FALSE,
+    ];
+    return $path_prefix_configuration;
+  }
+
+  /**
+   * Test domain language negotiation and outbound path processing.
+   *
+   * @dataProvider providerTestDomain
+   */
+  public function testDomain($http_host, $domains, $expected_langcode) {
+    $this->languageManager->expects($this->any())
+      ->method('getCurrentLanguage')
+      ->will($this->returnValue($this->languages['en']));
+
+    $config = $this->getConfigFactoryStub([
+      'language.negotiation' => [
+        'url' => [
+          'source' => LanguageNegotiationUrl::CONFIG_DOMAIN,
+          'domains' => $domains,
+        ],
+      ],
+    ]);
+
+    $request = Request::create('', 'GET', [], [], [], ['HTTP_HOST' => $http_host]);
+    $method = new LanguageNegotiationUrl();
+    $method->setLanguageManager($this->languageManager);
+    $method->setConfig($config);
+    $method->setCurrentUser($this->user);
+    $this->assertEquals($expected_langcode, $method->getLangcode($request));
+
+    $cacheability = new BubbleableMetadata();
+    $options = [];
+    $this->assertSame('foo', $method->processOutbound('foo', $options, $request, $cacheability));
+    $expected_cacheability = new BubbleableMetadata();
+    if ($expected_langcode !== FALSE && count($domains) > 1) {
+      $expected_cacheability->setCacheMaxAge(Cache::PERMANENT)->setCacheContexts(['languages:' . LanguageInterface::TYPE_URL, 'url.site']);
+    }
+    $this->assertEquals($expected_cacheability, $cacheability);
+  }
+
+  /**
+   * Provides data for the domain test.
+   *
+   * @return array
+   *   An array of data for checking domain negotiation.
+   */
+  public function providerTestDomain() {
+
+    $domain_configuration[] = [
+      'http_host' => 'example.de',
+      'domains' => [
+        'de' => 'http://example.de',
+      ],
+      'expected_langcode' => 'de',
+    ];
+    // No configuration.
+    $domain_configuration[] = [
+      'http_host' => 'example.de',
+      'domains' => [],
+      'expected_langcode' => FALSE,
+    ];
+    // HTTP host with a port.
+    $domain_configuration[] = [
+      'http_host' => 'example.de:8080',
+      'domains' => [
+        'de' => 'http://example.de',
+      ],
+      'expected_langcode' => 'de',
+    ];
+    // Domain configuration with https://.
+    $domain_configuration[] = [
+      'http_host' => 'example.de',
+      'domains' => [
+        'de' => 'https://example.de',
+      ],
+      'expected_langcode' => 'de',
+    ];
+    // Non-matching HTTP host.
+    $domain_configuration[] = [
+      'http_host' => 'example.com',
+      'domains' => [
+        'de' => 'http://example.com',
+      ],
+      'expected_langcode' => 'de',
+    ];
+    // Testing a non-existing language.
+    $domain_configuration[] = [
+      'http_host' => 'example.com',
+      'domains' => [
+        'it' => 'http://example.it',
+      ],
+      'expected_langcode' => FALSE,
+    ];
+    // Multiple domain configurations.
+    $domain_configuration[] = [
+      'http_host' => 'example.com',
+      'domains' => [
+        'de' => 'http://example.de',
+        'en' => 'http://example.com',
+      ],
+      'expected_langcode' => 'en',
+    ];
+    return $domain_configuration;
+  }
+
+}
+
+// @todo Remove as part of https://www.drupal.org/node/2481833.
+namespace Drupal\language\Plugin\LanguageNegotiation;
+
+if (!function_exists('base_path')) {
+
+  function base_path() {
+    return '/';
+  }
+
+}

2017/web/core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Drupal\Tests\language\Unit\Menu;
+
+use Drupal\Tests\Core\Menu\LocalTaskIntegrationTestBase;
+
+/**
+ * Tests existence of language local tasks.
+ *
+ * @group language
+ */
+class LanguageLocalTasksTest extends LocalTaskIntegrationTestBase {
+
+  protected function setUp() {
+    $this->directoryList = [
+      'language' => 'core/modules/language',
+    ];
+    parent::setUp();
+  }
+
+  /**
+   * Tests language admin overview local tasks existence.
+   *
+   * @dataProvider getLanguageAdminOverviewRoutes
+   */
+  public function testLanguageAdminLocalTasks($route, $expected) {
+    $this->assertLocalTasks($route, $expected);
+  }
+
+  /**
+   * Provides a list of routes to test.
+   */
+  public function getLanguageAdminOverviewRoutes() {
+    return [
+      ['entity.configurable_language.collection', [['entity.configurable_language.collection', 'language.negotiation']]],
+      ['language.negotiation', [['entity.configurable_language.collection', 'language.negotiation']]],
+    ];
+  }
+
+  /**
+   * Tests language edit local tasks existence.
+   */
+  public function testLanguageEditLocalTasks() {
+    $this->assertLocalTasks('entity.configurable_language.edit_form', [
+      0 => ['entity.configurable_language.edit_form'],
+    ]);
+  }
+
+}

2017/web/core/modules/language/tests/src/Unit/process/LanguageDomainsTest.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Drupal\Tests\language\Unit\process;
+
+use Drupal\language\Plugin\migrate\process\LanguageDomains;
+use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\language\Plugin\migrate\process\LanguageDomains
+ * @group language
+ */
+class LanguageDomainsTest extends MigrateProcessTestCase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $backupGlobalsBlacklist = ['base_url'];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $configuration = [
+      'key' => 'language',
+      'value' => 'domain',
+    ];
+    $this->plugin = new LanguageDomains($configuration, 'map', []);
+    parent::setUp();
+
+    // The language_domains plugin calls getSourceProperty() to check if domain
+    // negotiation is used. If it is the values will be processed so we need it
+    // to return TRUE to be able to test the process.
+    $this->row->expects($this->once())
+      ->method('getSourceProperty')
+      ->will($this->returnValue(TRUE));
+
+    // The language_domains plugin use $base_url to fill empty domains.
+    global $base_url;
+    $base_url = 'http://example.com';
+  }
+
+  /**
+   * @covers ::transform
+   */
+  public function testTransform() {
+    $source = [
+      ['language' => 'en', 'domain' => ''],
+      ['language' => 'fr', 'domain' => 'fr.example.com'],
+      ['language' => 'es', 'domain' => 'http://es.example.com'],
+      ['language' => 'hu', 'domain' => 'https://hu.example.com'],
+    ];
+    $expected = [
+      'en' => 'example.com',
+      'fr' => 'fr.example.com',
+      'es' => 'es.example.com',
+      'hu' => 'hu.example.com',
+    ];
+    $value = $this->plugin->transform($source, $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->assertSame($value, $expected);
+  }
+
+}

2017/web/core/modules/language/tests/src/Unit/process/LanguageNegotiationTest.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace Drupal\Tests\language\Unit\process;
+
+use Drupal\language\Plugin\migrate\process\LanguageNegotiation;
+use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase;
+use Drupal\migrate\MigrateException;
+
+/**
+ * @coversDefaultClass \Drupal\language\Plugin\migrate\process\LanguageNegotiation
+ * @group language
+ */
+class LanguageNegotiationTest extends MigrateProcessTestCase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    $this->plugin = new LanguageNegotiation([], 'map', []);
+    parent::setUp();
+  }
+
+  /**
+   * Tests successful transformation without weights.
+   */
+  public function testTransformWithWeights() {
+    $source = [
+      [
+        'locale-url' => [],
+        'language-default' => [],
+      ],
+      [
+        'locale-url' => -10,
+        'locale-session' => -9,
+        'locale-user' => -8,
+        'locale-browser' => -7,
+        'language-default' => -6,
+      ],
+    ];
+    $expected = [
+      'enabled' => [
+        'language-url' => -10,
+        'language-selected' => -6,
+      ],
+      'method_weights' => [
+        'language-url' => -10,
+        'language-session' => -9,
+        'language-user' => -8,
+        'language-browser' => -7,
+        'language-selected' => -6,
+      ],
+    ];
+    $value = $this->plugin->transform($source, $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->assertSame($value, $expected);
+  }
+
+  /**
+   * Tests successful transformation without weights.
+   */
+  public function testTransformWithoutWeights() {
+    $source = [
+      [
+        'locale-url' => [],
+        'locale-url-fallback' => [],
+      ],
+    ];
+    $expected = [
+      'enabled' => [
+        'language-url' => 0,
+        'language-url-fallback' => 1,
+      ],
+    ];
+    $value = $this->plugin->transform($source, $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->assertSame($value, $expected);
+  }
+
+  /**
+   * Tests string input.
+   */
+  public function testStringInput() {
+    $this->plugin = new LanguageNegotiation([], 'map', []);
+    $this->setExpectedException(MigrateException::class, 'The input should be an array');
+    $this->plugin->transform('foo', $this->migrateExecutable, $this->row, 'destinationproperty');
+  }
+
+}

2017/web/core/modules/language/tests/src/Unit/process/LanguageTypesTest.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Drupal\Tests\language\Unit\process;
+
+use Drupal\language\Plugin\migrate\process\LanguageTypes;
+use Drupal\Tests\migrate\Unit\process\MigrateProcessTestCase;
+use Drupal\migrate\MigrateException;
+
+/**
+ * @coversDefaultClass \Drupal\language\Plugin\migrate\process\LanguageTypes
+ * @group language
+ */
+class LanguageTypesTest extends MigrateProcessTestCase {
+
+  /**
+   * Tests successful transformation of all language types.
+   */
+  public function testTransformAll() {
+    $this->plugin = new LanguageTypes([], 'map', []);
+    $source = [
+      'language' => TRUE,
+      'language_url' => FALSE,
+      'language_content' => FALSE,
+    ];
+    $expected = [
+      0 => 'language_url',
+      1 => 'language_content',
+      2 => 'language_interface',
+    ];
+    $value = $this->plugin->transform($source, $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->assertSame($value, $expected);
+  }
+
+  /**
+   * Tests successful transformation of configurable language types.
+   */
+  public function testTransformConfigurable() {
+    $this->plugin = new LanguageTypes(['filter_configurable' => TRUE], 'map', []);
+    $source = [
+      'language' => TRUE,
+      'language_url' => FALSE,
+      'language_content' => FALSE,
+    ];
+    $expected = [
+      0 => 'language_interface',
+    ];
+    $value = $this->plugin->transform($source, $this->migrateExecutable, $this->row, 'destinationproperty');
+    $this->assertSame($value, $expected);
+  }
+
+  /**
+   * Tests string input.
+   */
+  public function testStringInput() {
+    $this->plugin = new LanguageTypes([], 'map', []);
+    $this->setExpectedException(MigrateException::class, 'The input should be an array');
+    $this->plugin->transform('foo', $this->migrateExecutable, $this->row, 'destinationproperty');
+  }
+
+}

2017/web/core/modules/language/tests/test_module/test_module.info.yml

@@ -0,0 +1,6 @@
+name: 'Test Module'
+type: module
+description: 'Support module for testing.'
+package: Testing
+version: VERSION
+core: 8.x