From 45d92f1cef3b5ffe91d21438744b15571d1530de Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Wed, 20 Nov 2013 16:50:29 +0100 Subject: [PATCH] refactored emailvalidator test --- .../framework/validators/EmailValidatorTest.php | 37 ++++++++-------------- 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/tests/unit/framework/validators/EmailValidatorTest.php b/tests/unit/framework/validators/EmailValidatorTest.php index 71d1666..770914d 100644 --- a/tests/unit/framework/validators/EmailValidatorTest.php +++ b/tests/unit/framework/validators/EmailValidatorTest.php @@ -41,17 +41,23 @@ class EmailValidatorTest extends TestCase $this->assertFalse($validator->validateValue('info@örtliches.de')); $this->assertFalse($validator->validateValue('sam@рмкреатиф.ru')); $this->assertFalse($validator->validateValue('Informtation info@oertliches.de')); + $this->assertTrue($validator->validateValue('test@example.com')); + $this->assertTrue($validator->validateValue('John Smith ')); + $this->assertFalse($validator->validateValue('John Smith ')); } - public function testValidateIdnValue() + public function testValidateValueIdn() { - if (!extension_loaded("intl")) { - $this->markTestSkipped("intl not installed. Skipping."); + if (!function_exists('idn_to_ascii')) { + $this->markTestSkipped('Intl extension required'); + return; } - $validator = new EmailValidator(); $validator->enableIDN = true; + $this->assertTrue($validator->validateValue('5011@example.com')); + $this->assertTrue($validator->validateValue('example@äüößìà.de')); + $this->assertTrue($validator->validateValue('example@xn--zcack7ayc9a.de')); $this->assertTrue($validator->validateValue('info@örtliches.de')); $this->assertTrue($validator->validateValue('sam@рмкреатиф.ru')); $this->assertTrue($validator->validateValue('sam@rmcreative.ru')); @@ -73,6 +79,9 @@ class EmailValidatorTest extends TestCase $this->assertTrue($validator->validateValue('Carsten Brandt ')); $this->assertTrue($validator->validateValue('"Carsten Brandt" ')); $this->assertTrue($validator->validateValue('')); + $this->assertTrue($validator->validateValue('test@example.com')); + $this->assertTrue($validator->validateValue('John Smith ')); + $this->assertFalse($validator->validateValue('John Smith ')); } public function testValidateValueMx() @@ -96,24 +105,4 @@ class EmailValidatorTest extends TestCase $val->validateAttribute($model, 'attr_email'); $this->assertFalse($model->hasErrors('attr_email')); } - - public function testValidateValueIdn() - { - if (!function_exists('idn_to_ascii')) { - $this->markTestSkipped('Intl extension required'); - return; - } - $val = new EmailValidator(['enableIDN' => true]); - $this->assertTrue($val->validateValue('5011@example.com')); - $this->assertTrue($val->validateValue('example@äüößìà.de')); - $this->assertTrue($val->validateValue('example@xn--zcack7ayc9a.de')); - } - - public function testValidateValueWithName() - { - $val = new EmailValidator(['allowName' => true]); - $this->assertTrue($val->validateValue('test@example.com')); - $this->assertTrue($val->validateValue('John Smith ')); - $this->assertFalse($val->validateValue('John Smith ')); - } }