diff --git a/core/tests/Drupal/Tests/Component/Plugin/Factory/DefaultFactoryTest.php b/core/tests/Drupal/Tests/Component/Plugin/Factory/DefaultFactoryTest.php index 7114a6e..a97942a 100644 --- a/core/tests/Drupal/Tests/Component/Plugin/Factory/DefaultFactoryTest.php +++ b/core/tests/Drupal/Tests/Component/Plugin/Factory/DefaultFactoryTest.php @@ -48,21 +48,23 @@ protected function setUp() { } /** - * Tests the getPluginClass method. + * Tests the createInstance method. * * @see \Drupal\Component\Plugin\DefaultFactory::getPluginClass - * @dataProvider providerTestGetPluginClass + * @see \Drupal\Component\Plugin\DefaultFactory::createInstance + * + * @dataProvider providerTestCreateInstance */ - public function testGetPluginClass($plugin_id, $plugin_definition) { + public function testCreateInstance($plugin_id, $plugin_definition) { $this->discovery->expects($this->once()) ->method('getDefinition') ->with($plugin_id) ->will($this->returnValue($plugin_definition)); - $this->defaultFactory->setInterface('Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface'); + $this->defaultFactory->setInterface('\Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface'); $instance = $this->defaultFactory->createInstance($plugin_id, array()); $this->assertInstanceOf($plugin_definition['class'], $instance); - $this->assertInstanceOf('Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface', $instance); + $this->assertInstanceOf('\Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface', $instance); } /** @@ -71,9 +73,9 @@ public function testGetPluginClass($plugin_id, $plugin_definition) { * @return array * An array of plugin IDs and plugin definitions. * - * @see self::testGetPluginClassWithInvalidInput + * @see self::testCreateInstanceWithInvalidInput */ - public function providerTestGetPluginClass() { + public function providerTestCreateInstance() { return array( array('apple', array('class' => '\Drupal\plugin_test\Plugin\plugin_test\fruit\Apple')), array('banana', array('class' => '\Drupal\plugin_test\Plugin\plugin_test\fruit\Banana')), @@ -84,14 +86,14 @@ public function providerTestGetPluginClass() { * Tests the getPluginClass method with invalid input. * * @expectedException \Drupal\Component\Plugin\Exception\PluginException - * @dataProvider providerTestGetPluginClassWithInvalidInput + * @dataProvider providerTestCreateInstanceWithInvalidInput */ - public function testGetPluginClassWithInvalidInput($plugin_id, $plugin_definition) { + public function testCreateInstanceWithInvalidInput($plugin_id, $plugin_definition) { $this->discovery->expects($this->once()) ->method('getDefinition') ->with($plugin_id) ->will($this->returnValue($plugin_definition)); - $this->defaultFactory->setInterface('Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface'); + $this->defaultFactory->setInterface('\Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface'); $this->defaultFactory->createInstance($plugin_id, array()); } @@ -101,9 +103,9 @@ public function testGetPluginClassWithInvalidInput($plugin_id, $plugin_definitio * @return array * An array of plugin IDs and plugin definitions. * - * @see self::testGetPluginClassWithInvalidInput + * @see self::testCreateInstanceWithInvalidInput */ - public function providerTestGetPluginClassWithInvalidInput() { + public function providerTestCreateInstanceWithInvalidInput() { return array( // Provide no class definition. array('rasperry', array()), @@ -120,7 +122,7 @@ public function providerTestGetPluginClassWithInvalidInput() { * @expectedException \Drupal\Component\Plugin\Exception\PluginException */ public function testSetInterface() { - $this->defaultFactory->setInterface('Drupal\plugin_test\Plugin\plugin_test\fruit\VegetablesInterface'); + $this->defaultFactory->setInterface('\Drupal\plugin_test\Plugin\plugin_test\fruit\VegetablesInterface'); } }