Upgraded drupal core with security updates

[yaffs-website] / web / core / modules / simpletest / tests / src / Unit / TestDiscoveryTest.php

diff --git a/web/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php b/web/core/modules/simpletest/tests/src/Unit/TestDiscoveryTest.php
similarity index 97%
rename from web/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
rename to web/core/modules/simpletest/tests/src/Unit/TestDiscoveryTest.php
index f36243e3d12c234a328c343d6e6042de0b64ee78..88a2aca62f74218a22ac82b3da94b616a7942485 100644 (file)
--- a/web/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php
+++ b/web/core/modules/simpletest/tests/src/Unit/TestDiscoveryTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Tests\simpletest\Unit\TestInfoParsingTest.
- */
-
 namespace Drupal\Tests\simpletest\Unit;
 
 use Composer\Autoload\ClassLoader;
@@ -19,7 +14,7 @@ use org\bovigo\vfs\vfsStream;
  * @coversDefaultClass \Drupal\simpletest\TestDiscovery
  * @group simpletest
  */
-class TestInfoParsingTest extends UnitTestCase {
+class TestDiscoveryTest extends UnitTestCase {
 
   /**
    * @covers ::getTestInfo
@@ -35,13 +30,13 @@ class TestInfoParsingTest extends UnitTestCase {
     $tests[] = [
       // Expected result.
       [
-        'name' => 'Drupal\Tests\simpletest\Unit\TestInfoParsingTest',
+        'name' => 'Drupal\Tests\simpletest\Unit\TestDiscoveryTest',
         'group' => 'simpletest',
         'description' => 'Tests \Drupal\simpletest\TestDiscovery.',
         'type' => 'PHPUnit-Unit',
       ],
       // Classname.
-      'Drupal\Tests\simpletest\Unit\TestInfoParsingTest',
+      'Drupal\Tests\simpletest\Unit\TestDiscoveryTest',
     ];
 
     // A core unit test.
@@ -366,26 +361,6 @@ EOF;
     ], $result);
   }
 
-}
-
-class TestTestDiscovery extends TestDiscovery {
-
-  /**
-   * @var \Drupal\Core\Extension\Extension[]
-   */
-  protected $extensions = [];
-
-  public function setExtensions(array $extensions) {
-    $this->extensions = $extensions;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExtensions() {
-    return $this->extensions;
-  }
-
   /**
    * @covers ::getPhpunitTestSuite
    * @dataProvider providerTestGetPhpunitTestSuite
@@ -413,6 +388,26 @@ class TestTestDiscovery extends TestDiscovery {
 
 }
 
+class TestTestDiscovery extends TestDiscovery {
+
+  /**
+   * @var \Drupal\Core\Extension\Extension[]
+   */
+  protected $extensions = [];
+
+  public function setExtensions(array $extensions) {
+    $this->extensions = $extensions;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExtensions() {
+    return $this->extensions;
+  }
+
+}
+
 namespace Drupal\simpletest\Tests;
 
 use Drupal\simpletest\WebTestBase;