deblan-mirror/respect-validation
deblan-mirror/respect-validation
1
0
Fork 0
mirror of https://github.com/Respect/Validation.git synced 2024-06-01 13:22:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Chain validators, better tests

Browse source
This commit is contained in:
Alexandre Gomes Gaigalas 2010-09-23 20:24:22 -03:00
parent 2043c1129c
commit f6871cbc7d
6 changed files with 215 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
library/Respect/Validation/Chain.php Normal file
View file

@ -0,0 +1,42 @@
<?php
namespace Respect\Validation;
use LogicException;
class Chain extends Validator
{
protected $input;
protected $validators;
public static function all($validator, $anotherValidator=null, $etc=null)
{
$validator = new static;
foreach (func_get_args() as $v)
if (!is_array($v))
$validator->addValidator($v);
else
$validator->addValidators($v);
return $validator;
}
public static function __callStatic($method, $arguments)
{
$validator = new static;
$validator->__call($method, $arguments);
return $validator;
}
public function __call($method, $arguments)
{
if (0 === strpos($method, 'valid'))
foreach ($arguments as $a)
if (!is_array($a))
$this->addValidator(substr($method, 5) . '\\' . $a);
else
$this->addValidators($a, substr($method, 5));
return $this;
}
}

7
library/Respect/Validation/Validator.php
View file

@ -55,6 +55,8 @@ class Validator implements Validatable
public function hasValidator($validator)
{
if (empty($this->validators))
return false;
if ($validator instanceof Valitatable)
return isset($this->validators[spl_object_hash($validator)]);
else
@ -64,11 +66,12 @@ class Validator implements Validatable
});
}
public function addValidators(array $validators)
public function addValidators(array $validators, $prefix='')
{
foreach ($validators as $k => $v) {
if (is_object($v)) {
$this->addValidator($v);
continue;
} elseif (is_numeric($k)) {
$validatorName = $v;
$validatorArgs = array();
@ -82,6 +85,8 @@ class Validator implements Validatable
);
$validatorArgs = empty($v) ? array() : $v;
}
if (!empty($prefix))
$validatorName = $prefix . '\\' . $validatorName;
$this->addValidator($validatorName, $validatorArgs);
}
}

2
tests/bootstrap.php
View file

@ -1,6 +1,6 @@
<?php
set_include_path(get_include_path() . PATH_SEPARATOR . '../library/');
set_include_path(get_include_path() . PATH_SEPARATOR . '../library/'. PATH_SEPARATOR . './library/');
require_once 'SplClassLoader.php';
$respectLoader = new \SplClassLoader();
$respectLoader->register();

61
tests/library/Respect/Validation/ChainTest.php Normal file
View file

@ -0,0 +1,61 @@
<?php
namespace Respect\Validation;
class ChainTest extends ValidatorTestCase
{
/**
* @dataProvider providerForMockImpossibleValidators
*/
public function testSimpleChainValidators()
{
$validator = Chain::validFoo('Bar', 'Baz', 'Bat');
$this->assertValidatorPresence($validator, 'Bar', 'Baz', 'Bat');
}
/**
* @dataProvider providerForMockImpossibleValidators
*/
public function testNotSoSimpleChainValidators()
{
$validator = Chain::validFoo('Bar', 'Baz')->validFoo('Bat');
$this->assertValidatorPresence($validator, 'Bar', 'Baz', 'Bat');
}
/**
* @dataProvider providerForMockImpossibleValidators
*/
public function testComplexChainValidators()
{
$validator = Chain::validFoo(array(
'Bar',
'Baz' => array(234, 2342)
))->validFoo('Bat');
$this->assertValidatorPresence($validator, 'Bar', 'Baz', 'Bat');
}
/**
* @dataProvider providerForMockImpossibleValidators
*/
public function testAll()
{
$validator = Chain::all(
'Foo\Bar', 'Foo\Baz', 'Foo\Bat'
);
$this->assertValidatorPresence($validator, 'Bar', 'Baz', 'Bat');
}
/**
* @dataProvider providerForMockImpossibleValidators
*/
public function testAllArray()
{
$validator = Chain::all(
array('Foo\Bar', 'Foo\Baz', 'Foo\Bat')
);
$this->assertValidatorPresence($validator, 'Bar', 'Baz', 'Bat');
}
}

126
tests/library/Respect/Validation/ValidatorTest.php
View file

@ -2,91 +2,19 @@
namespace Respect\Validation;
use Mockery;
class ValidatorTest extends \PHPUnit_Framework_TestCase
class ValidatorTest extends ValidatorTestCase
{
protected $object;
protected function setUp()
{
$this->object = new Validator;
}
protected function tearDown()
{
}
protected function buildMockValidator($name, array $messages, $invalid=false)
{
$validator = Mockery::mock('Respect\Validation\Validatable');
if ($invalid) {
$validator->shouldReceive('validate')->andThrow(
new InvalidException('Always invalid, man.')
);
$validator->shouldReceive('isValid')->andReturn(false);
} else {
$validator->shouldReceive('isValid')->andReturn(true);
$validator->shouldReceive('validate')->andReturn(true);
}
$validator->shouldReceive('getMessages')->andReturn(
$messages
);
$className = 'Respect\Validation\Foo\\' . $name;
if (!class_exists($className, false)) {
eval("
namespace Respect\Validation\Foo;
class $name implements \Respect\Validation\Validatable {
public function validate(\$input) {}
public function isValid(\$input) {}
public function setMessages(array \$messages) {}
public function getMessages() {
return " . var_export($messages, true) . ";
}
}
");
}
return $validator;
}
public function providerForMockImpossibleValidators()
{
$firstValidator = $this->buildMockValidator(
'Bar', array('sfga', 'dfgb'), true
);
$secondValidator = $this->buildMockValidator(
'Baz', array('dgd', 'dfgE', 'dfgf'), true
);
$thirdValidator = $this->buildMockValidator(
'Bat', array('a34t'), true
);
return array(
array($firstValidator, $secondValidator, $thirdValidator),
array($secondValidator, $firstValidator, $thirdValidator),
array($thirdValidator, $secondValidator, $firstValidator)
);
}
public function providerForMockValidators()
{
$firstValidator = $this->buildMockValidator(
'Bar', array('a435', 'b345'), false
);
$secondValidator = $this->buildMockValidator(
'Baz', array('345d', '435E', 'f345'), false
);
$thirdValidator = $this->buildMockValidator(
'Bat', array('345324a'), false
);
return array(
array($firstValidator, $secondValidator, $thirdValidator),
array($secondValidator, $firstValidator, $thirdValidator),
array($thirdValidator, $secondValidator, $firstValidator)
);
unset($this->object);
}
/**
@ -127,8 +55,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
{
$messagesA = $a->getMessages();
$messagesB = $b->getMessages();
$this->object->addValidator($a);
$this->object->addValidator($b);
$this->object->addValidators(func_get_args());
$messagesObject = $this->object->getMessages();
foreach ($messagesA as $m) {
$this->assertContains($m, $messagesObject);
@ -144,9 +71,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
$this->object->addValidators(array(
'Foo\Bar', 'Foo\Baz', 'Foo\Bat' => array(1, 2, 3)
));
$this->assertTrue($this->object->hasValidator('Respect\Validation\Foo\Bar'));
$this->assertTrue($this->object->hasValidator('Respect\Validation\Foo\Baz'));
$this->assertTrue($this->object->hasValidator('Respect\Validation\Foo\Bat'));
$this->assertValidatorPresence($this->object, 'Bar', 'Baz', 'Bat');
}
/**
@ -165,9 +90,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
*/
public function testValidateManyValid($a, $b, $c)
{
$this->object->addValidator($a);
$this->object->addValidator($b);
$this->object->addValidator($c);
$this->object->addValidators(func_get_args());
$this->assertTrue($this->object->validate('any'));
}
@ -176,9 +99,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
*/
public function testManyIsValid($a, $b, $c)
{
$this->object->addValidator($a);
$this->object->addValidator($b);
$this->object->addValidator($c);
$this->object->addValidators(func_get_args());
$this->assertTrue($this->object->isValid('any'));
}
@ -187,9 +108,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
*/
public function testManyIsInvalid($a, $b, $c)
{
$this->object->addValidator($a);
$this->object->addValidator($b);
$this->object->addValidator($c);
$this->object->addValidators(func_get_args());
$this->assertFalse($this->object->isValid('any'));
}
@ -198,9 +117,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
*/
public function testManyIsInvalid2($a, $b, $c)
{
$this->object->addValidator($a);
$this->object->addValidator($b);
$this->object->addValidator($c);
$this->object->addValidators(func_get_args());
$this->object->addValidator(
$this->buildMockValidator('Aids', array('ergera'))
);
@ -212,9 +129,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
*/
public function testValidateAllInvalid($a, $b, $c)
{
$this->object->addValidator($a);
$this->object->addValidator($b);
$this->object->addValidator($c);
$this->object->addValidators(func_get_args());
try {
$this->object->validate('any');
} catch (InvalidException $e) {
@ -228,9 +143,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
public function testValidateOneValid($invalidA, $invalidB, $invalidC)
{
$valid = $this->buildMockValidator('Darth', array('o54n'));
$this->object->addValidator($invalidA);
$this->object->addValidator($invalidB);
$this->object->addValidator($invalidC);
$this->object->addValidators(func_get_args());
$this->object->addValidator($valid);
$this->assertTrue($this->object->validateOne('any'));
}
@ -240,9 +153,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
*/
public function testValidateOneAllRotten($invalidA, $invalidB, $invalidC)
{
$this->object->addValidator($invalidA);
$this->object->addValidator($invalidB);
$this->object->addValidator($invalidC);
$this->object->addValidators(func_get_args());
try {
$this->object->validateOne('any');
} catch (InvalidException $e) {
@ -256,9 +167,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
public function testIsValidOneValid($invalidA, $invalidB, $invalidC)
{
$valid = $this->buildMockValidator('Darth', array('o54n'));
$this->object->addValidator($invalidA);
$this->object->addValidator($invalidB);
$this->object->addValidator($invalidC);
$this->object->addValidators(func_get_args());
$this->object->addValidator($valid);
$this->assertTrue($this->object->isOneValid('any'));
}
@ -268,9 +177,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
*/
public function testIsValidOneAllRotten($invalidA, $invalidB, $invalidC)
{
$this->object->addValidator($invalidA);
$this->object->addValidator($invalidB);
$this->object->addValidator($invalidC);
$this->object->addValidators(func_get_args());
$this->assertFalse($this->object->isOneValid('any'));
}
@ -281,8 +188,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
{
$messagesA = $a->getMessages();
$messagesB = $b->getMessages();
$this->object->addValidator($a);
$this->object->addValidator($b);
$this->object->addValidators(func_get_args());
$this->object->setMessages(
array_map('strrev', $this->object->getMessages())
);
@ -301,9 +207,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
*/
public function testSetInvalidMessages($invalidA, $invalidB, $invalidC)
{
$this->object->addValidator($invalidA);
$this->object->addValidator($invalidB);
$this->object->addValidator($invalidC);
$this->object->addValidators(func_get_args());
$messages = $this->object->getMessages();
$messages = array_map('strrev', $messages);
array_pop($messages);

90
tests/library/Respect/Validation/ValidatorTestCase.php Normal file
View file

@ -0,0 +1,90 @@
<?php
namespace Respect\Validation;
use Mockery;
abstract class ValidatorTestCase extends \PHPUnit_Framework_TestCase
{
protected function assertValidatorPresence($validator)
{
$args = func_get_args();
array_shift($args);
foreach ($args as $req) {
$this->assertTrue(
$validator->hasValidator('Respect\Validation\Foo\\' . $req)
);
}
}
protected function buildMockValidator($name, array $messages, $invalid=false)
{
$validator = Mockery::mock('Respect\Validation\Validatable');
if ($invalid) {
$validator->shouldReceive('validate')->andThrow(
new InvalidException('Always invalid, man.')
);
$validator->shouldReceive('isValid')->andReturn(false);
} else {
$validator->shouldReceive('isValid')->andReturn(true);
$validator->shouldReceive('validate')->andReturn(true);
}
$validator->shouldReceive('getMessages')->andReturn(
$messages
);
$className = 'Respect\Validation\Foo\\' . $name;
if (!class_exists($className, false)) {
eval("
namespace Respect\Validation\Foo;
class $name implements \Respect\Validation\Validatable {
public function validate(\$input) {}
public function isValid(\$input) {}
public function setMessages(array \$messages) {}
public function getMessages() {
return " . var_export($messages, true) . ";
}
}
");
}
return $validator;
}
public function providerForMockImpossibleValidators()
{
$firstValidator = $this->buildMockValidator(
'Bar', array('sfga', 'dfgb'), true
);
$secondValidator = $this->buildMockValidator(
'Baz', array('dgd', 'dfgE', 'dfgf'), true
);
$thirdValidator = $this->buildMockValidator(
'Bat', array('a34t'), true
);
return array(
array($firstValidator, $secondValidator, $thirdValidator),
array($secondValidator, $firstValidator, $thirdValidator),
array($thirdValidator, $secondValidator, $firstValidator)
);
}
public function providerForMockValidators()
{
$firstValidator = $this->buildMockValidator(
'Bar', array('a435', 'b345'), false
);
$secondValidator = $this->buildMockValidator(
'Baz', array('345d', '435E', 'f345'), false
);
$thirdValidator = $this->buildMockValidator(
'Bat', array('345324a'), false
);
return array(
array($firstValidator, $secondValidator, $thirdValidator),
array($secondValidator, $firstValidator, $thirdValidator),
array($thirdValidator, $secondValidator, $firstValidator)
);
}
}