More updates to stop using dev or alpha or beta versions.

[yaffs-website] / web / core / tests / Drupal / Tests / Component / FileCache / FileCacheFactoryTest.php

diff --git a/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php b/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
index 1ed036ee8d236d8d59e86b79c17a69654dd2f674..f9195984341a9d8ceb54cc51100d9e2301e1cbc9 100644 (file)
--- a/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
+++ b/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
@@ -5,13 +5,14 @@ namespace Drupal\Tests\Component\FileCache;
 use Drupal\Component\FileCache\FileCache;
 use Drupal\Component\FileCache\NullFileCache;
 use Drupal\Component\FileCache\FileCacheFactory;
-use Drupal\Tests\UnitTestCase;
+use Drupal\Component\Utility\Random;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \Drupal\Component\FileCache\FileCacheFactory
  * @group FileCache
  */
-class FileCacheFactoryTest extends UnitTestCase {
+class FileCacheFactoryTest extends TestCase {
 
   /**
    * {@inheritdoc}
@@ -58,7 +59,13 @@ class FileCacheFactoryTest extends UnitTestCase {
    */
   public function testGetNoPrefix() {
     FileCacheFactory::setPrefix(NULL);
-    $this->setExpectedException(\InvalidArgumentException::class, 'Required prefix configuration is missing');
+    if (method_exists($this, 'expectException')) {
+      $this->expectException(\InvalidArgumentException::class);
+      $this->expectExceptionMessage('Required prefix configuration is missing');
+    }
+    else {
+      $this->setExpectedException(\InvalidArgumentException::class, 'Required prefix configuration is missing');
+    }
     FileCacheFactory::get('test_foo_settings', []);
   }
 
@@ -104,51 +111,53 @@ class FileCacheFactoryTest extends UnitTestCase {
     $class = get_class($file_cache);
 
     // Test fallback configuration.
-    $data['fallback-configuration'] = [[
-    ], [], FileCache::class];
+    $data['fallback-configuration'] = [
+      [],
+      [],
+      FileCache::class,
+    ];
 
     // Test default configuration.
-    $data['default-configuration'] = [[
-      'default' => [
-        'class' => $class,
-      ],
-    ], [], $class];
+    $data['default-configuration'] = [
+      ['default' => ['class' => $class]],
+      [],
+      $class,
+    ];
 
     // Test specific per collection setting.
-    $data['collection-setting'] = [[
-      'test_foo_settings' => [
-        'class' => $class,
-      ],
-    ], [], $class];
-
+    $data['collection-setting'] = [
+      ['test_foo_settings' => ['class' => $class]],
+      [],
+      $class,
+    ];
 
     // Test default configuration plus specific per collection setting.
-    $data['default-plus-collection-setting'] = [[
-      'default' => [
-        'class' => '\stdClass',
+    $data['default-plus-collection-setting'] = [
+      [
+        'default' => ['class' => '\stdClass'],
+        'test_foo_settings' => ['class' => $class],
       ],
-      'test_foo_settings' => [
-        'class' => $class,
-      ],
-    ], [], $class];
+      [],
+      $class,
+    ];
 
     // Test default configuration plus class specific override.
-    $data['default-plus-class-override'] = [[
-      'default' => [
-        'class' => '\stdClass',
-      ],
-    ], [ 'class' => $class ], $class];
+    $data['default-plus-class-override'] = [
+      ['default' => ['class' => '\stdClass']],
+      ['class' => $class],
+      $class,
+    ];
 
     // Test default configuration plus class specific override plus specific
     // per collection setting.
-    $data['default-plus-class-plus-collection-setting'] = [[
-      'default' => [
-        'class' => '\stdClass',
+    $data['default-plus-class-plus-collection-setting'] = [
+      [
+        'default' => ['class' => '\stdClass'],
+        'test_foo_settings' => ['class' => $class],
       ],
-      'test_foo_settings' => [
-        'class' => $class,
-      ],
-    ], [ 'class' => '\stdClass'], $class];
+      ['class' => '\stdClass'],
+      $class,
+  ];
 
     return $data;
   }
@@ -170,7 +179,10 @@ class FileCacheFactoryTest extends UnitTestCase {
    * @covers ::setPrefix
    */
   public function testGetSetPrefix() {
-    $prefix = $this->randomMachineName();
+    // Random generator.
+    $random = new Random();
+
+    $prefix = $random->name(8, TRUE);
     FileCacheFactory::setPrefix($prefix);
     $this->assertEquals($prefix, FileCacheFactory::getPrefix());
   }