[DependencyInjection] Added tests for ContainerBuilder class

symfony · Oct 18, 2010 · c543692 · c543692
1 parent 7225cf6
commit c543692
Showing 1 changed file with 15 additions and 0 deletions.
diff --git 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');
     }
 }