Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / search / tests / src / Functional / SearchSimplifyTest.php

diff --git a/web/core/modules/search/tests/src/Functional/SearchSimplifyTest.php b/web/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
index c30611991295c9dba339734460a686cd8a1ab4ce..a451063e0a74c33d080142103c3ff9b4afef75b1 100644 (file)
--- a/web/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
@@ -2,14 +2,20 @@
 
 namespace Drupal\Tests\search\Functional;
 
-use Drupal\Component\Utility\Unicode;
+use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests that the search_simply() function works as intended.
  *
  * @group search
  */
-class SearchSimplifyTest extends SearchTestBase {
+class SearchSimplifyTest extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['search'];
+
   /**
    * Tests that all Unicode characters simplify correctly.
    */
@@ -21,7 +27,7 @@ class SearchSimplifyTest extends SearchTestBase {
     // their own lines).  So the even-numbered lines should simplify to nothing,
     // and the odd-numbered lines we need to split into shorter chunks and
     // verify that simplification doesn't lose any characters.
-    $input = file_get_contents(\Drupal::root() . '/core/modules/search/tests/UnicodeTest.txt');
+    $input = file_get_contents($this->root . '/core/modules/search/tests/UnicodeTest.txt');
     $basestrings = explode(chr(10), $input);
     $strings = [];
     foreach ($basestrings as $key => $string) {
@@ -35,8 +41,8 @@ class SearchSimplifyTest extends SearchTestBase {
         // Split this into 30-character chunks, so we don't run into limits
         // of truncation in search_simplify().
         $start = 0;
-        while ($start < Unicode::strlen($string)) {
-          $newstr = Unicode::substr($string, $start, 30);
+        while ($start < mb_strlen($string)) {
+          $newstr = mb_substr($string, $start, 30);
           // Special case: leading zeros are removed from numeric strings,
           // and there's one string in this file that is numbers starting with
           // zero, so prepend a 1 on that string.
@@ -50,7 +56,7 @@ class SearchSimplifyTest extends SearchTestBase {
     }
     foreach ($strings as $key => $string) {
       $simplified = search_simplify($string);
-      $this->assertTrue(Unicode::strlen($simplified) >= Unicode::strlen($string), "Nothing is removed from string $key.");
+      $this->assertTrue(mb_strlen($simplified) >= mb_strlen($string), "Nothing is removed from string $key.");
     }
 
     // Test the low-numbered ASCII control characters separately. They are not