Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [unittest] Fix upgrade processoldmetrics model method test.

Browse Source
This commit is contained in:
wangyidong
2025-06-12 11:05:11 +08:00
parent dffa4da9c8
commit d5c8377ece
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/test/model/processoldmetrics.php
+5 -4
View File
@@ -30,7 +30,8 @@ $result = $upgrade->processOldMetrics();
$oldMetrics = $tester->dao->select('*')->from(TABLE_BASICMEAS)->where('deleted')->eq('0')->orderBy('order_asc')->fetchAll();
$check = true;
foreach($oldMetrics as $oldMetric) {
foreach($oldMetrics as $oldMetric)
{
$metric = $tester->dao->select('*')->from(TABLE_METRIC)->where('fromID')->eq($oldMetric->id)->fetch();
if(!$metric)
{
@@ -38,19 +39,19 @@ foreach($oldMetrics as $oldMetric) {
break;
}
if($metric->scope != ($scopeMap[$oldMetric->scope] ? $scopeMap[$oldMetric->scope] : 'other'))
if($metric->scope != zget($scopeMap, $oldMetric->scope, 'other'))
{
$check = false;
break;
}
if($metric->purpose != ($purposeMap[$oldMetric->purpose] ? $purposeMap[$oldMetric->purpose] : 'other'))
if($metric->purpose != zget($purposeMap, $oldMetric->purpose, 'other'))
{
$check = false;
break;
}
if($metric->object != ($objectMap[$oldMetric->object] ? $objectMap[$oldMetric->object] : 'other'))
if($metric->object != zget($objectMap, $oldMetric->object, 'other'))
{
$check = false;
break;