minor #17820 [Form] fix violation mapper tests (xabbuh)

fabpot · fabpot · commit fd33367074f8 · 2016-02-17T07:13:55.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [Form] fix violation mapper tests | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17099 | License | MIT | Doc PR | This takes into account the changes to the `getErrors()` in Symfony 2.5 (the method rturns a `FormErrorIterator` instead of an array) as well as the fact that non-submitted forms do not accept errors since #10567 anymore. Commits ------- f87558d [Form] fix violation mapper tests
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php
@@ -1552,12 +1552,14 @@ public function testBacktrackIfSeveralSubFormsWithSamePropertyPath()
         $parent->add($child2);
         $child2->add($grandChild);
 
+        $parent->submit(array());
+
         $this->mapper->mapViolation($violation, $parent);
 
         // The error occurred on the child of the second form with the same path
         $this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');
         $this->assertCount(0, $child1->getErrors(), $child1->getName().' should not have an error, but has one');
         $this->assertCount(0, $child2->getErrors(), $child2->getName().' should not have an error, but has one');
-        $this->assertEquals(array($this->getFormError()), $grandChild->getErrors(), $grandChild->getName().' should have an error, but has none');
+        $this->assertEquals(array($this->getFormError($violation, $grandChild)), iterator_to_array($grandChild->getErrors()), $grandChild->getName().' should have an error, but has none');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1552,12 +1552,14 @@ public function testBacktrackIfSeveralSubFormsWithSamePropertyPath()`
`1552`	`1552`	`$parent->add($child2);`
`1553`	`1553`	`$child2->add($grandChild);`
`1554`	`1554`
	`1555`	`+ $parent->submit(array());`
	`1556`	`+`
`1555`	`1557`	`$this->mapper->mapViolation($violation, $parent);`
`1556`	`1558`
`1557`	`1559`	`// The error occurred on the child of the second form with the same path`
`1558`	`1560`	`$this->assertCount(0, $parent->getErrors(), $parent->getName().' should not have an error, but has one');`
`1559`	`1561`	`$this->assertCount(0, $child1->getErrors(), $child1->getName().' should not have an error, but has one');`
`1560`	`1562`	`$this->assertCount(0, $child2->getErrors(), $child2->getName().' should not have an error, but has one');`
`1561`		`- $this->assertEquals(array($this->getFormError()), $grandChild->getErrors(), $grandChild->getName().' should have an error, but has none');`
	`1563`	`+ $this->assertEquals(array($this->getFormError($violation, $grandChild)), iterator_to_array($grandChild->getErrors()), $grandChild->getName().' should have an error, but has none');`
`1562`	`1564`	`}`
`1563`	`1565`	`}`