From 702e82466450b59ee7736e204e1af6a09bc2bd58 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 14 Jul 2020 11:06:36 +0100
Subject: [PATCH] Issue #3151975 by daffie, narendra.rajwar27: Replace the
 database query with an entity query in NodeRevisionsTest

---
 .../node/tests/src/Functional/NodeRevisionsTest.php      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/modules/node/tests/src/Functional/NodeRevisionsTest.php b/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
index b1daab25550e..77951ac1756d 100644
--- a/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
@@ -197,8 +197,13 @@ class NodeRevisionsTest extends NodeTestBase {
       '%title' => $nodes[1]->label(),
     ]), 'Revision deleted.');
     $connection = Database::getConnection();
-    $this->assertTrue($connection->query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = :nid and vid = :vid', [':nid' => $node->id(), ':vid' => $nodes[1]->getRevisionId()])->fetchField() == 0, 'Revision not found.');
-    $this->assertTrue($connection->query('SELECT COUNT(vid) FROM {node_field_revision} WHERE nid = :nid and vid = :vid', [':nid' => $node->id(), ':vid' => $nodes[1]->getRevisionId()])->fetchField() == 0, 'Field revision not found.');
+    $nids = \Drupal::entityQuery('node')
+      ->accessCheck(FALSE)
+      ->allRevisions()
+      ->condition('nid', $node->id())
+      ->condition('vid', $nodes[1]->getRevisionId())
+      ->execute();
+    $this->assertCount(0, $nids);
 
     // Set the revision timestamp to an older date to make sure that the
     // confirmation message correctly displays the stored revision date.