Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test updates
  • Loading branch information
Miliooo committed Oct 21, 2013
commit ac283dfe8a711169622aa5fc1dc969810f89028a
18 changes: 9 additions & 9 deletions Tests/DependencyInjection/FOSMessageExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class FOSMessageExtensionTest extends \PHPUnit_Framework_TestCase
{

/** @var ContainerBuilder */
protected $configuration;
protected $containerBuilder;

/**
* @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
Expand Down Expand Up @@ -65,22 +65,22 @@ public function testFlashesAreDisabledByDefault()

public function testUserEnablesFlashes()
{
$this->configuration = new ContainerBuilder();
$this->containerBuilder = new ContainerBuilder();
$loader = new FOSMessageExtension();
$config = $this->getEmptyConfigWithFlashesEnabled();
$loader->load(array($config), $this->configuration);
$loader->load(array($config), $this->containerBuilder);

$this->assertHasDefinition('fos_message.flash_listener');
$this->assertParameter('success', 'fos_message.flash_messages_key');
}

protected function createEmptyConfiguration()
{
$this->configuration = new ContainerBuilder();
$this->containerBuilder = new ContainerBuilder();
$loader = new FOSMessageExtension();
$config = $this->getEmptyConfig();
$loader->load(array($config), $this->configuration);
$this->assertTrue($this->configuration instanceof ContainerBuilder);
$loader->load(array($config), $this->containerBuilder);
$this->assertTrue($this->containerBuilder instanceof ContainerBuilder);
}

/**
Expand Down Expand Up @@ -120,22 +120,22 @@ protected function getEmptyConfigWithFlashesEnabled()
*/
private function assertParameter($value, $key)
{
$this->assertEquals($value, $this->configuration->getParameter($key), sprintf('%s parameter is correct', $key));
$this->assertEquals($value, $this->containerBuilder->getParameter($key), sprintf('%s parameter is correct', $key));
}

/**
* @param string $id
*/
private function assertHasDefinition($id)
{
$this->assertTrue(($this->configuration->hasDefinition($id) ? : $this->configuration->hasAlias($id)));
$this->assertTrue(($this->containerBuilder->hasDefinition($id) || $this->containerBuilder->hasAlias($id)));
}

/**
* @param string $id
*/
private function assertNotHasDefinition($id)
{
$this->assertFalse(($this->configuration->hasDefinition($id) ? : $this->configuration->hasAlias($id)));
$this->assertFalse(($this->containerBuilder->hasDefinition($id) || $this->containerBuilder->hasAlias($id)));
}
}