<?php
-/***************************************************************
-* Copyright notice
-*
-* (c) 2009 Jochen Rau <jochen.rau@typoplanet.de>
-* All rights reserved
-*
-* This class is a backport of the corresponding class of FLOW3.
-* All credits go to the v5 team.
-*
-* This script is part of the TYPO3 project. The TYPO3 project is
-* free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* The GNU General Public License can be found at
-* http://www.gnu.org/copyleft/gpl.html.
-*
-* This script is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
+
+/* *
+ * This script belongs to the Extbase framework. *
+ * *
+ * It is free software; you can redistribute it and/or modify it under *
+ * the terms of the GNU Lesser General Public License as published by the *
+ * Free Software Foundation, either version 3 of the License, or (at your *
+ * option) any later version. *
+ * *
+ * This script is distributed in the hope that it will be useful, but *
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- *
+ * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser *
+ * General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with the script. *
+ * If not, see http://www.gnu.org/licenses/lgpl.html *
+ * *
+ * The TYPO3 project - inspiring people to share! *
+ * */
+
+require_once('AbstractValidatorTestcase.php');
/**
* Testcase for the email address validator
*
- * @package Extbase
- * @subpackage extbase
- * @version $Id: EmailAddressValidator_testcase.php 2428 2010-07-20 10:18:51Z jocrau $
+ * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License, version 3 or later
*/
-class Tx_Extbase_Tests_Unit_Validation_Validator_EmailAddressValidatorTest extends Tx_Extbase_Tests_Unit_BaseTestCase {
+class Tx_Extbase_Tests_Unit_Validation_Validator_EmailAddressValidatorTest extends Tx_Extbase_Tests_Unit_Validation_Validator_AbstractValidatorTestcase {
+
+ protected $validatorClassName = 'Tx_Extbase_Validation_Validator_EmailAddressValidator';
/**
* Data provider with valid email addresses
*
* @return array
+ * @author Karsten Dambekalns <karsten@typo3.org>
*/
public function validAddresses() {
return array(
array('andreas.foerthner@netlogix.de'),
- array('user@localhost'),
array('user@localhost.localdomain'),
array('info@guggenheim.museum'),
array('just@test.invalid'),
- array('just+spam@test.de'),
- array('local@192.168.0.2')
+ array('just+spam@test.de')
);
}
/**
+ * @author Karsten Dambekalns <karsten@typo3.org>
* @test
* @dataProvider validAddresses
+ * @param mixed $address
*/
- public function emailAddressValidatorReturnsTrueForAValidEmailAddress($address) {
- $emailAddressValidator = new Tx_Extbase_Validation_Validator_EmailAddressValidator();
- $this->assertTrue($emailAddressValidator->isValid($address), "$address was declared to be invalid, but it is valid.");
+ public function emailAddressValidatorReturnsNoErrorsForAValidEmailAddress($address) {
+ $this->assertFalse($this->validator->validate($address)->hasErrors());
}
/**
* Data provider with invalid email addresses
*
* @return array
+ * @author Karsten Dambekalns <karsten@typo3.org>
*/
public function invalidAddresses() {
return array(
array('andreas.foerthner@'),
- array('andreas@foerthner@example.com'),
array('@typo3.org'),
array('someone@typo3.'),
array('local@192.168.2'),
- array('local@192.168.270.1')
+ array('local@192.168.270.1'),
+ array('foo@bar.com' . chr(0)),
+ array('foo@bar.org' . chr(10)),
+ array('andreas@foerthner@example.com'),
+ array('some@one.net ')
);
}
/**
+ * @author Karsten Dambekalns <karsten@typo3.org>
* @test
* @dataProvider invalidAddresses
+ * @param mixed $address
*/
public function emailAddressValidatorReturnsFalseForAnInvalidEmailAddress($address) {
- $emailAddressValidator = $this->getMock('Tx_Extbase_Validation_Validator_EmailAddressValidator', array('addError'), array(), '', FALSE);
- $this->assertFalse($emailAddressValidator->isValid($address));
+ $this->assertTrue($this->validator->validate($address)->hasErrors());
}
/**
* @test
+ * @author Andreas Förthner <andreas.foerthner@netlogix.de>
*/
public function emailValidatorCreatesTheCorrectErrorForAnInvalidEmailAddress() {
- $emailAddressValidator = $this->getMock('Tx_Extbase_Validation_Validator_EmailAddressValidator', array('addError'), array(), '', FALSE);
- $emailAddressValidator->expects($this->once())->method('addError')->with('The given subject was not a valid email address.', 1221559976);
- $emailAddressValidator->isValid('notAValidMail@Address');
+ $this->assertEquals(1, count($this->validator->validate('notAValidMail@Address')->getErrors()));
}
-
}
-
?>
\ No newline at end of file