diff --git a/module/dataview/test/lib/dataview.unittest.class.php b/module/dataview/test/lib/dataview.unittest.class.php index f90501ec5d..87d2b3165c 100644 --- a/module/dataview/test/lib/dataview.unittest.class.php +++ b/module/dataview/test/lib/dataview.unittest.class.php @@ -67,4 +67,22 @@ class dataviewTest return array('result' => 'fail', 'message' => $e->getMessage()); } } + + /** + * Test processMergeFields method. + * + * @param string $moduleName + * @param string $field + * @param string $fieldName + * @param array $workflowFields + * @access public + * @return mixed + */ + public function processMergeFieldsTest($moduleName, $field, $fieldName, $workflowFields = array()) + { + $result = $this->objectModel->processMergeFields($moduleName, $field, $fieldName, $workflowFields); + if(dao::isError()) return dao::getError(); + + return $result; + } } \ No newline at end of file diff --git a/module/dataview/test/model/processmergefields.php b/module/dataview/test/model/processmergefields.php new file mode 100755 index 0000000000..a3a78ffd21 --- /dev/null +++ b/module/dataview/test/model/processmergefields.php @@ -0,0 +1,37 @@ +#!/usr/bin/env php +processMergeFieldsTest('user', 'account', 'account', array())) && p('0,1') && e('用户名,user'); +r($dataviewTest->processMergeFieldsTest('flow_project', 'name', 'name', array())) && p('0,1') && e('项目名称,project'); +r($dataviewTest->processMergeFieldsTest('zt_flow_task', 'title', 'title', array())) && p('0,1') && e('title,task'); +r($dataviewTest->processMergeFieldsTest('product', 'nonexistfield', 'nonexistfield', array())) && p('0,1') && e('nonexistfield,product'); +r($dataviewTest->processMergeFieldsTest('task', '', '', array())) && p('0') && e('~~'); \ No newline at end of file