X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fsystem%2Ftests%2Fsrc%2FFunctional%2FMenu%2FMenuRouterTest.php;fp=web%2Fcore%2Fmodules%2Fsystem%2Fsrc%2FTests%2FMenu%2FMenuRouterTest.php;h=7669e1875af72d97579d32d8f6863e69844f4659;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hp=521a691537d328c8ec89654d23b7190526cc90c8;hpb=aea91e65e895364e460983b890e295aa5d5540a5;p=yaffs-website

diff --git a/web/core/modules/system/src/Tests/Menu/MenuRouterTest.php b/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
similarity index 97%
rename from web/core/modules/system/src/Tests/Menu/MenuRouterTest.php
rename to web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
index 521a69153..7669e1875 100644
--- a/web/core/modules/system/src/Tests/Menu/MenuRouterTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\system\Tests\Menu;
+namespace Drupal\Tests\system\Functional\Menu;
 
 use Drupal\Core\Url;
-use Drupal\simpletest\WebTestBase;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests menu router and default menu link functionality.
  *
  * @group Menu
  */
-class MenuRouterTest extends WebTestBase {
+class MenuRouterTest extends BrowserTestBase {
 
   /**
    * Modules to enable.
@@ -194,9 +194,13 @@ class MenuRouterTest extends WebTestBase {
    * Test path containing "exotic" characters.
    */
   protected function doTestExoticPath() {
-    $path = "menu-test/ -._~!$'\"()*@[]?&+%#,;=:" . // "Special" ASCII characters.
-      "%23%25%26%2B%2F%3F" . // Characters that look like a percent-escaped string.
-      "éøïвβ中國書۞"; // Characters from various non-ASCII alphabets.
+    // "Special" ASCII characters.
+    $path =
+      "menu-test/ -._~!$'\"()*@[]?&+%#,;=:" .
+      // Characters that look like a percent-escaped string.
+      "%23%25%26%2B%2F%3F" .
+      // Characters from various non-ASCII alphabets.
+      "éøïвβ中國書۞";
     $this->drupalGet($path);
     $this->assertRaw('This is the menuTestCallback content.');
     $this->assertNoText(t('The website encountered an unexpected error. Please try again later.'));