Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / tests / Drupal / Tests / Core / Entity / EntityResolverManagerTest.php

diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
index d2e5eae318af654615c5782cbe3711af7fa31f4e..cdd41e6d8c2676882b7cee682dcfa94af3fe419c 100644 (file)
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
@@ -445,17 +445,31 @@ class EntityResolverManagerTest extends UnitTestCase {
     $definition->expects($this->any())
       ->method('getClass')
       ->will($this->returnValue('Drupal\Tests\Core\Entity\SimpleTestEntity'));
+    $definition->expects($this->any())
+      ->method('isRevisionable')
+      ->willReturn(FALSE);
+    $revisionable_definition = $this->getMock('Drupal\Core\Entity\EntityTypeInterface');
+    $revisionable_definition->expects($this->any())
+      ->method('getClass')
+      ->will($this->returnValue('Drupal\Tests\Core\Entity\SimpleTestEntity'));
+    $revisionable_definition->expects($this->any())
+      ->method('isRevisionable')
+      ->willReturn(TRUE);
     $this->entityManager->expects($this->any())
       ->method('getDefinitions')
       ->will($this->returnValue([
         'entity_test' => $definition,
+        'entity_test_rev' => $revisionable_definition,
       ]));
     $this->entityManager->expects($this->any())
       ->method('getDefinition')
-      ->will($this->returnCallback(function ($entity_type) use ($definition) {
+      ->will($this->returnCallback(function ($entity_type) use ($definition, $revisionable_definition) {
         if ($entity_type == 'entity_test') {
           return $definition;
         }
+        elseif ($entity_type === 'entity_test_rev') {
+          return $revisionable_definition;
+        }
         else {
           return NULL;
         }
@@ -492,6 +506,8 @@ class SimpleTestEntity extends Entity {
 
 /**
  * A basic form with a passed entity with an interface.
+ *
+ * @internal
  */
 class BasicForm extends FormBase {