diff core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php @ 5:12f9dff5fda9 tip

Update to Drupal core 8.7.1
author Chris Cannam
date Thu, 09 May 2019 15:34:47 +0100
parents a9cd425dd02b
children
line wrap: on
line diff
--- a/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php	Thu Feb 28 13:11:55 2019 +0000
+++ b/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php	Thu May 09 15:34:47 2019 +0100
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\search\Functional;
 
+use Drupal\Core\Database\Database;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\Tests\BrowserTestBase;
@@ -207,14 +208,15 @@
     // previously.
     $current = REQUEST_TIME;
     $old = $current - 10;
-    db_update('search_dataset')
+    $connection = Database::getConnection();
+    $connection->update('search_dataset')
       ->fields(['reindex' => $old])
       ->condition('reindex', $current, '>=')
       ->execute();
 
     // Save the node again. Verify that the request time on it is not updated.
     $this->searchableNodes[1]->save();
-    $result = db_select('search_dataset', 'd')
+    $result = $connection->select('search_dataset', 'd')
       ->fields('d', ['reindex'])
       ->condition('type', 'node_search')
       ->condition('sid', $this->searchableNodes[1]->id())
@@ -302,7 +304,8 @@
    */
   protected function assertDatabaseCounts($count_node, $count_foo, $message) {
     // Count number of distinct nodes by ID.
-    $results = db_select('search_dataset', 'i')
+    $connection = Database::getConnection();
+    $results = $connection->select('search_dataset', 'i')
       ->fields('i', ['sid'])
       ->condition('type', 'node_search')
       ->groupBy('sid')
@@ -311,7 +314,7 @@
     $this->assertEqual($count_node, count($results), 'Node count was ' . $count_node . ' for ' . $message);
 
     // Count number of "foo" records.
-    $results = db_select('search_dataset', 'i')
+    $results = $connection->select('search_dataset', 'i')
       ->fields('i', ['sid'])
       ->condition('type', 'foo')
       ->execute()