From 29045807f88c4c99e53e65bef6159eb557be7d87 Mon Sep 17 00:00:00 2001
From: Gabor Hojtsy <gabor@hojtsy.hu>
Date: Tue, 20 Jun 2017 15:34:16 +0200
Subject: [PATCH] Issue #2870441 by naveenvalecha, dawehner, Lendude: Convert
 web tests to browser tests for content_translation module

---
 .../src/Functional}/ContentTestTranslationUITest.php   |  2 +-
 .../ContentTranslationDisableSettingTest.php           |  2 +-
 .../src/Functional}/ContentTranslationEnableTest.php   | 10 +++++-----
 .../ContentTranslationLanguageChangeTest.php           |  2 +-
 .../src/Functional}/ContentTranslationSettingsTest.php |  8 ++++----
 .../Functional}/ContentTranslationSyncImageTest.php    |  7 ++++++-
 .../src/Functional}/Views/TranslationLinkTest.php      |  4 ++--
 7 files changed, 20 insertions(+), 15 deletions(-)
 rename core/modules/content_translation/{src/Tests => tests/src/Functional}/ContentTestTranslationUITest.php (93%)
 rename core/modules/content_translation/{src/Tests => tests/src/Functional}/ContentTranslationDisableSettingTest.php (96%)
 rename core/modules/content_translation/{src/Tests => tests/src/Functional}/ContentTranslationEnableTest.php (88%)
 rename core/modules/content_translation/{src/Tests => tests/src/Functional}/ContentTranslationLanguageChangeTest.php (98%)
 rename core/modules/content_translation/{src/Tests => tests/src/Functional}/ContentTranslationSettingsTest.php (98%)
 rename core/modules/content_translation/{src/Tests => tests/src/Functional}/ContentTranslationSyncImageTest.php (98%)
 rename core/modules/content_translation/{src/Tests => tests/src/Functional}/Views/TranslationLinkTest.php (92%)

diff --git a/core/modules/content_translation/src/Tests/ContentTestTranslationUITest.php b/core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php
similarity index 93%
rename from core/modules/content_translation/src/Tests/ContentTestTranslationUITest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php
index 1688f75fd6b..0b1de0b204f 100644
--- a/core/modules/content_translation/src/Tests/ContentTestTranslationUITest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 /**
  * Tests the test content translation UI with the test entity.
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationDisableSettingTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationDisableSettingTest.php
similarity index 96%
rename from core/modules/content_translation/src/Tests/ContentTranslationDisableSettingTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationDisableSettingTest.php
index a274ad2353b..6dffed7444b 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationDisableSettingTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationDisableSettingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 use Drupal\Tests\BrowserTestBase;
 
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationEnableTest.php
similarity index 88%
rename from core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationEnableTest.php
index 11c816c1d72..a3cc4e99466 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationEnableTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationEnableTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Test enabling content translation module.
  *
  * @group content_translation
  */
-class ContentTranslationEnableTest extends WebTestBase {
+class ContentTranslationEnableTest extends BrowserTestBase {
 
   /**
    * {@inheritdoc}
@@ -36,7 +36,7 @@ class ContentTranslationEnableTest extends WebTestBase {
     // No pending updates should be available.
     $this->drupalGet('admin/reports/status');
     $requirement_value = $this->cssSelect("details.system-status-report__entry summary:contains('Entity/field definitions') + div");
-    $this->assertEqual(t('Up to date'), trim((string) $requirement_value[0]));
+    $this->assertEqual(t('Up to date'), trim($requirement_value[0]->getText()));
 
     $this->drupalGet('admin/config/regional/content-language');
     // The node entity type should not be an option because it has no bundles.
@@ -54,7 +54,7 @@ class ContentTranslationEnableTest extends WebTestBase {
     // No pending updates should be available.
     $this->drupalGet('admin/reports/status');
     $requirement_value = $this->cssSelect("details.system-status-report__entry summary:contains('Entity/field definitions') + div");
-    $this->assertEqual(t('Up to date'), trim((string) $requirement_value[0]));
+    $this->assertEqual(t('Up to date'), trim($requirement_value[0]->getText()));
 
     // Create a node type and check the content translation settings are now
     // available for nodes.
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationLanguageChangeTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationLanguageChangeTest.php
similarity index 98%
rename from core/modules/content_translation/src/Tests/ContentTranslationLanguageChangeTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationLanguageChangeTest.php
index 04bd023cde1..ae326ef67b8 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationLanguageChangeTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationLanguageChangeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\node\Tests\NodeTestBase;
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
similarity index 98%
rename from core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
index 7a1c598047b..f15a8f9bc8d 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
 use Drupal\comment\Tests\CommentTestTrait;
@@ -8,14 +8,14 @@ use Drupal\Core\Field\Entity\BaseFieldOverride;
 use Drupal\Core\Language\Language;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\language\Entity\ContentLanguageSettings;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests the content translation settings UI.
  *
  * @group content_translation
  */
-class ContentTranslationSettingsTest extends WebTestBase {
+class ContentTranslationSettingsTest extends BrowserTestBase {
 
   use CommentTestTrait;
 
@@ -193,7 +193,7 @@ class ContentTranslationSettingsTest extends WebTestBase {
     $elements = $this->xpath('//select[@id="edit-settings-node-article-settings-language-langcode"]/option');
     // Compare values inside the option elements with expected values.
     for ($i = 0; $i < count($elements); $i++) {
-      $this->assertEqual($elements[$i]->attributes()->{'value'}, $expected_elements[$i]);
+      $this->assertEqual($elements[$i]->getValue(), $expected_elements[$i]);
     }
   }
 
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
similarity index 98%
rename from core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
rename to core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
index 30ff32de522..5f7c9fd9b8e 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace Drupal\content_translation\Tests;
+namespace Drupal\Tests\content_translation\Functional;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\file\Entity\File;
+use Drupal\Tests\TestFileCreationTrait;
 
 /**
  * Tests the field synchronization behavior for the image field.
@@ -14,6 +15,10 @@ use Drupal\file\Entity\File;
  */
 class ContentTranslationSyncImageTest extends ContentTranslationTestBase {
 
+  use TestFileCreationTrait {
+    getTestFiles as drupalGetTestFiles;
+  }
+
   /**
    * The cardinality of the image field.
    *
diff --git a/core/modules/content_translation/src/Tests/Views/TranslationLinkTest.php b/core/modules/content_translation/tests/src/Functional/Views/TranslationLinkTest.php
similarity index 92%
rename from core/modules/content_translation/src/Tests/Views/TranslationLinkTest.php
rename to core/modules/content_translation/tests/src/Functional/Views/TranslationLinkTest.php
index 23c74a40f54..d2e9e0d0cbe 100644
--- a/core/modules/content_translation/src/Tests/Views/TranslationLinkTest.php
+++ b/core/modules/content_translation/tests/src/Functional/Views/TranslationLinkTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\content_translation\Tests\Views;
+namespace Drupal\Tests\content_translation\Functional\Views;
 
-use Drupal\content_translation\Tests\ContentTranslationTestBase;
+use Drupal\Tests\content_translation\Functional\ContentTranslationTestBase;
 use Drupal\views\Tests\ViewTestData;
 use Drupal\Core\Language\Language;
 use Drupal\user\Entity\User;