Remove entity_load* usage for node entity type

The patch applies and it handles all useages of entity_load*'node', but there's one thing:

+++ b/core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php
@@ -52,11 +53,14 @@ protected function setUp() {
   public function testChangedTimeAfterSaveWithoutChanges() {
-    $node = entity_load('node', 1);
+    $node = Node::load(1);
     $changed_timestamp = $node->getChangedTime();
 
     $node->save();
-    $node = entity_load('node', 1, TRUE);
+    $storage = $this->container->get('entity_type.manager')->getStorage('node');
+    $storage->resetCache([1]);
+
+    $node = $storage->load(1);
     $this->assertEqual($changed_timestamp, $node->getChangedTime(), "The entity's changed time wasn't updated after API save without changes.");
 
     // Ensure different save timestamps.
@@ -65,7 +69,10 @@ public function testChangedTimeAfterSaveWithoutChanges() {

@@ -65,7 +69,10 @@ public function testChangedTimeAfterSaveWithoutChanges() {
     // Save the node on the regular node edit form.
     $this->drupalPostForm('node/1/edit', array(), t('Save'));
 
-    $node = entity_load('node', 1, TRUE);
+    $storage = $this->container->get('entity_type.manager')->getStorage('node');
+    $storage->resetCache([1]);
+
+    $node = $storage->load(1);
     $this->assertNotEqual($changed_timestamp, $node->getChangedTime(), "The entity's changed time was updated after form save without changes.");
   }

Get $storage once at the top of the method, and then use it in all the different places, including replacing Node::load().

Done.
Please check.

Added suggested changes.

+++ b/core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php
@@ -52,11 +53,12 @@ protected function setUp() {
   public function testChangedTimeAfterSaveWithoutChanges() {
-    $node = entity_load('node', 1);
+    $node = Node::load(1);
     $changed_timestamp = $node->getChangedTime();
-
     $node->save();
-    $node = entity_load('node', 1, TRUE);
+    $storage = $this->container->get('entity_type.manager')->getStorage('node');
+    $storage->resetCache([1]);
+    $node = $storage->load(1);
     $this->assertEqual($changed_timestamp, $node->getChangedTime(), "The entity's changed time wasn't updated after API save without changes.");
 
     // Ensure different save timestamps.

Right, that's what I was referring to in #3. Node::load(1); can be replaced with $storage->load(1).

So: Replace Node::load(1) with a call to $storage->load(1). In order to do that, get $storage at the top of the function instead of the middle.

The reason to do this is: Node::load() gets the storage service from \Drupal, which is generally bad for tests. In other circumstances it doesn't matter so much, and if we weren't already getting the storage service I wouldn't bring it up.

Hi Mile23,

Worked on suggestion mentioned. Please review.

Sorry, Didn't noticed previously added patch.

Worked on suggested changes.

Committed/pushed to 8.2.x, thanks!

So something went strange with this and it is not in HEAD. I think it (or part of it) got committed along with #2723589: Remove entity_load* usage for filter_format entity type, and then HEAD broke.

Setting this issue back to RTBC and sending for a retest.

Alright, I took a look at the actual patch here now that we know it doesn't break HEAD when it's applied as a whole. ;)

+++ b/core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php
@@ -52,11 +53,11 @@ protected function setUp() {
   public function testChangedTimeAfterSaveWithoutChanges() {
-    $node = entity_load('node', 1);
+    $storage = $this->container->get('entity_type.manager')->getStorage('node');
+    $storage->resetCache([1]);
+    $node = $storage->load(1);
     $changed_timestamp = $node->getChangedTime();
-
     $node->save();
-    $node = entity_load('node', 1, TRUE);
     $this->assertEqual($changed_timestamp, $node->getChangedTime(), "The entity's changed time wasn't updated after API save without changes.");

This appears to be changing the logic of the test. It's no longer ensuring the entity is reloaded with the cache reset after the save() call, which seems to me to be the point of the test.

Patch attached addresses #19 by @xjm.

+++ b/core/modules/node/src/Tests/NodeFormSaveChangedTimeTest.php
@@ -2,6 +2,7 @@
+use Drupal\node\Entity\Node;

are we using this Node class ? if not remove it.

Thank you Naveen for catching that, interdiff and patch attached.

Committed fc189a4 and pushed to 8.2.x. Thanks!