From c543692891947a0ba694855ff3449e4501eab98c Mon Sep 17 00:00:00 2001 From: Fabien Pennequin Date: Sun, 17 Oct 2010 17:26:47 +0200 Subject: [PATCH] [DependencyInjection] Added tests for ContainerBuilder class --- .../DependencyInjection/ContainerBuilderTest.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/Symfony/Tests/Component/DependencyInjection/ContainerBuilderTest.php b/tests/Symfony/Tests/Component/DependencyInjection/ContainerBuilderTest.php index 085071c9bea8..e5dab8b77ff6 100644 --- a/tests/Symfony/Tests/Component/DependencyInjection/ContainerBuilderTest.php +++ b/tests/Symfony/Tests/Component/DependencyInjection/ContainerBuilderTest.php @@ -18,6 +18,7 @@ use Symfony\Component\DependencyInjection\Resource\FileResource; require_once __DIR__.'/Fixtures/includes/classes.php'; +require_once __DIR__.'/Fixtures/includes/ProjectExtension.php'; class ContainerBuilderTest extends \PHPUnit_Framework_TestCase { @@ -340,6 +341,17 @@ public function testMerge() $this->assertEquals('BazClass', $container->getDefinition('foo')->getClass(), '->merge() overrides already defined services'); } + /** + * @covers Symfony\Component\DependencyInjection\ContainerBuilder::merge + * @expectedException LogicException + */ + public function testMergeLogicException() + { + $container = new ContainerBuilder(); + $container->freeze(); + $container->merge(new ContainerBuilder()); + } + /** * @covers Symfony\Component\DependencyInjection\ContainerBuilder::findTaggedServiceIds */ @@ -395,5 +407,8 @@ public function testExtension() $container->registerExtension($extension = new \ProjectExtension()); $this->assertTrue($container->getExtension('project') === $extension, '->registerExtension() registers an extension'); + + $this->setExpectedException('LogicException'); + $container->getExtension('no_registered'); } }