Browse Source

[GENERIC] Zend_Filter:

- fixed some unittests

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@21165 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 years ago
parent
commit
6ea0c9a665
1 changed files with 6 additions and 7 deletions
  1. 6 7
      tests/Zend/Filter/InputTest.php

+ 6 - 7
tests/Zend/Filter/InputTest.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 
-
 /**
  * Test helper
  */
@@ -202,7 +201,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertType('array', $messages);
         $this->assertEquals(array('month'), array_keys($messages));
         $this->assertType('array', $messages['month']);
-        $this->assertEquals("'6abc ' contains not only digit characters", current($messages['month']));
+        $this->assertEquals("'6abc ' contains characters which are not digits; but only digits are allowed", current($messages['month']));
 
         $errors = $input->getErrors();
         $this->assertType('array', $errors);
@@ -291,7 +290,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(array('field2', 'field3'), array_keys($messages));
         $this->assertType('array', $messages['field2']);
         $this->assertType('array', $messages['field3']);
-        $this->assertEquals("'abc123' contains not only digit characters",
+        $this->assertEquals("'abc123' contains characters which are not digits; but only digits are allowed",
             current($messages['field2']));
         $this->assertEquals("'150' is not between '1' and '100', inclusively",
             current($messages['field3']));
@@ -325,7 +324,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(array('field2a', 'field2b'), array_keys($messages));
         $this->assertType('array', $messages['field2a']);
         $this->assertType('array', $messages['field2b']);
-        $this->assertEquals("'abc123' contains not only digit characters",
+        $this->assertEquals("'abc123' contains characters which are not digits; but only digits are allowed",
             current($messages['field2a']));
         $this->assertEquals("'abc123' is not between '1' and '100', inclusively",
             current($messages['field2b']));
@@ -904,7 +903,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $this->assertType('array', $messages);
         $this->assertEquals(array('month'), array_keys($messages));
         $this->assertEquals(2, count($messages['month']));
-        $this->assertEquals("'13abc' contains not only digit characters", current($messages['month']));
+        $this->assertEquals("'13abc' contains characters which are not digits; but only digits are allowed", current($messages['month']));
         /**
          * @todo $this->assertEquals($betweenMesg, next($messages['month']));
          */
@@ -1209,7 +1208,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $messages = $input->getMessages();
         $this->assertType('array', $messages);
         $this->assertThat($messages, $this->arrayHasKey('field1'));
-        $this->assertEquals("'abc' contains not only digit characters", current($messages['field1']));
+        $this->assertEquals("'abc' contains characters which are not digits; but only digits are allowed", current($messages['field1']));
     }
 
     public function testGetPluginLoader()
@@ -1434,7 +1433,7 @@ class Zend_Filter_InputTest extends PHPUnit_Framework_TestCase
         $messages = $input->getMessages();
         $this->assertType('array', $messages);
         $this->assertThat($messages, $this->arrayHasKey('field1'));
-        $this->assertEquals("'abc' contains not only digit characters", current($messages['field1']));
+        $this->assertEquals("'abc' contains characters which are not digits; but only digits are allowed", current($messages['field1']));
     }
 
     public function testOptionPresence()