From 884d2a50fea7212478bade268ac5a21920b64eb0 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
(cherry picked from commit b52340d155426791a13641ea329dc19c6ad9a42a)
---
.../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 d230613a3eb3..c1cf2f5bf64e 100644
--- a/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
@@ -197,8 +197,13 @@ public function testRevisions() {
'%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.
--
GitLab