Pull merge.

[yaffs-website] / web / core / modules / aggregator / tests / src / Functional / DeleteFeedTest.php

diff --git a/web/core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php b/web/core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php
index 557720658da2555fb0174c73ae88526b6dd97360..7f6a4087f750c803a88aa253fb0ac584860d981c 100644 (file)
--- a/web/core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/DeleteFeedTest.php
@@ -43,8 +43,8 @@ class DeleteFeedTest extends AggregatorTestBase {
     $this->assertResponse(404, 'Deleted feed source does not exist.');
 
     // Check database for feed.
-    $result = db_query("SELECT COUNT(*) FROM {aggregator_feed} WHERE title = :title AND url = :url", [':title' => $feed1->label(), ':url' => $feed1->getUrl()])->fetchField();
-    $this->assertFalse($result, 'Feed not found in database');
+    $result = \Drupal::entityQuery('aggregator_feed')->condition('title', $feed1->label())->condition('url', $feed1->getUrl())->count()->execute();
+    $this->assertEquals(0, $result, 'Feed not found in database');
   }
 
 }