Refactored the DI tests to load YAML and XML files instead of arrays

stof · stof · commit 37709f33e5b1 · 2012-04-19T20:08:39.000+02:00
diff --git a/Tests/DependencyInjection/Compiler/LoggerChannelPassTest.php b/Tests/DependencyInjection/Compiler/LoggerChannelPassTest.php
@@ -61,10 +61,6 @@ protected function getContainer()
         $container->set('monolog.handler.test', new Definition('%monolog.handler.null.class%', array (100, false)));
         $definition->addMethodCall('pushHandler', array(new Reference('monolog.handler.test')));
 
-        $service = new Definition('TestClass', array('false', new Reference('logger')));
-        $service->addTag('monolog.logger', array ('channel' => 'test'));
-        $container->setDefinition('test', $service);
-
         // Handlers
         $container->set('monolog.handler.a', new Definition('%monolog.handler.null.class%', array (100, false)));
         $container->set('monolog.handler.b', new Definition('%monolog.handler.null.class%', array (100, false)));
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -14,9 +14,6 @@
 use Symfony\Bundle\MonologBundle\DependencyInjection\Configuration;
 use Symfony\Component\Config\Definition\Processor;
 
-/**
- * @author Alexandre Salomé <alexandre.salome@gmail.com>
- */
 class ConfigurationTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -97,6 +94,7 @@ public function testArrays()
         $this->assertEquals('inclusive', $config['handlers']['foo']['channels']['type']);
         $this->assertEquals('A', $config['handlers']['foo']['channels']['elements'][0]);
         $this->assertEquals('B', $config['handlers']['foo']['channels']['elements'][1]);
+
         // Check bar
         $this->assertCount(2, $config['handlers']['bar']['channels']['elements']);
         $this->assertEquals('exclusive', $config['handlers']['bar']['channels']['type']);
@@ -159,8 +157,8 @@ public function testWithType()
      */
     protected function process($configs)
     {
-        $configuration = new Configuration();
         $processor = new Processor();
-        return $processor->process($configuration->getConfigTreeBuilder()->buildTree(), $configs);
+
+        return $processor->processConfiguration(new Configuration(), $configs);
     }
 }
diff --git a/Tests/DependencyInjection/Fixtures/xml/multiple_handlers.xml b/Tests/DependencyInjection/Fixtures/xml/multiple_handlers.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<srv:container xmlns="http://symfony.com/schema/dic/monolog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:srv="http://symfony.com/schema/dic/services"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
+
+    <config>
+        <handler name="custom" type="stream" path="/tmp/symfony.log" bubble="false" level="ERROR" />
+        <handler name="main" type="fingers_crossed" action-level="ERROR" handler="nested" />
+        <handler name="nested" type="stream" />
+    </config>
+</srv:container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/new_and_priority.xml b/Tests/DependencyInjection/Fixtures/xml/new_and_priority.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+
+<srv:container xmlns="http://symfony.com/schema/dic/monolog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:srv="http://symfony.com/schema/dic/services"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
+
+    <srv:imports>
+        <srv:import resource="new_and_priority_import.xml" />
+    </srv:imports>
+
+    <config>
+        <handler name="custom" type="stream" path="/tmp/symfony.log" bubble="true" level="WARNING" />
+        <handler name="first" type="rotating_file" path="/tmp/monolog.log" bubble="true" level="ERROR" priority="3" />
+        <handler name="last" type="stream" path="/tmp/last.log" bubble="true" level="ERROR" priority="-3" />
+    </config>
+</srv:container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/new_and_priority_import.xml b/Tests/DependencyInjection/Fixtures/xml/new_and_priority_import.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<srv:container xmlns="http://symfony.com/schema/dic/monolog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:srv="http://symfony.com/schema/dic/services"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
+
+    <config>
+        <handler name="custom" type="stream" path="/tmp/symfony.log" bubble="true" level="ERROR" />
+        <handler name="main" type="buffer" level="INFO" handler="nested" />
+        <handler name="nested" type="stream" />
+    </config>
+</srv:container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/new_at_end.xml b/Tests/DependencyInjection/Fixtures/xml/new_at_end.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+
+<srv:container xmlns="http://symfony.com/schema/dic/monolog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:srv="http://symfony.com/schema/dic/services"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
+
+    <srv:imports>
+        <srv:import resource="new_at_end_import.xml" />
+    </srv:imports>
+
+    <config>
+        <handler name="custom" type="stream" path="/tmp/symfony.log" bubble="false" level="WARNING" />
+        <handler name="new" type="stream" path="/tmp/monolog.log" bubble="true" level="ERROR" />
+    </config>
+</srv:container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/new_at_end_import.xml b/Tests/DependencyInjection/Fixtures/xml/new_at_end_import.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<srv:container xmlns="http://symfony.com/schema/dic/monolog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:srv="http://symfony.com/schema/dic/services"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
+
+    <config>
+        <handler name="custom" type="stream" path="/tmp/symfony.log" bubble="true" level="ERROR" />
+        <handler name="main" type="fingers_crossed" action-level="ERROR" handler="nested" />
+        <handler name="nested" type="stream" />
+    </config>
+</srv:container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/overwriting.xml b/Tests/DependencyInjection/Fixtures/xml/overwriting.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+
+<srv:container xmlns="http://symfony.com/schema/dic/monolog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:srv="http://symfony.com/schema/dic/services"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
+
+    <srv:imports>
+        <srv:import resource="overwriting_import.xml" />
+    </srv:imports>
+
+    <config>
+        <handler name="custom" type="stream" path="/tmp/symfony.log" bubble="true" level="WARNING" />
+    </config>
+</srv:container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/overwriting_import.xml b/Tests/DependencyInjection/Fixtures/xml/overwriting_import.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+
+<srv:container xmlns="http://symfony.com/schema/dic/monolog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:srv="http://symfony.com/schema/dic/services"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
+
+    <config>
+        <handler name="custom" type="stream" path="/tmp/symfony.log" bubble="false" level="ERROR" />
+        <handler name="main" type="fingers_crossed" action-level="ERROR" handler="nested" />
+        <handler name="nested" type="stream" />
+    </config>
+</srv:container>
diff --git a/Tests/DependencyInjection/Fixtures/yml/multiple_handlers.yml b/Tests/DependencyInjection/Fixtures/yml/multiple_handlers.yml
@@ -0,0 +1,13 @@
+monolog:
+    handlers:
+        custom:
+            type: stream
+            path: /tmp/symfony.log
+            bubble: false
+            level: ERROR
+        main:
+            type: fingers_crossed
+            action_level: ERROR
+            handler: nested
+        nested:
+            type: stream
diff --git a/Tests/DependencyInjection/Fixtures/yml/new_and_priority.yml b/Tests/DependencyInjection/Fixtures/yml/new_and_priority.yml
@@ -0,0 +1,22 @@
+imports:
+    - { resource: new_and_priority_import.yml }
+
+monolog:
+    handlers:
+        custom:
+            type: stream
+            path: /tmp/symfony.log
+            bubble: true
+            level: WARNING
+        first:
+            type: rotating_file
+            path: /tmp/monolog.log
+            bubble: true
+            level: ERROR
+            priority: 3
+        last:
+            type: stream
+            path: /tmp/last.log
+            bubble: true
+            level: ERROR
+            priority: -3
diff --git a/Tests/DependencyInjection/Fixtures/yml/new_and_priority_import.yml b/Tests/DependencyInjection/Fixtures/yml/new_and_priority_import.yml
@@ -0,0 +1,13 @@
+monolog:
+    handlers:
+        custom:
+            type: stream
+            path: /tmp/symfony.log
+            bubble: true
+            level: ERROR
+        main:
+            type: buffer
+            level: INFO
+            handler: nested
+        nested:
+            type: stream
diff --git a/Tests/DependencyInjection/Fixtures/yml/new_at_end.yml b/Tests/DependencyInjection/Fixtures/yml/new_at_end.yml
@@ -0,0 +1,15 @@
+imports:
+    - { resource: new_at_end_import.yml }
+
+monolog:
+    handlers:
+        custom:
+            type: stream
+            path: /tmp/symfony.log
+            bubble: false
+            level: WARNING
+        new:
+            type: stream
+            path: /tmp/monolog.log
+            bubble: true
+            level: ERROR
diff --git a/Tests/DependencyInjection/Fixtures/yml/new_at_end_import.yml b/Tests/DependencyInjection/Fixtures/yml/new_at_end_import.yml
@@ -0,0 +1,13 @@
+monolog:
+    handlers:
+        custom:
+            type: stream
+            path: /tmp/symfony.log
+            bubble: true
+            level: ERROR
+        main:
+            type: fingers_crossed
+            action_level: ERROR
+            handler: nested
+        nested:
+            type: stream
diff --git a/Tests/DependencyInjection/Fixtures/yml/overwriting.yml b/Tests/DependencyInjection/Fixtures/yml/overwriting.yml
@@ -0,0 +1,10 @@
+imports:
+    - { resource: overwriting_import.yml }
+
+monolog:
+    handlers:
+        custom:
+            type: stream
+            path: /tmp/symfony.log
+            bubble: true
+            level: WARNING
diff --git a/Tests/DependencyInjection/Fixtures/yml/overwriting_import.yml b/Tests/DependencyInjection/Fixtures/yml/overwriting_import.yml
@@ -0,0 +1,13 @@
+monolog:
+    handlers:
+        custom:
+            type: stream
+            path: /tmp/symfony.log
+            bubble: false
+            level: ERROR
+        main:
+            type: fingers_crossed
+            action_level: ERROR
+            handler: nested
+        nested:
+            type: stream
diff --git a/Tests/DependencyInjection/MonologExtensionTest.php b/Tests/DependencyInjection/MonologExtensionTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
-class MonologExtensionTest extends TestCase
+abstract class MonologExtensionTest extends TestCase
 {
     public function testLoadWithDefault()
     {
@@ -54,14 +54,8 @@ public function testLoadWithCustomValues()
 
     public function testLoadWithSeveralHandlers()
     {
-        $container = new ContainerBuilder();
-        $loader = new MonologExtension();
+        $container = $this->getContainer('multiple_handlers');
 
-        $loader->load(array(array('handlers' => array(
-            'custom' => array('type' => 'stream', 'path' => '/tmp/symfony.log', 'bubble' => false, 'level' => 'ERROR'),
-            'main' => array('type' => 'fingers_crossed', 'action_level' => 'ERROR', 'handler' => 'nested'),
-            'nested' => array('type' => 'stream')
-        ))), $container);
         $this->assertTrue($container->hasDefinition('monolog.logger'));
         $this->assertTrue($container->hasDefinition('monolog.handler.custom'));
         $this->assertTrue($container->hasDefinition('monolog.handler.main'));
@@ -82,19 +76,8 @@ public function testLoadWithSeveralHandlers()
 
     public function testLoadWithOverwriting()
     {
-        $container = new ContainerBuilder();
-        $loader = new MonologExtension();
+        $container = $this->getContainer('overwriting');
 
-        $loader->load(array(
-            array('handlers' => array(
-                'custom' => array('type' => 'stream', 'path' => '/tmp/symfony.log', 'bubble' => false, 'level' => 'ERROR'),
-                'main' => array('type' => 'fingers_crossed', 'action_level' => 'ERROR', 'handler' => 'nested'),
-                'nested' => array('type' => 'stream')
-            )),
-            array('handlers' => array(
-                'custom' => array('type' => 'stream', 'path' => '/tmp/symfony.log', 'bubble' => true, 'level' => 'WARNING'),
-            ))
-        ), $container);
         $this->assertTrue($container->hasDefinition('monolog.logger'));
         $this->assertTrue($container->hasDefinition('monolog.handler.custom'));
         $this->assertTrue($container->hasDefinition('monolog.handler.main'));
@@ -115,20 +98,8 @@ public function testLoadWithOverwriting()
 
     public function testLoadWithNewAtEnd()
     {
-        $container = new ContainerBuilder();
-        $loader = new MonologExtension();
+        $container = $this->getContainer('new_at_end');
 
-        $loader->load(array(
-            array('handlers' => array(
-                'custom' => array('type' => 'stream', 'path' => '/tmp/symfony.log', 'bubble' => true, 'level' => 'ERROR'),
-                'main' => array('type' => 'fingers_crossed', 'action_level' => 'ERROR', 'handler' => 'nested'),
-                'nested' => array('type' => 'stream')
-            )),
-            array('handlers' => array(
-                'custom' => array('type' => 'stream', 'path' => '/tmp/symfony.log', 'bubble' => false, 'level' => 'WARNING'),
-                'new' => array('type' => 'stream', 'path' => '/tmp/monolog.log', 'bubble' => true, 'level' => 'ERROR'),
-            ))
-        ), $container);
         $this->assertTrue($container->hasDefinition('monolog.logger'));
         $this->assertTrue($container->hasDefinition('monolog.handler.custom'));
         $this->assertTrue($container->hasDefinition('monolog.handler.main'));
@@ -147,21 +118,8 @@ public function testLoadWithNewAtEnd()
 
     public function testLoadWithNewAndPriority()
     {
-        $container = new ContainerBuilder();
-        $loader = new MonologExtension();
+        $container = $this->getContainer('new_and_priority');
 
-        $loader->load(array(
-            array('handlers' => array(
-                'custom' => array('type' => 'stream', 'path' => '/tmp/symfony.log', 'bubble' => true, 'level' => 'ERROR'),
-                'main' => array('type' => 'buffer', 'level' => 'INFO', 'handler' => 'nested'),
-                'nested' => array('type' => 'stream')
-            )),
-            array('handlers' => array(
-                'custom' => array('type' => 'stream', 'path' => '/tmp/symfony.log', 'bubble' => true, 'level' => 'WARNING'),
-                'first' => array('type' => 'rotating_file', 'path' => '/tmp/monolog.log', 'bubble' => true, 'level' => 'ERROR', 'priority' => 3),
-                'last' => array('type' => 'stream', 'path' => '/tmp/last.log', 'bubble' => true, 'level' => 'ERROR', 'priority' => -3),
-            ))
-        ), $container);
         $this->assertTrue($container->hasDefinition('monolog.logger'));
         $this->assertTrue($container->hasDefinition('monolog.handler.custom'));
         $this->assertTrue($container->hasDefinition('monolog.handler.main'));
@@ -244,6 +202,22 @@ public function testExceptionWhenUsingDebugName()
         $loader->load(array(array('handlers' => array('debug' => array('type' => 'stream')))), $container);
     }
 
+    protected function getContainer($fixture)
+    {
+        $container = new ContainerBuilder();
+        $container->registerExtension(new MonologExtension());
+
+        $this->loadFixture($container, $fixture);
+
+        $container->getCompilerPassConfig()->setOptimizationPasses(array());
+        $container->getCompilerPassConfig()->setRemovingPasses(array());
+        $container->compile();
+
+        return $container;
+    }
+
+    abstract protected function loadFixture(ContainerBuilder $container, $fixture);
+
     /**
      * Assertion on the Class of a DIC Service Definition.
      *
diff --git a/Tests/DependencyInjection/XmlMonologExtensionTest.php b/Tests/DependencyInjection/XmlMonologExtensionTest.php
diff --git a/Tests/DependencyInjection/YamlMonologExtensionTest.php b/Tests/DependencyInjection/YamlMonologExtensionTest.php
diff --git a/composer.json b/composer.json
