diff core/tests/Drupal/Tests/Core/DrupalTest.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10

--- a/core/tests/Drupal/Tests/Core/DrupalTest.php	Tue Jul 10 15:07:59 2018 +0100
+++ b/core/tests/Drupal/Tests/Core/DrupalTest.php	Thu Feb 28 13:21:36 2019 +0000
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\Core;
 
+use Drupal\Core\DependencyInjection\ClassResolverInterface;
 use Drupal\Core\DependencyInjection\ContainerNotInitializedException;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -120,8 +121,21 @@
    * @covers ::classResolver
    */
   public function testClassResolver() {
-    $this->setMockContainerService('class_resolver');
-    $this->assertNotNull(\Drupal::classResolver());
+    $class_resolver = $this->prophesize(ClassResolverInterface::class);
+    $this->setMockContainerService('class_resolver', $class_resolver->reveal());
+    $this->assertInstanceOf(ClassResolverInterface::class, \Drupal::classResolver());
+  }
+
+  /**
+   * Tests the classResolver method when called with a class.
+   *
+   * @covers ::classResolver
+   */
+  public function testClassResolverWithClass() {
+    $class_resolver = $this->prophesize(ClassResolverInterface::class);
+    $class_resolver->getInstanceFromDefinition(static::class)->willReturn($this);
+    $this->setMockContainerService('class_resolver', $class_resolver->reveal());
+    $this->assertSame($this, \Drupal::classResolver(static::class));
   }
 
   /**