From cb71f42b24324e08de8159aa8ec67614af407f44 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Tue, 30 Jun 2020 15:06:18 +0100
Subject: [PATCH] Issue #3152001 by narendra.rajwar27, munish.kumar, daffie,
 snehalgaikwad: Replace the database queries with an entity queries in
 NodeAccessBaseTableTest

---
 .../src/Functional/NodeAccessBaseTableTest.php  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php b/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
index 61794319cc6..54010538521 100644
--- a/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\node\Functional;
 
-use Drupal\Core\Database\Database;
 use Drupal\node\Entity\NodeType;
 
 /**
@@ -131,9 +130,19 @@ class NodeAccessBaseTableTest extends NodeTestBase {
         $this->nodesByUser[$this->webUser->id()][$node->id()] = $is_private;
       }
     }
-    $connection = Database::getConnection();
-    $this->publicTid = $connection->query('SELECT tid FROM {taxonomy_term_field_data} WHERE name = :name AND default_langcode = 1', [':name' => 'public'])->fetchField();
-    $this->privateTid = $connection->query('SELECT tid FROM {taxonomy_term_field_data} WHERE name = :name AND default_langcode = 1', [':name' => 'private'])->fetchField();
+    $public_tids = \Drupal::entityQuery('taxonomy_term')
+      ->accessCheck(FALSE)
+      ->condition('name', 'public')
+      ->condition('default_langcode', 1)
+      ->execute();
+    $this->publicTid = reset($public_tids);
+    $private_tids = \Drupal::entityQuery('taxonomy_term')
+      ->accessCheck(FALSE)
+      ->condition('name', 'private')
+      ->condition('default_langcode', 1)
+      ->execute();
+    $this->privateTid = reset($private_tids);
+
     $this->assertNotEmpty($this->publicTid, 'Public tid was found');
     $this->assertNotEmpty($this->privateTid, 'Private tid was found');
     foreach ($simple_users as $this->webUser) {