[GENERIC] Zend_Validate:

- reworked some unittests

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22295 44c647ce-9c0f-0410-b52a-842ac1e357ba

tests/Zend/Validate/FloatTest.php

@@ -168,12 +168,56 @@ class Zend_Validate_FloatTest extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * @ZF-7987
+     */
+    public function testPhpLocaleFrFloatType()
+    {
+        setlocale(LC_ALL, 'fr');
+        $valid = new Zend_Validate_Float();
+        $this->assertTrue($valid->isValid(10.5));
+    }
+
+    /**
      * @ZF-8919
      */
     public function testPhpLocaleDeStringType()
     {
+        setlocale(LC_ALL, 'de_AT');
         setlocale(LC_NUMERIC, 'de_AT');
-        $valid = new Zend_Validate_Float();
+        $valid = new Zend_Validate_Float('de_AT');
+        $this->assertTrue($valid->isValid('1,3'));
+        $this->assertTrue($valid->isValid('1000,3'));
+        $this->assertTrue($valid->isValid('1.000,3'));
+        $this->assertFalse($valid->isValid('1.3'));
+        $this->assertFalse($valid->isValid('1000.3'));
+        $this->assertFalse($valid->isValid('1,000.3'));
+    }
+
+    /**
+     * @ZF-8919
+     */
+    public function testPhpLocaleFrStringType()
+    {
+        $valid = new Zend_Validate_Float('fr_FR');
         $this->assertTrue($valid->isValid('1,3'));
+        $this->assertTrue($valid->isValid('1000,3'));
+        $this->assertTrue($valid->isValid('1 000,3'));
+        $this->assertFalse($valid->isValid('1.3'));
+        $this->assertFalse($valid->isValid('1000.3'));
+        $this->assertFalse($valid->isValid('1,000.3'));
+    }
+
+    /**
+     * @ZF-8919
+     */
+    public function testPhpLocaleEnStringType()
+    {
+        $valid = new Zend_Validate_Float('en_US');
+        $this->assertTrue($valid->isValid('1.3'));
+        $this->assertTrue($valid->isValid('1000.3'));
+        $this->assertTrue($valid->isValid('1,000.3'));
+        $this->assertFalse($valid->isValid('1,3'));
+        $this->assertFalse($valid->isValid('1000,3'));
+        $this->assertFalse($valid->isValid('1.000,3'));
     }
 }