[DoctrineBridge] Adapted UniqueValidator to latest changes in the Validator

This commit is contained in:
Bernhard Schussek 2012-11-22 16:42:07 +01:00
parent efe42cbb1f
commit 1f752e866e

View File

@ -12,6 +12,7 @@
namespace Symfony\Bridge\Doctrine\Tests\Validator\Constraints; namespace Symfony\Bridge\Doctrine\Tests\Validator\Constraints;
use Symfony\Bridge\Doctrine\Tests\DoctrineOrmTestCase; use Symfony\Bridge\Doctrine\Tests\DoctrineOrmTestCase;
use Symfony\Component\Validator\Tests\Fixtures\FakeMetadataFactory;
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity; use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity;
use Symfony\Bridge\Doctrine\Tests\Fixtures\DoubleIdentEntity; use Symfony\Bridge\Doctrine\Tests\Fixtures\DoubleIdentEntity;
use Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIdentEntity; use Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIdentEntity;
@ -93,17 +94,6 @@ class UniqueValidatorTest extends DoctrineOrmTestCase
return $em; return $em;
} }
protected function createMetadataFactoryMock($metadata)
{
$metadataFactory = $this->getMock('Symfony\Component\Validator\Mapping\ClassMetadataFactoryInterface');
$metadataFactory->expects($this->any())
->method('getClassMetadata')
->with($this->equalTo($metadata->name))
->will($this->returnValue($metadata));
return $metadataFactory;
}
protected function createValidatorFactory($uniqueValidator) protected function createValidatorFactory($uniqueValidator)
{ {
$validatorFactory = $this->getMock('Symfony\Component\Validator\ConstraintValidatorFactoryInterface'); $validatorFactory = $this->getMock('Symfony\Component\Validator\ConstraintValidatorFactoryInterface');
@ -138,7 +128,8 @@ class UniqueValidatorTest extends DoctrineOrmTestCase
)); ));
$metadata->addConstraint($constraint); $metadata->addConstraint($constraint);
$metadataFactory = $this->createMetadataFactoryMock($metadata); $metadataFactory = new FakeMetadataFactory();
$metadataFactory->addMetadata($metadata);
$validatorFactory = $this->createValidatorFactory($uniqueValidator); $validatorFactory = $this->createValidatorFactory($uniqueValidator);
return new Validator($metadataFactory, $validatorFactory); return new Validator($metadataFactory, $validatorFactory);