Pull merge.

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

diff --git a/web/core/modules/aggregator/tests/src/Functional/UpdateFeedItemTest.php b/web/core/modules/aggregator/tests/src/Functional/UpdateFeedItemTest.php
index a7ec0edd5a33777f3da44ee05ca08c5c6cdfbd95..fd2a742443cb2cbf9d4fb181e56c99729f78ae6e 100644 (file)
--- a/web/core/modules/aggregator/tests/src/Functional/UpdateFeedItemTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/UpdateFeedItemTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\aggregator\Functional;
 
 use Drupal\aggregator\Entity\Feed;
+use Drupal\aggregator\Entity\Item;
 
 /**
  * Update feed items from a feed.
@@ -43,26 +44,24 @@ class UpdateFeedItemTest extends AggregatorTestBase {
     $view_link = $this->xpath('//div[@class="messages"]//a[contains(@href, :href)]', [':href' => 'aggregator/sources/']);
     $this->assert(isset($view_link), 'The message area contains a link to a feed');
 
-    $fid = db_query("SELECT fid FROM {aggregator_feed} WHERE url = :url", [':url' => $edit['url[0][value]']])->fetchField();
-    $feed = Feed::load($fid);
+    $fids = \Drupal::entityQuery('aggregator_feed')->condition('url', $edit['url[0][value]'])->execute();
+    $feed = Feed::load(array_values($fids)[0]);
 
     $feed->refreshItems();
-    $before = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()])->fetchField();
+    $iids = \Drupal::entityQuery('aggregator_item')->condition('fid', $feed->id())->execute();
+    $before = Item::load(array_values($iids)[0])->getPostedTime();
 
     // Sleep for 3 second.
     sleep(3);
-    db_update('aggregator_feed')
-      ->condition('fid', $feed->id())
-      ->fields([
-        'checked' => 0,
-        'hash' => '',
-        'etag' => '',
-        'modified' => 0,
-      ])
-      ->execute();
+    $feed
+      ->setLastCheckedTime(0)
+      ->setHash('')
+      ->setEtag('')
+      ->setLastModified(0)
+      ->save();
     $feed->refreshItems();
 
-    $after = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', [':fid' => $feed->id()])->fetchField();
+    $after = Item::load(array_values($iids)[0])->getPostedTime();
     $this->assertTrue($before === $after, format_string('Publish timestamp of feed item was not updated (@before === @after)', ['@before' => $before, '@after' => $after]));
 
     // Make sure updating items works even after uninstalling a module