Adam Bramley · 2fc7e23e
--- a/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
+    }
+  }
+
+  /**
+   * Tests infinite loop prevention whilst generating random names.
+   *
+   * @covers ::machineName
+   */
+  public function testRandomMachineNameException(): void {
+    // There are fewer than 100 possibilities so an exception should occur to
+    // prevent infinite loops.
+    $random = new Random();
+    $this->expectException(\RuntimeException::class);
+    for ($i = 0; $i <= 100; $i++) {
+      $str = $random->machineName(1, TRUE);
+      $names[$str] = TRUE;
-      $str = $random->machineName(1, TRUE);
-      $names[$str] = TRUE;
+      $random->machineName(1, TRUE);
--- a/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/RandomTest.php
+    }
+  }
+
+  /**
+   * Tests random name generation if uniqueness is not enforced.
+   *
+   * @covers ::machineName
+   */
+  public function testRandomMachineNameNonUnique(): void {
+    // There are fewer than 100 possibilities if we were forcing uniqueness so
+    // exception would occur.
+    $random = new Random();
+    for ($i = 0; $i <= 100; $i++) {
+      $random->machineName(1);
+    }
+    $this->assertTrue(TRUE, 'No exception thrown when uniqueness is not enforced.');
-    $this->assertTrue(TRUE, 'No exception thrown when uniqueness is not enforced.');
+    $this->expectNotToPerformAssertions();
--- a/core/modules/system/tests/src/Functional/Common/NoJavaScriptAnonymousTest.php → core/modules/system/tests/src/FunctionalJavascript/NoJavaScriptAnonymousTest.php
+++ b/core/modules/system/tests/src/Functional/Common/NoJavaScriptAnonymousTest.php → core/modules/system/tests/src/FunctionalJavascript/NoJavaScriptAnonymousTest.php
 <?php

-namespace Drupal\Tests\system\Functional\Common;
+namespace Drupal\Tests\system\FunctionalJavaScript;