From 31dc97d43a5aa9ae7659482f1dfffa7e2749a256 Mon Sep 17 00:00:00 2001
From: liugang <liugang@chandao.com>
Date: Mon, 8 Sep 2025 04:51:02 +0800
Subject: [PATCH] + [misc] Add unit tests for
 dataviewModel::processMergeFields() method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../test/lib/dataview.unittest.class.php      | 18 +++++++++
 .../test/model/processmergefields.php         | 37 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100755 module/dataview/test/model/processmergefields.php

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
+<?php
+
+/**
+
+title=测试 dataviewModel::processMergeFields();
+timeout=0
+cid=0
+
+- 执行dataviewTest模块的processMergeFieldsTest方法，参数是'user', 'account', 'account', array 
+ -  @用户名
+ - 属性1 @user
+- 执行dataviewTest模块的processMergeFieldsTest方法，参数是'flow_project', 'name', 'name', array 
+ -  @项目名称
+ - 属性1 @project
+- 执行dataviewTest模块的processMergeFieldsTest方法，参数是'zt_flow_task', 'title', 'title', array 
+ -  @title
+ - 属性1 @task
+- 执行dataviewTest模块的processMergeFieldsTest方法，参数是'product', 'nonexistfield', 'nonexistfield', array 
+ -  @nonexistfield
+ - 属性1 @product
+- 执行dataviewTest模块的processMergeFieldsTest方法，参数是'task', '', '', array  @~~
+
+*/
+
+include dirname(__FILE__, 5) . '/test/lib/init.php';
+include dirname(__FILE__, 2) . '/lib/dataview.unittest.class.php';
+
+su('admin');
+
+$dataviewTest = new dataviewTest();
+
+r($dataviewTest->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