fix tests

Author: xabbuh

Tests/Compiler/AutowirePassTest.php

@@ -21,9 +21,9 @@
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
 use Symfony\Component\DependencyInjection\TypedReference;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
 
@@ -606,13 +606,17 @@ public function testSetterInjection()
         );
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @exceptedExceptionMessage Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy": method "setLogger()" does not exist.
+     */
     public function testWithNonExistingSetterAndAutowiring()
     {
         $container = new ContainerBuilder();
 
-        $definition = $container->register(HttpKernelInterface::class, HttpKernelInterface::class)->setAutowired(true);
+        $definition = $container->register(CaseSensitiveClass::class, CaseSensitiveClass::class)->setAutowired(true);
         $definition->addMethodCall('setLogger');
-        $this->expectException(RuntimeException::class);
+
         (new ResolveClassPass())->process($container);
         (new AutowireRequiredMethodsPass())->process($container);
         (new AutowirePass())->process($container);

Tests/Compiler/ResolveBindingsPassTest.php

@@ -17,13 +17,11 @@
 use Symfony\Component\DependencyInjection\Compiler\ResolveBindingsPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists;
 use Symfony\Component\DependencyInjection\TypedReference;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
 
@@ -115,6 +113,10 @@ public function testScalarSetter()
         $this->assertEquals([['setDefaultLocale', ['fr']]], $definition->getMethodCalls());
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @exceptedExceptionMessage Invalid service "Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy": method "setLogger()" does not exist.
+     */
     public function testWithNonExistingSetterAndBinding()
     {
         $container = new ContainerBuilder();
@@ -123,36 +125,11 @@ public function testWithNonExistingSetterAndBinding()
             '$c' => (new Definition('logger'))->setFactory('logger'),
         ];
 
-        $definition = $container->register(HttpKernelInterface::class, HttpKernelInterface::class);
-        $definition->addMethodCall('setLogger');
-        $definition->setBindings($bindings);
-        $this->expectException(RuntimeException::class);
-
-        $pass = new ResolveBindingsPass();
-        $pass->process($container);
-    }
-
-    public function testTupleBinding()
-    {
-        $container = new ContainerBuilder();
-
-        $bindings = [
-            '$c' => new BoundArgument(new Reference('bar')),
-            CaseSensitiveClass::class.'$c' => new BoundArgument(new Reference('foo')),
-        ];
-
         $definition = $container->register(NamedArgumentsDummy::class, NamedArgumentsDummy::class);
-        $definition->addMethodCall('setSensitiveClass');
-        $definition->addMethodCall('setAnotherC');
+        $definition->addMethodCall('setLogger');
         $definition->setBindings($bindings);
 
         $pass = new ResolveBindingsPass();
         $pass->process($container);
-
-        $expected = [
-            ['setSensitiveClass', [new Reference('foo')]],
-            ['setAnotherC', [new Reference('bar')]],
-        ];
-        $this->assertEquals($expected, $definition->getMethodCalls());
     }
 }