Merge remote branch 'upstream/master'

This commit is contained in:
Marco Antonio Nina
2012-07-13 15:26:41 -04:00
2 changed files with 23 additions and 14 deletions

View File

@@ -26,7 +26,10 @@ class classXmlForm_Field_popupOptionTest extends PHPUnit_Framework_TestCase
*/ */
protected function setUp() protected function setUp()
{ {
$this->object = new XmlForm_Field_popupOption(); $attributes = array("type" => "input");
$xmlNode = new Xml_Node("node1", "type1", "value1", $attributes);
$this->object = new XmlForm_Field_popupOption($xmlNode);
} }
/** /**
@@ -38,12 +41,13 @@ class classXmlForm_Field_popupOptionTest extends PHPUnit_Framework_TestCase
} }
/** /**
* This is the default method to test, if the class still having * This is the default method to test, if the class still having
* the same number of methods. * the same number of methods.
*/ */
public function testNumberOfMethodsInThisClass() public function testNumberOfMethodsInThisClass()
{ {
$methods = get_class_methods('XmlForm_Field_popupOption'); $this->assertTrue( count($methods) == 24); $methods = get_class_methods('XmlForm_Field_popupOption');
$this->assertTrue(count($methods) == 24);
} }
/** /**
@@ -56,6 +60,6 @@ class classXmlForm_Field_popupOptionTest extends PHPUnit_Framework_TestCase
$this->assertTrue( in_array('getEvents', $methods ), 'exists method getEvents' ); $this->assertTrue( in_array('getEvents', $methods ), 'exists method getEvents' );
$r = new ReflectionMethod('XmlForm_Field_popupOption', 'getEvents'); $r = new ReflectionMethod('XmlForm_Field_popupOption', 'getEvents');
$params = $r->getParameters(); $params = $r->getParameters();
} }
}
}

View File

@@ -26,7 +26,10 @@ class classXmlForm_Field_toolButtonTest extends PHPUnit_Framework_TestCase
*/ */
protected function setUp() protected function setUp()
{ {
$this->object = new XmlForm_Field_toolButton(); $attributes = array("type" => "input");
$xmlNode = new Xml_Node("node1", "type1", "value1", $attributes);
$this->object = new XmlForm_Field_toolButton($xmlNode);
} }
/** /**
@@ -38,12 +41,13 @@ class classXmlForm_Field_toolButtonTest extends PHPUnit_Framework_TestCase
} }
/** /**
* This is the default method to test, if the class still having * This is the default method to test, if the class still having
* the same number of methods. * the same number of methods.
*/ */
public function testNumberOfMethodsInThisClass() public function testNumberOfMethodsInThisClass()
{ {
$methods = get_class_methods('XmlForm_Field_toolButton'); $this->assertTrue( count($methods) == 24); $methods = get_class_methods('XmlForm_Field_toolButton');
$this->assertTrue(count($methods) == 24);
} }
/** /**
@@ -55,10 +59,11 @@ class classXmlForm_Field_toolButtonTest extends PHPUnit_Framework_TestCase
$methods = get_class_methods($this->object); $methods = get_class_methods($this->object);
$this->assertTrue( in_array('render', $methods ), 'exists method render' ); $this->assertTrue( in_array('render', $methods ), 'exists method render' );
$r = new ReflectionMethod('XmlForm_Field_toolButton', 'render'); $r = new ReflectionMethod('XmlForm_Field_toolButton', 'render');
$params = $r->getParameters();
$this->assertTrue( $params[0]->getName() == 'value');
$this->assertTrue( $params[0]->isArray() == false);
$this->assertTrue( $params[0]->isOptional () == false);
}
} $params = $r->getParameters();
$this->assertTrue($params[0]->getName() == 'value');
$this->assertTrue($params[0]->isArray() == false);
$this->assertTrue($params[0]->isOptional() == false);
}
}