This commit is contained in:
Ilya Sigunov
2011-10-21 11:21:25 +04:00
parent 45c89d3f00
commit acb3b8bf27
3 changed files with 51 additions and 224 deletions

View File

@ -7,53 +7,48 @@
require_once dirname(__FILE__) . '/../../form/Form.php';
require_once dirname(__FILE__) . '/../../form/FormField.php';
require_once dirname(__FILE__) . '/../../session/Session.php';
require_once dirname(__FILE__) . '/../../validator/iValidator.php';
require_once dirname(__FILE__) . '/../../validator/Validator.php';
require_once dirname(__FILE__) . '/../../validator/RegexValidator.php';
require_once dirname(__FILE__) . '/../../validator/NotEmptyValidator.php';
require_once dirname(__FILE__) . '/../../validator/EmailValidator.php';
class FormTest extends PHPUnit_Framework_TestCase
{
public function testIsValidWithNotArray()
{
$form = new NotEmptyForm();
$this->setExpectedException('Exception');
$form->isValid('');
}
public function testIsValidCorrectFields()
{
$form = new NotEmptyForm();
$test_array = array(
$form = new NotEmptyForm();
$test_array = array(
'login'=> 'login',
'password'=> 'password'
);
$this->assertSame(1, $form->isValid($test_array));
);
$this->assertSame(1, $form->isValid($test_array));
}
public function testIsValidMissingField()
{
$form = new NotEmptyForm();
$test_array = array(
$form = new NotEmptyForm();
$test_array = array(
'password'=> 'password'
);
$this->assertSame(0, $form->isValid($test_array));
);
$this->assertSame(0, $form->isValid($test_array));
}
public function testGetValues()
{
$form = new NotEmptyForm();
$fields = array(
'login'=> 'login',
'password'=>'password'
);
$this->assertSame(1, $form->isValid($fields));
$this->assertEquals($fields, $form->getValues());
}
@ -61,14 +56,11 @@ class FormTest extends PHPUnit_Framework_TestCase
public function testGetValueCorrect()
{
$form = new NotEmptyForm();
$fields = array(
'login'=> 'login',
'password'=>'password'
);
$this->assertSame(1, $form->isValid($fields));
$this->assertEquals($fields['login'], $form->getValue('login'));
$this->assertEquals($fields['password'], $form->getValue('password'));
}
@ -77,13 +69,10 @@ class FormTest extends PHPUnit_Framework_TestCase
public function testGetValueMissing()
{
$form = new NotEmptyForm();
$fields = array(
'login'=> ''
);
$this->assertSame(0, $form->isValid($fields));
$this->assertEquals('', $form->getValue('login'));
$this->assertEquals('', $form->getValue('password'));
}
@ -92,15 +81,11 @@ class FormTest extends PHPUnit_Framework_TestCase
public function testGetValueMissingFieldLogin()
{
$form = new NotEmptyForm();
$fields = array(
'login'=> ''
);
$this->assertSame(0, $form->isValid($fields));
$this->assertFalse($form->getValue('loginw'));
$this->assertEquals('', $form->getValue('passwordw'));
}
@ -108,47 +93,35 @@ class FormTest extends PHPUnit_Framework_TestCase
public function testGetValueMissingFieldPassword()
{
$form = new NotEmptyForm();
$fields = array(
'login'=> ''
);
$this->assertSame(0, $form->isValid($fields));
$this->assertFalse($form->getValue('loginw'));
$this->assertEquals('', $form->getValue('password'));
}
public function testGetMessageTypeCorrect()
{
$form = new NotEmptyForm();
$fields = array(
'login'=> 'login',
'password'=>'password'
);
$this->assertEquals(1, $form->isValid($fields));
$this->assertEquals('success', Form::SUCCESS);
$this->assertEquals($form->getMessageType(), Form::SUCCESS);
}
public function testGetMessageTypeMissing()
{
$form = new NotEmptyForm();
$fields = array(
'login'=> '',
'password'=>''
);
$this->assertSame(0, $form->isValid($fields));
$this->assertEquals('error', Form::ERROR);
$this->assertEquals($form->getMessageType(), Form::ERROR);
}
@ -156,16 +129,12 @@ class FormTest extends PHPUnit_Framework_TestCase
public function testGetMessageCorrect()
{
$form = new NotEmptyForm();
$fields = array(
'login'=> 'login',
'password'=>'password'
);
$this->assertSame(1, $form->isValid($fields));
$form->setSuccessMessage('message');
$this->assertEquals('message', $form->getMessage());
}
@ -173,15 +142,11 @@ class FormTest extends PHPUnit_Framework_TestCase
public function testGetMessageMissing()
{
$form = new NotEmptyForm();
$fields = array(
'login'=> ''
);
$this->assertSame(0, $form->isValid($fields));
$form->setErrorMessage('message');
$this->assertEquals('message', $form->getMessage());
}
@ -189,87 +154,47 @@ class FormTest extends PHPUnit_Framework_TestCase
public function testSetSuccessMessage()
{
$form = new NotEmptyForm();
$fields = array(
'login'=> 'login',
'password'=>'password'
);
$this->assertSame(1, $form->isValid($fields));
$message = 'Form data valid';
$form->setSuccessMessage($message);
$this->assertNotNull($form->getMessage());
}
public function testSetErrorMessage()
{
$form = new NotEmptyForm();
$fields = array(
'login'=> ''
);
$this->assertSame(0, $form->isValid($fields));
$message = 'Form data invalid';
$form->setErrorMessage($message);
$this->assertNotNull($form->getMessage());
}
}
require_once dirname(__FILE__) . '/../../validator/iValidator.php';
require_once dirname(__FILE__) . '/../../validator/Validator.php';
require_once dirname(__FILE__) . '/../../validator/NotEmptyValidator.php';
class NotEmptyForm extends Form
{
public function init()
{
///*
$validator = new NotEmptyValidator();
$validator->setMessage('Enter login name.');
$this->addField('login')->addValidator($validator);
// User password
$validator = new NotEmptyValidator();
$validator->setMessage('Enter your password.');
$this->addField('password')->addValidator($validator);
}
public function getProp($name)
{
return $this->$name;
}
}
public function init()
{
///*
$validator = new NotEmptyValidator();
$validator->setMessage('Enter login name.');
$this->addField('login')->addValidator($validator);
require_once dirname(__FILE__) . '/../../validator/RegexValidator.php';
require_once dirname(__FILE__) . '/../../validator/EmailValidator.php';
// User password
$validator = new NotEmptyValidator();
$validator->setMessage('Enter your password.');
$this->addField('password')->addValidator($validator);
}
class DiffForm extends Form
{
public function init()
{
///*
$validator = new EmailValidator();
$validator->setMessage('Enter login name.');
$this->addField('login')->addValidator($validator);
// User password
$validator = new NotEmptyValidator();
$validator->setMessage('Enter your password.');
$this->addField('password')->addValidator($validator);
}
public function getProp($name)
{
return $this->$name;
}
public function getProp($name)
{
return $this->$name;
}
}