diff --git a/tests/unit/e_formTest.php b/tests/unit/e_formTest.php
index b4e99d5c1..fcd4ccf58 100644
--- a/tests/unit/e_formTest.php
+++ b/tests/unit/e_formTest.php
@@ -26,11 +26,36 @@
'number_001' => array('title'=> "Number 001", 'type' => 'number', 'writeParms'=>array('min'=>0)),
'number_002' => array('title'=> "Number 002", 'type' => 'number', 'inline'=>true, 'writeParms'=>array('min'=>0)),
- 'bool_001' => array('title'=> "Bool 001", 'type' => 'text', 'writeParms'=>array('size'=>'xlarge')),
- 'bool_002' => array('title'=> "Bool 002", 'type' => 'text', 'inline'=>true, 'writeParms'=>array('size'=>'xlarge')),
+ 'bool_001' => array('title'=> "Bool 001", 'type' => 'bool', 'writeParms'=>array('size'=>'xlarge')),
+ 'bool_002' => array('title'=> "Bool 002", 'type' => 'bool', 'inline'=>true, 'writeParms'=>array('size'=>'xlarge')),
'dropdown_001' => array('title'=>'Dropdown 001', 'type'=>'dropdown', 'tab'=>1, 'writeParms' => array('optArray'=>array('opt_value_1'=>'Label 1', 'opt_value_2'=>'Label 2')) ),
-
+ 'dropdown_002' => array(
+ 'title' => 'Dropdown 002',
+ 'type' => 'dropdown',
+ 'width' => 'auto',
+ 'readonly' => false,
+ 'inline' => true,
+ 'filter' => true,
+ 'thclass' => 'center',
+ 'class' => 'center',
+ 'writeParms' => array(
+ 'empty' => 0,
+ 'optArray' => array(
+ 0 => "Option 0",
+ 1 => "Option 1",
+ 2 => "Option 2"
+ ),
+ ),
+ 'readParms' => array(
+ 'optArray' => array(
+ 0 => "Option 0",
+ 1 => "Option 1",
+ 2 => "Option 2"
+ ),
+ ),
+ 'tab' => 0,
+ ),
'textarea_001' => array('title'=> "Textarea 001", 'type' => 'textarea', 'writeParms'=>array('size'=>'xlarge','rows'=> 5)),
@@ -502,10 +527,11 @@
'number_001' => 555,
'number_002' => "444",
- 'bool_001' => 1,
- 'bool_002' => "1",
+ 'bool_001' => ADMIN_TRUE_ICON,
+ 'bool_002' => "✓",
'dropdown_001' => 'Label 2',
+ 'dropdown_002' => "",
'textarea_001' => "the quick brown fox jumps over the lazy dog",
@@ -525,6 +551,7 @@
if(!isset($expected[$field]))
{
$this->expectExceptionMessage('\$expected value for \$field not set in script');
+ $this->expectExceptionMessage($result);
}
$this->assertEquals($expected[$field], $result);
@@ -535,6 +562,48 @@
public function testRenderElement()
{
+ $frm = $this->_frm;
+
+ $expected = array(
+ 'text_001' => "",
+
+ 'number_001' => "",
+ 'number_002' => "",
+
+ 'bool_001' => " ",
+ 'bool_002' => " ",
+
+
+ 'dropdown_001' => "",
+ 'dropdown_002' => "",
+
+
+ 'textarea_001' => "",
+
+ 'layout_001' => "",
+ 'layout_002' => ""
+
+ );
+
+
+
+ foreach($this->_fields as $field=>$att)
+ {
+ $value = $this->_values[$field];
+ $result = $frm->renderElement($field, $value, $att);
+
+ $result = str_replace("\n", "", $result);
+
+
+ if(empty($expected[$field]))
+ {
+ // $this->expectExceptionMessage('\$expected value for \$field not set in script');
+ // $this->expectExceptionMessage($result);
+ }
+
+ $this->assertEquals($expected[$field], $result);
+ }
+
}
/*