Issue #2175459 by sun: Convert Drupal\system\Tests\InstallerTest into a new...

Issue #2175459 by sun: Convert Drupal\system\Tests\InstallerTest into a new Drupal\simpletest\InstallerTestBase.

core/modules/system/lib/Drupal/system/Tests/InstallerTest.php → core/modules/simpletest/lib/Drupal/simpletest/InstallerTestBase.php

@@ -2,21 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\system\Tests\InstallerTest.
+ * Contains \Drupal\simpletest\InstallerTestBase.
  */
 
-namespace Drupal\system\Tests;
+namespace Drupal\simpletest;
 
-use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Session\UserSession;
-use Drupal\simpletest\WebTestBase;
 
 /**
- * Allows testing of the interactive installer.
- *
- * @todo Move majority of code into new Drupal\simpletest\InstallerTestBase.
+ * Base class for testing the interactive installer.
  */
-class InstallerTest extends WebTestBase {
+abstract class InstallerTestBase extends WebTestBase {
 
   /**
    * Custom settings.php values to write for a test run.
@@ -69,14 +65,6 @@ class InstallerTest extends WebTestBase {
    */
   protected $isInstalled = FALSE;
 
-  public static function getInfo() {
-    return array(
-      'name' => 'Installer tests',
-      'description' => 'Tests the interactive installer.',
-      'group' => 'Installer',
-    );
-  }
-
   /**
    * Overrides WebTestBase::setUp().
    */
@@ -211,14 +199,4 @@ protected function refreshVariables() {
     }
   }
 
-  /**
-   * Ensures that the user page is available after every test installation.
-   */
-  public function testInstaller() {
-    $this->assertUrl('user/1');
-    $this->assertResponse(200);
-    // Confirm that we are logged-in after installation.
-    $this->assertText($this->root_user->getUsername());
-  }
-
 }

core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTest.php

+<?php
+
+/**
+ * @file
+ * Contains \Drupal\system\Tests\Installer\InstallerTest.
+ */
+
+namespace Drupal\system\Tests\Installer;
+
+use Drupal\simpletest\InstallerTestBase;
+
+/**
+ * Allows testing of the interactive installer.
+ */
+class InstallerTest extends InstallerTestBase {
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Installer test',
+      'description' => 'Tests the interactive installer.',
+      'group' => 'Installer',
+    );
+  }
+
+  /**
+   * Ensures that the user page is available after installation.
+   */
+  public function testInstaller() {
+    $this->assertUrl('user/1');
+    $this->assertResponse(200);
+    // Confirm that we are logged-in after installation.
+    $this->assertText($this->root_user->getUsername());
+  }
+
+}

core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php

@@ -7,12 +7,12 @@
 
 namespace Drupal\system\Tests\Installer;
 
-use Drupal\system\Tests\InstallerTest;
+use Drupal\simpletest\InstallerTestBase;
 
 /**
  * Tests the installer translation detection.
  */
-class InstallerTranslationTest extends InstallerTest {
+class InstallerTranslationTest extends InstallerTestBase {
 
   /**
    * Overrides the language code in which to install Drupal.