2
0
Просмотр исходного кода

[GENERIC] Zend_Form*:

- fixed unittests

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@18088 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 лет назад
Родитель
Сommit
aa97056b8d
2 измененных файлов с 11 добавлено и 10 удалено
  1. 7 7
      tests/Zend/Form/ElementTest.php
  2. 4 3
      tests/Zend/Form/_files/locale/array.php

+ 7 - 7
tests/Zend/Form/ElementTest.php

@@ -826,7 +826,7 @@ class Zend_Form_ElementTest extends PHPUnit_Framework_TestCase
         $messages = $this->element->getMessages();
         $found    = false;
         foreach ($messages as $key => $message) {
-            if ($key == 'stringEmpty') {
+            if ($key == 'digitsStringEmpty') {
                 $found = true;
                 break;
             }
@@ -1749,12 +1749,12 @@ class Zend_Form_ElementTest extends PHPUnit_Framework_TestCase
 
         $options = $this->getOptions();
         $options['filters'] = array(
-            array('StringToUpper', array('bar' => 'baz')),
+            array('Digits', array('bar' => 'baz')),
             array('Alpha', array('foo')),
         );
         $this->element->setOptions($options);
-        $filter = $this->element->getFilter('StringToUpper');
-        $this->assertTrue($filter instanceof Zend_Filter_StringToUpper);
+        $filter = $this->element->getFilter('Digits');
+        $this->assertTrue($filter instanceof Zend_Filter_Digits);
         $filter = $this->element->getFilter('Alpha');
         $this->assertTrue($filter instanceof Zend_Filter_Alpha);
     }
@@ -1767,7 +1767,7 @@ class Zend_Form_ElementTest extends PHPUnit_Framework_TestCase
         $options['filters'] = array(
             array(
                 'options' => array('baz'),
-                'filter'  => 'StringToUpper'
+                'filter'  => 'Digits'
             ),
             array(
                 'options' => array('foo'),
@@ -1775,8 +1775,8 @@ class Zend_Form_ElementTest extends PHPUnit_Framework_TestCase
             ),
         );
         $this->element->setOptions($options);
-        $filter = $this->element->getFilter('StringToUpper');
-        $this->assertTrue($filter instanceof Zend_Filter_StringToUpper);
+        $filter = $this->element->getFilter('Digits');
+        $this->assertTrue($filter instanceof Zend_Filter_Digits);
         $filter = $this->element->getFilter('Alpha');
         $this->assertTrue($filter instanceof Zend_Filter_Alpha);
     }

+ 4 - 3
tests/Zend/Form/_files/locale/array.php

@@ -21,9 +21,10 @@
  */
 
 return array(
-    'notDigits'   => 'Translating the notDigits string',
-    'stringEmpty' => 'Translating the stringEmpty string',
-    'isEmpty'     => 'Translating the isEmpty string',
+    'notDigits'         => 'Translating the notDigits string',
+    'digitsStringEmpty' => 'Translating the stringEmpty string',
+    'stringEmpty'       => 'Translating the stringEmpty string',
+    'isEmpty'           => 'Translating the isEmpty string',
 
     'submit'      => 'Submit Button',
     'foovalue'    => 'Foo Value',