Relax tests to unlock change on master

This commit is contained in:
Nicolas Grekas 2020-06-22 09:47:42 +02:00
parent cc145e2d9c
commit afe596e16a
3 changed files with 9 additions and 2 deletions

View File

@ -32,9 +32,11 @@ class CachePoolClearerPassTest extends TestCase
$container->setParameter('kernel.root_dir', 'foo');
$globalClearer = new Definition(Psr6CacheClearer::class);
$globalClearer->setPublic(true);
$container->setDefinition('cache.global_clearer', $globalClearer);
$publicPool = new Definition();
$publicPool->setPublic(true);
$publicPool->addArgument('namespace');
$publicPool->addTag('cache.pool', ['clearer' => 'clearer_alias']);
$container->setDefinition('public.pool', $publicPool);
@ -46,6 +48,7 @@ class CachePoolClearerPassTest extends TestCase
$container->setDefinition('private.pool', $privatePool);
$clearer = new Definition();
$clearer->setPublic(true);
$container->setDefinition('clearer', $clearer);
$container->setAlias('clearer_alias', 'clearer');

View File

@ -57,12 +57,14 @@ class FormPassTest extends TestCase
$extDefinition = $container->getDefinition('form.extension');
$locator = $extDefinition->getArgument(0);
$this->assertTrue(!$locator->isPublic() || $locator->isPrivate());
$this->assertEquals(
(new Definition(ServiceLocator::class, [[
__CLASS__.'_Type1' => new ServiceClosureArgument(new Reference('my.type1')),
__CLASS__.'_Type2' => new ServiceClosureArgument(new Reference('my.type2')),
]]))->addTag('container.service_locator')->setPublic(false),
$extDefinition->getArgument(0)
$locator->setPublic(false)
);
}

View File

@ -35,12 +35,14 @@ class AddConstraintValidatorsPassTest extends TestCase
$addConstraintValidatorsPass = new AddConstraintValidatorsPass();
$addConstraintValidatorsPass->process($container);
$locator = $container->getDefinition((string) $validatorFactory->getArgument(0));
$this->assertTrue(!$locator->isPublic() || $locator->isPrivate());
$expected = (new Definition(ServiceLocator::class, [[
Validator1::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
'my_constraint_validator_alias1' => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
Validator2::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service2')),
]]))->addTag('container.service_locator')->setPublic(false);
$this->assertEquals($expected, $container->getDefinition((string) $validatorFactory->getArgument(0)));
$this->assertEquals($expected, $locator->setPublic(false));
}
public function testAbstractConstraintValidator()