diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #22414 relax FormPass test assertions (xabbuh)

Browse Source 
This PR was merged into the 3.3-dev branch.

Discussion
----------

relax FormPass test assertions

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/22404#discussion_r111269604
| License       | MIT
| Doc PR        |

Relying on a precalculated hash makes the test very fragile as the hash
value changes with every change we make for some of the DI classes.

Commits
-------

9d73317 relax FormPass test assertions
This commit is contained in:
Nicolas Grekas 2017-04-13 13:30:47 +02:00
commit 3f8f6468f8
2 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php
View File

@ -166,7 +166,7 @@ class FormPassTest extends TestCase
/**
* @dataProvider privateTaggedServicesProvider
*/
public function testPrivateTaggedServices($id, $tagName, $argumentKey, $expectedArgument, array $tagAttributes = array())
public function testPrivateTaggedServices($id, $tagName, callable $assertion, array $tagAttributes = array())
{
$formPass = new FormPass();
$container = new ContainerBuilder();
@ -176,7 +176,7 @@ class FormPassTest extends TestCase
$formPass->process($container);
$this->assertEquals($expectedArgument, $container->getDefinition('form.extension')->getArgument($argumentKey));
$assertion($container);
}
public function privateTaggedServicesProvider()
@ -185,17 +185,34 @@ class FormPassTest extends TestCase
array(
'my.type',
'form.type',
0,
new Reference('service_locator.c35554e29b2a3001b879847fc6a49848'),
function (ContainerBuilder $container) {
$formTypes = $container->getDefinition('form.extension')->getArgument(0);
$this->assertInstanceOf(Reference::class, $formTypes);
$locator = $container->getDefinition((string) $formTypes);
$expectedLocatorMap = array(
'stdClass' => new ServiceClosureArgument(new Reference('my.type')),
);
$this->assertInstanceOf(Definition::class, $locator);
$this->assertEquals($expectedLocatorMap, $locator->getArgument(0));
},
),
array(
'my.type_extension',
'form.type_extension',
1,
array('Symfony\Component\Form\Extension\Core\Type\FormType' => new IteratorArgument(array(new Reference('my.type_extension')))),
function (ContainerBuilder $container) {
$this->assertEquals(
array('Symfony\Component\Form\Extension\Core\Type\FormType' => new IteratorArgument(array(new Reference('my.type_extension')))),
$container->getDefinition('form.extension')->getArgument(1)
);
},
array('extended_type' => 'Symfony\Component\Form\Extension\Core\Type\FormType'),
),
array('my.guesser', 'form.type_guesser', 2, new IteratorArgument(array(new Reference('my.guesser')))),
array('my.guesser', 'form.type_guesser', function (ContainerBuilder $container) {
$this->assertEquals(new IteratorArgument(array(new Reference('my.guesser'))), $container->getDefinition('form.extension')->getArgument(2));
}),
);
}

31
src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
View File

@ -164,7 +164,7 @@ class FormPassTest extends TestCase
/**
* @dataProvider privateTaggedServicesProvider
*/
public function testPrivateTaggedServices($id, $tagName, $argumentKey, $expectedArgument, array $tagAttributes = array())
public function testPrivateTaggedServices($id, $tagName, callable $assertion, array $tagAttributes = array())
{
$formPass = new FormPass();
$container = new ContainerBuilder();
@ -173,7 +173,7 @@ class FormPassTest extends TestCase
$container->register($id, 'stdClass')->setPublic(false)->addTag($tagName, $tagAttributes);
$formPass->process($container);
$this->assertEquals($expectedArgument, $container->getDefinition('form.extension')->getArgument($argumentKey));
$assertion($container);
}
public function privateTaggedServicesProvider()
@ -182,17 +182,34 @@ class FormPassTest extends TestCase
array(
'my.type',
'form.type',
0,
new Reference('service_locator.c35554e29b2a3001b879847fc6a49848'),
function (ContainerBuilder $container) {
$formTypes = $container->getDefinition('form.extension')->getArgument(0);
$this->assertInstanceOf(Reference::class, $formTypes);
$locator = $container->getDefinition((string) $formTypes);
$expectedLocatorMap = array(
'stdClass' => new ServiceClosureArgument(new Reference('my.type')),
);
$this->assertInstanceOf(Definition::class, $locator);
$this->assertEquals($expectedLocatorMap, $locator->getArgument(0));
},
),
array(
'my.type_extension',
'form.type_extension',
1,
array('Symfony\Component\Form\Extension\Core\Type\FormType' => new IteratorArgument(array(new Reference('my.type_extension')))),
function (ContainerBuilder $container) {
$this->assertEquals(
array('Symfony\Component\Form\Extension\Core\Type\FormType' => new IteratorArgument(array(new Reference('my.type_extension')))),
$container->getDefinition('form.extension')->getArgument(1)
);
},
array('extended_type' => 'Symfony\Component\Form\Extension\Core\Type\FormType'),
),
array('my.guesser', 'form.type_guesser', 2, new IteratorArgument(array(new Reference('my.guesser')))),
array('my.guesser', 'form.type_guesser', function (ContainerBuilder $container) {
$this->assertEquals(new IteratorArgument(array(new Reference('my.guesser'))), $container->getDefinition('form.extension')->getArgument(2));
}),
);
}