merged branch spike31/patch-1 (PR #5782)

This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #5782).

Commits
-------

d662e22 [DoctrineBridge] UniqueValidatorTest, Change message on assertions

Discussion
----------

[DoctrineBridge] UniqueValidatorTest, Change message on assertions
This commit is contained in:
Fabien Potencier 2012-10-19 13:20:42 +02:00
commit 22201dca3c

View File

@ -178,7 +178,7 @@ class UniqueValidatorTest extends DoctrineOrmTestCase
$entity2 = new SingleIdentEntity(2, 'Foo');
$violationsList = $validator->validate($entity2);
$this->assertEquals(1, $violationsList->count(), "No violations found on entity after it was saved to the database.");
$this->assertEquals(1, $violationsList->count(), "Violation found on entity with conflicting entity existing in the database.");
$violation = $violationsList[0];
$this->assertEquals('This value is already used.', $violation->getMessage());
@ -201,7 +201,7 @@ class UniqueValidatorTest extends DoctrineOrmTestCase
$entity2 = new SingleIdentEntity(2, 'Foo');
$violationsList = $validator->validate($entity2);
$this->assertEquals(1, $violationsList->count(), "No violations found on entity after it was saved to the database.");
$this->assertEquals(1, $violationsList->count(), "Violation found on entity with conflicting entity existing in the database.");
$violation = $violationsList[0];
$this->assertEquals('This value is already used.', $violation->getMessage());