bug #11695 [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise (webmozart)

webmozart · webmozart · commit 3d59e3417f6f · 2014-08-19T10:50:01.000+02:00
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #11695). Discussion ---------- [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - I just ran the tests with ICU 52.1 installed and noticed that a few of them failed. This PR fixes these tests. Commits ------- 5440ed5 [Validators] Fixed failing tests requiring ICU 52.1 which are skipped otherwise
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php
@@ -82,7 +82,7 @@ public function testInvalidCountries($country)
         $this->validator->validate($country, $constraint);
 
         $this->assertViolation('myMessage', array(
-            '{{ value }}' => $country,
+            '{{ value }}' => '"'.$country.'"',
         ));
     }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
@@ -96,7 +96,7 @@ public function testInvalidCurrencies($currency)
         $this->validator->validate($currency, $constraint);
 
         $this->assertViolation('myMessage', array(
-            '{{ value }}' => $currency,
+            '{{ value }}' => '"'.$currency.'"',
         ));
     }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Intl\Util\IntlTestHelper;
 use Symfony\Component\Validator\Constraints\Language;
 use Symfony\Component\Validator\Constraints\LanguageValidator;
-use Symfony\Component\Validator\Validation;
 
 class LanguageValidatorTest extends AbstractConstraintValidatorTest
 {
@@ -83,7 +82,7 @@ public function testInvalidLanguages($language)
         $this->validator->validate($language, $constraint);
 
         $this->assertViolation('myMessage', array(
-            '{{ value }}' => $language,
+            '{{ value }}' => '"'.$language.'"',
         ));
     }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Intl\Util\IntlTestHelper;
 use Symfony\Component\Validator\Constraints\Locale;
 use Symfony\Component\Validator\Constraints\LocaleValidator;
-use Symfony\Component\Validator\Validation;
 
 class LocaleValidatorTest extends AbstractConstraintValidatorTest
 {
@@ -85,7 +84,7 @@ public function testInvalidLocales($locale)
         $this->validator->validate($locale, $constraint);
 
         $this->assertViolation('myMessage', array(
-            '{{ value }}' => $locale,
+            '{{ value }}' => '"'.$locale.'"',
         ));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function testInvalidCountries($country)`
`82`	`82`	`$this->validator->validate($country, $constraint);`
`83`	`83`
`84`	`84`	`$this->assertViolation('myMessage', array(`
`85`		`- '{{ value }}' => $country,`
	`85`	`+ '{{ value }}' => '"'.$country.'"',`
`86`	`86`	`));`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function testInvalidCurrencies($currency)`
`96`	`96`	`$this->validator->validate($currency, $constraint);`
`97`	`97`
`98`	`98`	`$this->assertViolation('myMessage', array(`
`99`		`- '{{ value }}' => $currency,`
	`99`	`+ '{{ value }}' => '"'.$currency.'"',`
`100`	`100`	`));`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`use Symfony\Component\Intl\Util\IntlTestHelper;`
`15`	`15`	`use Symfony\Component\Validator\Constraints\Language;`
`16`	`16`	`use Symfony\Component\Validator\Constraints\LanguageValidator;`
`17`		`-use Symfony\Component\Validator\Validation;`
`18`	`17`
`19`	`18`	`class LanguageValidatorTest extends AbstractConstraintValidatorTest`
`20`	`19`	`{`
`@@ -83,7 +82,7 @@ public function testInvalidLanguages($language)`
`83`	`82`	`$this->validator->validate($language, $constraint);`
`84`	`83`
`85`	`84`	`$this->assertViolation('myMessage', array(`
`86`		`- '{{ value }}' => $language,`
	`85`	`+ '{{ value }}' => '"'.$language.'"',`
`87`	`86`	`));`
`88`	`87`	`}`
`89`	`88`