diff options
Diffstat (limited to 'tests/UnitTests')
| -rw-r--r-- | tests/UnitTests/framework/Collections/utList.php | 91 | ||||
| -rw-r--r-- | tests/UnitTests/framework/Collections/utMap.php | 85 |
2 files changed, 3 insertions, 173 deletions
diff --git a/tests/UnitTests/framework/Collections/utList.php b/tests/UnitTests/framework/Collections/utList.php index 056f38b1..e95f718b 100644 --- a/tests/UnitTests/framework/Collections/utList.php +++ b/tests/UnitTests/framework/Collections/utList.php @@ -7,54 +7,6 @@ class ListItem public $data='data';
}
-class NewList extends TList
-{
- private $_canAddItem=true;
- private $_canRemoveItem=true;
- private $_itemAdded=false;
- private $_itemRemoved=false;
-
- protected function addedItem($item)
- {
- $this->_itemAdded=true;
- }
-
- protected function removedItem($item)
- {
- $this->_itemRemoved=true;
- }
-
- protected function canAddItem($item)
- {
- return $this->_canAddItem;
- }
-
- protected function canRemoveItem($item)
- {
- return $this->_canRemoveItem;
- }
-
- public function setCanAddItem($value)
- {
- $this->_canAddItem=$value;
- }
-
- public function setCanRemoveItem($value)
- {
- $this->_canRemoveItem=$value;
- }
-
- public function isItemAdded()
- {
- return $this->_itemAdded;
- }
-
- public function isItemRemoved()
- {
- return $this->_itemRemoved;
- }
-}
-
class utList extends UnitTestCase
{
protected $list;
@@ -101,16 +53,16 @@ class utList extends UnitTestCase }
- public function testInsert()
+ public function testInsertAt()
{
- $this->list->insert(0,$this->item3);
+ $this->list->insertAt(0,$this->item3);
$this->assertEqual(3,$this->list->getCount());
$this->assertEqual(2,$this->list->indexOf($this->item2));
$this->assertEqual(0,$this->list->indexOf($this->item3));
$this->assertEqual(1,$this->list->indexOf($this->item1));
try
{
- $this->list->insert(4,$this->item3);
+ $this->list->insertAt(4,$this->item3);
$this->fail('exception not raised when adding item at an out-of-range index');
}
catch(TInvalidDataValueException $e)
@@ -279,43 +231,6 @@ class utList extends UnitTestCase $this->assertTrue(isset($this->list[1]));
$this->assertFalse(isset($this->list[2]));
}
-
- public function testDerivedClasses()
- {
- $newList=new NewList;
- $this->assertFalse($newList->isItemAdded());
- $newList->add($this->item1);
- $this->assertTrue($newList->isItemAdded());
- $newList->add($this->item2);
-
- $newList->setCanAddItem(false);
- try
- {
- $newList->add($this->item3);
- $this->fail('no exception raised when adding an item that is disallowed');
- }
- catch(TInvalidOperationException $e)
- {
- $this->assertEqual(2,$newList->getCount());
- $this->pass();
- }
-
- $this->assertFalse($newList->isItemRemoved());
- $newList->remove($this->item1);
- $this->assertTrue($newList->isItemRemoved());
-
- $newList->setCanRemoveItem(false);
- try
- {
- $newList->remove($this->item2);
- $this->fail('no exception raised when removing an item that is disallowed');
- }
- catch(TInvalidOperationException $e)
- {
- $this->assertEqual(1,$newList->getCount());
- $this->pass();
- }
- }
}
?>
\ No newline at end of file diff --git a/tests/UnitTests/framework/Collections/utMap.php b/tests/UnitTests/framework/Collections/utMap.php index 1f7a20ad..37818542 100644 --- a/tests/UnitTests/framework/Collections/utMap.php +++ b/tests/UnitTests/framework/Collections/utMap.php @@ -7,54 +7,6 @@ class MapItem public $data='data';
}
-class NewMap extends TMap
-{
- private $_canAddItem=true;
- private $_canRemoveItem=true;
- private $_itemAdded=false;
- private $_itemRemoved=false;
-
- protected function addedItem($key,$value)
- {
- $this->_itemAdded=true;
- }
-
- protected function removedItem($key,$value)
- {
- $this->_itemRemoved=true;
- }
-
- protected function canAddItem($key,$value)
- {
- return $this->_canAddItem;
- }
-
- protected function canRemoveItem($key,$value)
- {
- return $this->_canRemoveItem;
- }
-
- public function setCanAddItem($value)
- {
- $this->_canAddItem=$value;
- }
-
- public function setCanRemoveItem($value)
- {
- $this->_canRemoveItem=$value;
- }
-
- public function isItemAdded()
- {
- return $this->_itemAdded;
- }
-
- public function isItemRemoved()
- {
- return $this->_itemRemoved;
- }
-}
-
class utMap extends UnitTestCase
{
protected $map;
@@ -203,43 +155,6 @@ class utMap extends UnitTestCase $this->assertTrue(isset($this->map['key1']));
$this->assertFalse(isset($this->map['unknown key']));
}
-
- public function testDerivedClasses()
- {
- $newMap=new NewMap;
- $this->assertFalse($newMap->isItemAdded());
- $newMap->add('key','value');
- $this->assertTrue($newMap->isItemAdded());
- $newMap->add('key2','value2');
-
- $newMap->setCanAddItem(false);
- try
- {
- $newMap->add('new key','new value');
- $this->fail('no exception raised when adding an item that is disallowed');
- }
- catch(TInvalidOperationException $e)
- {
- $this->assertEqual(2,$newMap->getCount());
- $this->pass();
- }
-
- $this->assertFalse($newMap->isItemRemoved());
- $newMap->remove('key');
- $this->assertTrue($newMap->isItemRemoved());
-
- $newMap->setCanRemoveItem(false);
- try
- {
- $newMap->remove('key2');
- $this->fail('no exception raised when removing an item that is disallowed');
- }
- catch(TInvalidOperationException $e)
- {
- $this->assertEqual(1,$newMap->getCount());
- $this->pass();
- }
- }
}
?>
\ No newline at end of file |