瀏覽代碼

[GENERIC] Unittests:

- fixed some unittests

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@20355 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 年之前
父節點
當前提交
6c817a83da
共有 3 個文件被更改,包括 6 次插入6 次删除
  1. 1 1
      tests/Zend/Validate/AlnumTest.php
  2. 3 3
      tests/Zend/Validate/EmailAddressTest.php
  3. 2 2
      tests/Zend/Validate/MessageTest.php

+ 1 - 1
tests/Zend/Validate/AlnumTest.php

@@ -157,7 +157,7 @@ class Zend_Validate_AlnumTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($this->_validator->isValid('#'));
         $messages = $this->_validator->getMessages();
         $arrayExpected = array(
-            Zend_Validate_Alnum::NOT_ALNUM => '\'#\' has not only alphabetic and digit characters'
+            Zend_Validate_Alnum::NOT_ALNUM => '\'#\' contains characters which are non alphabetic and no digits'
             );
         $this->assertThat($messages, $this->identicalTo($arrayExpected));
     }

+ 3 - 3
tests/Zend/Validate/EmailAddressTest.php

@@ -156,7 +156,7 @@ class Zend_Validate_EmailAddressTest extends PHPUnit_Framework_TestCase
         $this->assertContains('quoted-string', current($messages));
 
         $this->assertContains('Some User', next($messages));
-        $this->assertContains('not a valid local part', current($messages));
+        $this->assertContains('no valid local part', current($messages));
     }
 
     /**
@@ -184,7 +184,7 @@ class Zend_Validate_EmailAddressTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($this->_validator->isValid('username@ example . com'));
         $messages = $this->_validator->getMessages();
         $this->assertThat(count($messages), $this->greaterThanOrEqual(1));
-        $this->assertContains('not a valid hostname', current($messages));
+        $this->assertContains('no valid hostname', current($messages));
     }
 
     /**
@@ -219,7 +219,7 @@ class Zend_Validate_EmailAddressTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($this->_validator->isValid('User Name <username@example.com>'));
         $messages = $this->_validator->getMessages();
         $this->assertThat(count($messages), $this->greaterThanOrEqual(3));
-        $this->assertContains('not a valid hostname', current($messages));
+        $this->assertContains('no valid hostname', current($messages));
         $this->assertContains('cannot match TLD', next($messages));
         $this->assertContains('does not appear to be a valid local network name', next($messages));
     }

+ 2 - 2
tests/Zend/Validate/MessageTest.php

@@ -80,7 +80,7 @@ class Zend_Validate_MessageTest extends PHPUnit_Framework_TestCase
         $inputInvalid = 'abcdefghij';
         $this->assertFalse($this->_validator->isValid($inputInvalid));
         $messages = $this->_validator->getMessages();
-        $this->assertEquals("'$inputInvalid' is greater than 8 characters long", current($messages));
+        $this->assertEquals("'$inputInvalid' is more than 8 characters long", current($messages));
 
         $this->_validator->setMessage(
             'Your value is too long',
@@ -285,7 +285,7 @@ class Zend_Validate_MessageTest extends PHPUnit_Framework_TestCase
         $this->assertFalse($this->_validator->isValid($inputInvalid));
 
         $messages = $this->_validator->getMessages();
-        $this->assertEquals("'$inputInvalid' is greater than 8 characters long", current($messages));
+        $this->assertEquals("'$inputInvalid' is more than 8 characters long", current($messages));
 
         $errors = $this->_validator->getErrors();
         $this->assertEquals(Zend_Validate_StringLength::TOO_LONG, current($errors));