From 01b7a0f381708c44bfda84ee6bcff7361efbbe64 Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Sat, 9 May 2020 15:00:59 -0500
Subject: [PATCH] Issue #3134333 by xjm, longwave, ravi.shankar, daffie: Change
 Drupal\Tests\search\Functional\SearchSimplifyTest and
 Drupal\Tests\search\Functional\SearchTokenizerTest to kerneltests

(cherry picked from commit 84f3be3d900c37dc1bc48f666f0d5d010d1d3ac7)
---
 .../{Functional => Kernel}/SearchSimplifyTest.php   | 11 +++--------
 .../{Functional => Kernel}/SearchTokenizerTest.php  | 13 +++----------
 2 files changed, 6 insertions(+), 18 deletions(-)
 rename core/modules/search/tests/src/{Functional => Kernel}/SearchSimplifyTest.php (94%)
 rename core/modules/search/tests/src/{Functional => Kernel}/SearchTokenizerTest.php (94%)

diff --git a/core/modules/search/tests/src/Functional/SearchSimplifyTest.php b/core/modules/search/tests/src/Kernel/SearchSimplifyTest.php
similarity index 94%
rename from core/modules/search/tests/src/Functional/SearchSimplifyTest.php
rename to core/modules/search/tests/src/Kernel/SearchSimplifyTest.php
index 127539ef742..944eb717a54 100644
--- a/core/modules/search/tests/src/Functional/SearchSimplifyTest.php
+++ b/core/modules/search/tests/src/Kernel/SearchSimplifyTest.php
@@ -1,26 +1,21 @@
 <?php
 
-namespace Drupal\Tests\search\Functional;
+namespace Drupal\Tests\search\Kernel;
 
-use Drupal\Tests\BrowserTestBase;
+use Drupal\KernelTests\KernelTestBase;
 
 /**
  * Tests that the search_simply() function works as intended.
  *
  * @group search
  */
-class SearchSimplifyTest extends BrowserTestBase {
+class SearchSimplifyTest extends KernelTestBase {
 
   /**
    * {@inheritdoc}
    */
   protected static $modules = ['search'];
 
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'stark';
-
   /**
    * Tests that all Unicode characters simplify correctly.
    */
diff --git a/core/modules/search/tests/src/Functional/SearchTokenizerTest.php b/core/modules/search/tests/src/Kernel/SearchTokenizerTest.php
similarity index 94%
rename from core/modules/search/tests/src/Functional/SearchTokenizerTest.php
rename to core/modules/search/tests/src/Kernel/SearchTokenizerTest.php
index 8b906a72451..25b66d7baf0 100644
--- a/core/modules/search/tests/src/Functional/SearchTokenizerTest.php
+++ b/core/modules/search/tests/src/Kernel/SearchTokenizerTest.php
@@ -1,26 +1,21 @@
 <?php
 
-namespace Drupal\Tests\search\Functional;
+namespace Drupal\Tests\search\Kernel;
 
-use Drupal\Tests\BrowserTestBase;
+use Drupal\KernelTests\KernelTestBase;
 
 /**
  * Tests that CJK tokenizer works as intended.
  *
  * @group search
  */
-class SearchTokenizerTest extends BrowserTestBase {
+class SearchTokenizerTest extends KernelTestBase {
 
   /**
    * {@inheritdoc}
    */
   protected static $modules = ['search'];
 
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'stark';
-
   /**
    * Verifies that strings of CJK characters are tokenized.
    *
@@ -36,7 +31,6 @@ class SearchTokenizerTest extends BrowserTestBase {
       ->set('index.minimum_word_size', 1)
       ->set('index.overlap_cjk', TRUE)
       ->save();
-    $this->refreshVariables();
 
     // Create a string of CJK characters from various character ranges in
     // the Unicode tables.
@@ -124,7 +118,6 @@ class SearchTokenizerTest extends BrowserTestBase {
       ->set('index.minimum_word_size', 1)
       ->set('index.overlap_cjk', TRUE)
       ->save();
-    $this->refreshVariables();
 
     $letters = 'abcdefghijklmnopqrstuvwxyz';
     $out = trim(search_simplify($letters));