modify classes

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9855 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2011-11-22 09:03:29 +00:00
parent a9ee03e512
commit c5beeb5f5e
2 changed files with 10 additions and 9 deletions

View file

@ -3,6 +3,7 @@
if(!defined('FOLLOW_REQUEST_SSL')) define('FOLLOW_REQUEST_SSL',0); if(!defined('FOLLOW_REQUEST_SSL')) define('FOLLOW_REQUEST_SSL',0);
if(!defined('ENFORCE_SSL')) define('ENFORCE_SSL',1); if(!defined('ENFORCE_SSL')) define('ENFORCE_SSL',1);
if(!defined('RELEASE_SSL')) define('RELEASE_SSL',2); if(!defined('RELEASE_SSL')) define('RELEASE_SSL',2);
if(!defined('MOCK_CONTEXT')) define('MOCK_CONTEXT', 1);
class Context class Context
{ {

View file

@ -8,7 +8,7 @@ require_once _XE_PATH_.'classes/validator/Validator.class.php';
class ValidatorTest extends PHPUnit_Framework_TestCase class ValidatorTest extends PHPUnit_Framework_TestCase
{ {
public function _testRequired() { public function testRequired() {
$vd = new Validator(); $vd = new Validator();
$vd->addFilter('userid', array('required'=>'true')); $vd->addFilter('userid', array('required'=>'true'));
@ -19,9 +19,9 @@ class ValidatorTest extends PHPUnit_Framework_TestCase
// context data // context data
$this->assertFalse( $vd->validate() ); $this->assertFalse( $vd->validate() );
Context::set('userid', ''); Context::set('userid', '', true);
$this->assertFalse( $vd->validate() ); $this->assertFalse( $vd->validate() );
Context::set('userid', 'myuserid'); Context::set('userid', 'myuserid', true);
$this->assertTrue( $vd->validate() ); $this->assertTrue( $vd->validate() );
$vd->removeFilter('userid'); $vd->removeFilter('userid');
$this->assertTrue( $vd->validate() ); $this->assertTrue( $vd->validate() );
@ -31,14 +31,14 @@ class ValidatorTest extends PHPUnit_Framework_TestCase
$vd = new Validator(); $vd = new Validator();
$vd->addFilter('^user_', array('length'=>'5:')); $vd->addFilter('^user_', array('length'=>'5:'));
Context::set('user_123', 'abcd'); Context::set('user_123', 'abcd', true);
Context::set('user_456', '123'); Context::set('user_456', '123', true);
$this->assertFalse( $vd->validate() ); $this->assertFalse( $vd->validate() );
Context::set('user_123', 'abcdefg'); Context::set('user_123', 'abcdefg', true);
$this->assertFalse( $vd->validate() ); $this->assertFalse( $vd->validate() );
Context::set('user_456', '123456'); Context::set('user_456', '123456', true);
$this->assertTrue( $vd->validate() ); $this->assertTrue( $vd->validate() );
} }
@ -59,7 +59,7 @@ class ValidatorTest extends PHPUnit_Framework_TestCase
$vd->validate(&$arr); $vd->validate(&$arr);
$this->assertEquals( $arr, array('userid'=>'ownid') ); $this->assertEquals( $arr, array('userid'=>'ownid') );
if(method_exists()) { if(defined('MOCK_CONTEXT')) {
// context data // context data
$mock_vars = array(); // empty context variables $mock_vars = array(); // empty context variables
$vd->validate(); $vd->validate();
@ -67,7 +67,7 @@ class ValidatorTest extends PHPUnit_Framework_TestCase
$vd->load(dirname(__FILE__).'/login.xml'); $vd->load(dirname(__FILE__).'/login.xml');
Context::set('userid', ''); Context::set('userid', '', true);
$vd->validate(); $vd->validate();
$this->assertEquals( 'idididid', Context::get('userid') ); $this->assertEquals( 'idididid', Context::get('userid') );
} }