Commit 88672ed1 by Qiang Xue

furnishing base classes.

parent 8e05e6e6
...@@ -160,8 +160,12 @@ class Object ...@@ -160,8 +160,12 @@ class Object
/** /**
* Returns a value indicating whether a property is defined. * Returns a value indicating whether a property is defined.
* A property is defined if there is a getter or setter method * A property is defined if:
* defined in the class. Note that property names are case-insensitive. *
* - the class has a getter or setter method associated with the specified name
* (in this case, property name is case-insensitive);
* - the class has a member variable with the specified name (when `$checkVar` is true);
*
* @param string $name the property name * @param string $name the property name
* @param boolean $checkVar whether to treat member variables as properties * @param boolean $checkVar whether to treat member variables as properties
* @return boolean whether the property is defined * @return boolean whether the property is defined
...@@ -175,8 +179,12 @@ class Object ...@@ -175,8 +179,12 @@ class Object
/** /**
* Returns a value indicating whether a property can be read. * Returns a value indicating whether a property can be read.
* A property can be read if the class has a getter method * A property is readable if:
* for the property name. Note that property name is case-insensitive. *
* - the class has a getter method associated with the specified name
* (in this case, property name is case-insensitive);
* - the class has a member variable with the specified name (when `$checkVar` is true);
*
* @param string $name the property name * @param string $name the property name
* @param boolean $checkVar whether to treat member variables as properties * @param boolean $checkVar whether to treat member variables as properties
* @return boolean whether the property can be read * @return boolean whether the property can be read
...@@ -189,8 +197,12 @@ class Object ...@@ -189,8 +197,12 @@ class Object
/** /**
* Returns a value indicating whether a property can be set. * Returns a value indicating whether a property can be set.
* A property can be written if the class has a setter method * A property is writable if:
* for the property name. Note that property name is case-insensitive. *
* - the class has a setter method associated with the specified name
* (in this case, property name is case-insensitive);
* - the class has a member variable with the specified name (when `$checkVar` is true);
*
* @param string $name the property name * @param string $name the property name
* @param boolean $checkVar whether to treat member variables as properties * @param boolean $checkVar whether to treat member variables as properties
* @return boolean whether the property can be written * @return boolean whether the property can be written
......
...@@ -32,9 +32,12 @@ class ComponentTest extends \yiiunit\TestCase ...@@ -32,9 +32,12 @@ class ComponentTest extends \yiiunit\TestCase
public function testHasProperty() public function testHasProperty()
{ {
$this->assertTrue($this->component->hasProperty('Text'), "Component hasn't property Text"); $this->assertTrue($this->component->hasProperty('Text'));
$this->assertTrue($this->component->hasProperty('text'), "Component hasn't property text"); $this->assertTrue($this->component->hasProperty('text'));
$this->assertFalse($this->component->hasProperty('Caption'), "Component as property Caption"); $this->assertFalse($this->component->hasProperty('Caption'));
$this->assertTrue($this->component->hasProperty('content'));
$this->assertFalse($this->component->hasProperty('content', false));
$this->assertFalse($this->component->hasProperty('Content'));
} }
public function testCanGetProperty() public function testCanGetProperty()
...@@ -42,19 +45,26 @@ class ComponentTest extends \yiiunit\TestCase ...@@ -42,19 +45,26 @@ class ComponentTest extends \yiiunit\TestCase
$this->assertTrue($this->component->canGetProperty('Text')); $this->assertTrue($this->component->canGetProperty('Text'));
$this->assertTrue($this->component->canGetProperty('text')); $this->assertTrue($this->component->canGetProperty('text'));
$this->assertFalse($this->component->canGetProperty('Caption')); $this->assertFalse($this->component->canGetProperty('Caption'));
$this->assertTrue($this->component->canGetProperty('content'));
$this->assertFalse($this->component->canGetProperty('content', false));
$this->assertFalse($this->component->canGetProperty('Content'));
} }
public function testCanSetProperty() public function testCanSetProperty()
{ {
$this->assertTrue($this->component->canSetProperty('Text')); $this->assertTrue($this->component->canSetProperty('Text'));
$this->assertTrue($this->component->canSetProperty('text')); $this->assertTrue($this->component->canSetProperty('text'));
$this->assertFalse($this->component->canSetProperty('Object'));
$this->assertFalse($this->component->canSetProperty('Caption')); $this->assertFalse($this->component->canSetProperty('Caption'));
$this->assertTrue($this->component->canSetProperty('content'));
$this->assertFalse($this->component->canSetProperty('content', false));
$this->assertFalse($this->component->canSetProperty('Content'));
} }
public function testGetProperty() public function testGetProperty()
{ {
$this->assertTrue('default' === $this->component->Text); $this->assertTrue('default' === $this->component->Text);
$this->setExpectedException('yii\base\Exception'); $this->setExpectedException('yii\base\BadPropertyException');
$value2 = $this->component->Caption; $value2 = $this->component->Caption;
} }
...@@ -62,24 +72,30 @@ class ComponentTest extends \yiiunit\TestCase ...@@ -62,24 +72,30 @@ class ComponentTest extends \yiiunit\TestCase
{ {
$value = 'new value'; $value = 'new value';
$this->component->Text = $value; $this->component->Text = $value;
$text = $this->component->Text; $this->assertEquals($value, $this->component->Text);
$this->assertTrue($value === $this->component->Text); $this->setExpectedException('yii\base\BadPropertyException');
$this->setExpectedException('yii\base\Exception');
$this->component->NewMember = $value; $this->component->NewMember = $value;
} }
public function testIsset() public function testIsset()
{ {
$this->assertTrue(isset($this->component->Text)); $this->assertTrue(isset($this->component->Text));
$this->assertTrue(!empty($this->component->Text)); $this->assertFalse(empty($this->component->Text));
unset($this->component->Text);
$this->assertFalse(isset($this->component->Text));
$this->assertFalse(!empty($this->component->Text));
$this->component->Text = ''; $this->component->Text = '';
$this->assertTrue(isset($this->component->Text)); $this->assertTrue(isset($this->component->Text));
$this->assertTrue(empty($this->component->Text)); $this->assertTrue(empty($this->component->Text));
$this->component->Text = null;
$this->assertFalse(isset($this->component->Text));
$this->assertTrue(empty($this->component->Text));
}
public function testUnset()
{
unset($this->component->Text);
$this->assertFalse(isset($this->component->Text));
$this->assertTrue(empty($this->component->Text));
} }
public function testOn() public function testOn()
...@@ -147,38 +163,24 @@ class ComponentTest extends \yiiunit\TestCase ...@@ -147,38 +163,24 @@ class ComponentTest extends \yiiunit\TestCase
$this->assertFalse($this->component->eventHandled); $this->assertFalse($this->component->eventHandled);
} }
public function testDetachBehavior() public function testAttachBehavior()
{ {
$component = new NewComponent; $component = new NewComponent;
$behavior = new NewBehavior; $this->assertFalse($component->hasProperty('p'));
$component->attachBehavior('a', $behavior); $this->assertFalse($component->behaviorCalled);
$this->assertSame($behavior, $component->detachBehavior('a')); $this->assertNull($component->getBehavior('a'));
}
public function testDetachingBehaviors()
{
$component = new NewComponent;
$behavior = new NewBehavior;
$component->attachBehavior('a', $behavior);
$component->detachBehaviors();
$this->setExpectedException('yii\base\Exception');
$component->test();
}
public function testGetBehavior()
{
$component = new NewComponent;
$behavior = new NewBehavior; $behavior = new NewBehavior;
$component->attachBehavior('a', $behavior); $component->attachBehavior('a', $behavior);
$this->assertSame($behavior, $component->getBehavior('a')); $this->assertSame($behavior, $component->getBehavior('a'));
} $this->assertTrue($component->hasProperty('p'));
$component->test();
$this->assertTrue($component->behaviorCalled);
public function testCreate() $this->assertSame($behavior, $component->detachBehavior('a'));
{ $this->assertFalse($component->hasProperty('p'));
$component = NewComponent2::newInstance(array('a' => 3), 1, 2); $this->setExpectedException('yii\base\BadMethodException');
$this->assertEquals(1, $component->b); $component->test();
$this->assertEquals(2, $component->c);
$this->assertEquals(3, $component->a);
} }
} }
...@@ -186,9 +188,8 @@ class NewComponent extends \yii\base\Component ...@@ -186,9 +188,8 @@ class NewComponent extends \yii\base\Component
{ {
private $_object = null; private $_object = null;
private $_text = 'default'; private $_text = 'default';
public $eventHandled = false; private $_items = array();
public $event; public $content;
public $behaviorCalled = false;
public function getText() public function getText()
{ {
...@@ -203,12 +204,28 @@ class NewComponent extends \yii\base\Component ...@@ -203,12 +204,28 @@ class NewComponent extends \yii\base\Component
public function getObject() public function getObject()
{ {
if (!$this->_object) { if (!$this->_object) {
$this->_object = new NewComponent; $this->_object = new self;
$this->_object->_text = 'object text'; $this->_object->_text = 'object text';
} }
return $this->_object; return $this->_object;
} }
public function getExecute()
{
return function($param) {
return $param * 2;
};
}
public function getItems()
{
return $this->_items;
}
public $eventHandled = false;
public $event;
public $behaviorCalled = false;
public function myEventHandler($event) public function myEventHandler($event)
{ {
$this->eventHandled = true; $this->eventHandled = true;
...@@ -223,6 +240,8 @@ class NewComponent extends \yii\base\Component ...@@ -223,6 +240,8 @@ class NewComponent extends \yii\base\Component
class NewBehavior extends \yii\base\Behavior class NewBehavior extends \yii\base\Behavior
{ {
public $p;
public function test() public function test()
{ {
$this->owner->behaviorCalled = true; $this->owner->behaviorCalled = true;
......
...@@ -11,6 +11,9 @@ class MapItem ...@@ -11,6 +11,9 @@ class MapItem
class DictionaryTest extends \yiiunit\TestCase class DictionaryTest extends \yiiunit\TestCase
{ {
/**
* @var \yii\base\Dictionary
*/
protected $dictionary; protected $dictionary;
protected $item1,$item2,$item3; protected $item1,$item2,$item3;
...@@ -92,7 +95,7 @@ class DictionaryTest extends \yiiunit\TestCase ...@@ -92,7 +95,7 @@ class DictionaryTest extends \yiiunit\TestCase
$this->assertEquals($this->item3, $this->dictionary['key3']); $this->assertEquals($this->item3, $this->dictionary['key3']);
$this->assertEquals($this->item1, $this->dictionary['key4']); $this->assertEquals($this->item1, $this->dictionary['key4']);
$this->setExpectedException('yii\base\Exception'); $this->setExpectedException('yii\base\BadParamException');
$this->dictionary->copyFrom($this); $this->dictionary->copyFrom($this);
} }
...@@ -111,7 +114,7 @@ class DictionaryTest extends \yiiunit\TestCase ...@@ -111,7 +114,7 @@ class DictionaryTest extends \yiiunit\TestCase
$this->assertEquals(3,$this->dictionary->getCount()); $this->assertEquals(3,$this->dictionary->getCount());
$this->assertEquals($this->item1,$this->dictionary['key2']); $this->assertEquals($this->item1,$this->dictionary['key2']);
$this->assertEquals($this->item3,$this->dictionary['key3']); $this->assertEquals($this->item3,$this->dictionary['key3']);
$this->setExpectedException('yii\base\Exception'); $this->setExpectedException('yii\base\BadParamException');
$this->dictionary->mergeWith($this,false); $this->dictionary->mergeWith($this,false);
} }
......
...@@ -11,6 +11,9 @@ class ListItem ...@@ -11,6 +11,9 @@ class ListItem
class VectorTest extends \yiiunit\TestCase class VectorTest extends \yiiunit\TestCase
{ {
/**
* @var Vector
*/
protected $vector; protected $vector;
protected $item1, $item2, $item3; protected $item1, $item2, $item3;
...@@ -62,7 +65,7 @@ class VectorTest extends \yiiunit\TestCase ...@@ -62,7 +65,7 @@ class VectorTest extends \yiiunit\TestCase
$this->assertEquals(2,$this->vector->indexOf($this->item2)); $this->assertEquals(2,$this->vector->indexOf($this->item2));
$this->assertEquals(0,$this->vector->indexOf($this->item3)); $this->assertEquals(0,$this->vector->indexOf($this->item3));
$this->assertEquals(1,$this->vector->indexOf($this->item1)); $this->assertEquals(1,$this->vector->indexOf($this->item1));
$this->setExpectedException('yii\base\Exception'); $this->setExpectedException('yii\base\BadParamException');
$this->vector->insertAt(4,$this->item3); $this->vector->insertAt(4,$this->item3);
} }
...@@ -84,7 +87,7 @@ class VectorTest extends \yiiunit\TestCase ...@@ -84,7 +87,7 @@ class VectorTest extends \yiiunit\TestCase
$this->assertEquals(-1,$this->vector->indexOf($this->item2)); $this->assertEquals(-1,$this->vector->indexOf($this->item2));
$this->assertEquals(1,$this->vector->indexOf($this->item3)); $this->assertEquals(1,$this->vector->indexOf($this->item3));
$this->assertEquals(0,$this->vector->indexOf($this->item1)); $this->assertEquals(0,$this->vector->indexOf($this->item1));
$this->setExpectedException('yii\base\Exception'); $this->setExpectedException('yii\base\BadParamException');
$this->vector->removeAt(2); $this->vector->removeAt(2);
} }
...@@ -115,7 +118,7 @@ class VectorTest extends \yiiunit\TestCase ...@@ -115,7 +118,7 @@ class VectorTest extends \yiiunit\TestCase
$array=array($this->item3,$this->item1); $array=array($this->item3,$this->item1);
$this->vector->copyFrom($array); $this->vector->copyFrom($array);
$this->assertTrue(count($array)==2 && $this->vector[0]===$this->item3 && $this->vector[1]===$this->item1); $this->assertTrue(count($array)==2 && $this->vector[0]===$this->item3 && $this->vector[1]===$this->item1);
$this->setExpectedException('yii\base\Exception'); $this->setExpectedException('yii\base\BadParamException');
$this->vector->copyFrom($this); $this->vector->copyFrom($this);
} }
...@@ -124,7 +127,7 @@ class VectorTest extends \yiiunit\TestCase ...@@ -124,7 +127,7 @@ class VectorTest extends \yiiunit\TestCase
$array=array($this->item3,$this->item1); $array=array($this->item3,$this->item1);
$this->vector->mergeWith($array); $this->vector->mergeWith($array);
$this->assertTrue($this->vector->getCount()==4 && $this->vector[0]===$this->item1 && $this->vector[3]===$this->item1); $this->assertTrue($this->vector->getCount()==4 && $this->vector[0]===$this->item1 && $this->vector[3]===$this->item1);
$this->setExpectedException('yii\base\Exception'); $this->setExpectedException('yii\base\BadParamException');
$this->vector->mergeWith($this); $this->vector->mergeWith($this);
} }
...@@ -138,7 +141,7 @@ class VectorTest extends \yiiunit\TestCase ...@@ -138,7 +141,7 @@ class VectorTest extends \yiiunit\TestCase
{ {
$this->assertTrue($this->vector[0]===$this->item1); $this->assertTrue($this->vector[0]===$this->item1);
$this->assertTrue($this->vector[1]===$this->item2); $this->assertTrue($this->vector[1]===$this->item2);
$this->setExpectedException('yii\base\Exception'); $this->setExpectedException('yii\base\BadParamException');
$a=$this->vector[2]; $a=$this->vector[2];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment