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

Fix bug 30974.

Browse Source
This commit is contained in:
zhaoke
2022-12-16 11:08:45 +00:00
parent b3948acd66
commit 00a86549b0
6 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/lang/de.php
+1
View File
@@ -108,6 +108,7 @@ $lang->testtask->caseCount = 'Case Count';
$lang->testtask->passCount = 'Pass';
$lang->testtask->failCount = 'Fail';
$lang->testtask->summary = '%s cases, %s failures, %s time.';
$lang->testtask->stepSummary = 'Total %s steps, %s passes, %s failures.';
$lang->testtask->pageSummary = 'Total testtasks: <strong>%s</strong>.';
$lang->testtask->mySummary = 'Total testtasks: <strong>%s</strong>, Wait: <strong>%s</strong>, Testing: <strong>%s</strong>, Blocked: <strong>%s</strong>.';
$lang->testtask->allSummary = 'Total testtasks: <strong>%s</strong>, Wait: <strong>%s</strong>, Testing: <strong>%s</strong>, Blocked: <strong>%s</strong>, Done: <strong>%s</strong>.';
module/testtask/lang/en.php
+1
View File
@@ -108,6 +108,7 @@ $lang->testtask->caseCount = 'Case Count';
$lang->testtask->passCount = 'Pass';
$lang->testtask->failCount = 'Fail';
$lang->testtask->summary = '%s cases, %s failures, %s time.';
$lang->testtask->stepSummary = 'Total %s steps, %s passes, %s failures.';
$lang->testtask->pageSummary = 'Total testtasks: <strong>%s</strong>.';
$lang->testtask->mySummary = 'Total testtasks: <strong>%s</strong>, Wait: <strong>%s</strong>, Testing: <strong>%s</strong>, Blocked: <strong>%s</strong>.';
$lang->testtask->allSummary = 'Total testtasks: <strong>%s</strong>, Wait: <strong>%s</strong>, Testing: <strong>%s</strong>, Blocked: <strong>%s</strong>, Done: <strong>%s</strong>.';
module/testtask/lang/fr.php
+1
View File
@@ -108,6 +108,7 @@ $lang->testtask->caseCount = 'Compteur CasTest';
$lang->testtask->passCount = 'Pass';
$lang->testtask->failCount = 'Fail';
$lang->testtask->summary = '%s CasTest, %s échecs, %s heures.';
$lang->testtask->stepSummary = 'Total %s steps, %s passes, %s failures.';
$lang->testtask->pageSummary = 'Total testtasks: <strong>%s</strong>.';
$lang->testtask->mySummary = 'Total testtasks: <strong>%s</strong>, Wait: <strong>%s</strong>, Testing: <strong>%s</strong>, Blocked: <strong>%s</strong>.';
$lang->testtask->allSummary = 'Total testtasks: <strong>%s</strong>, Wait: <strong>%s</strong>, Testing: <strong>%s</strong>, Blocked: <strong>%s</strong>, Done: <strong>%s</strong>.';
module/testtask/lang/vi.php
+1
View File
@@ -97,6 +97,7 @@ $lang->testtask->caseCount = 'Case Count';
$lang->testtask->passCount = 'Pass';
$lang->testtask->failCount = 'Fail';
$lang->testtask->summary = '%s cases, %s failures, %s time.';
$lang->testtask->stepSummary = 'Total %s steps, %s passes, %s failures.';
$lang->testtask->beginAndEnd = 'Thời gian';
$lang->testtask->to = 'Tới';
module/testtask/lang/zh-cn.php
+1
View File
@@ -108,6 +108,7 @@ $lang->testtask->caseCount = '用例数';
$lang->testtask->passCount = '成功';
$lang->testtask->failCount = '失败';
$lang->testtask->summary = '有%s个用例，失败%s个，耗时%s。';
$lang->testtask->stepSummary = '共有%s个步骤，%s个通过，%s个失败。';
$lang->testtask->pageSummary = '本页共 <strong>%s</strong> 个测试单。';
$lang->testtask->mySummary = '本页共 <strong>%s</strong> 个测试单，待测试测试单 <strong>%s</strong>，测试中测试单 <strong>%s</strong>，被阻塞测试单 <strong>%s</strong>。';
$lang->testtask->allSummary = '本页共 <strong>%s</strong> 个测试单，待测试测试单 <strong>%s</strong>，测试中测试单 <strong>%s</strong>，被阻塞测试单 <strong>%s</strong>，已测测试单 <strong>%s</strong>。';
module/testtask/model.php
+55 -4
View File
@@ -1448,12 +1448,10 @@ class testtaskModel extends model
if(!empty($result->ZTFResult))
{
$result->ZTFResult = json_decode($result->ZTFResult);
$result->ZTFResult = empty($result->ZTFResult->log) ? '' : $result->ZTFResult->log;
$result->ZTFResult = "<li>" . str_replace(array("\r", "\n", "\r\n"), "</li><li>", $result->ZTFResult) . "</li>";
$result->ZTFResult = $this->formatZtfLog($result->ZTFResult, $result->stepResults);
}
$result->files = zget($resultFiles, $resultID, array()); //Get files of case result.
$result->files = zget($resultFiles, $resultID, array()); //Get files of case result.
if(isset($relatedSteps[$result->version]))
{
$relatedStep = $relatedSteps[$result->version];
@@ -1477,6 +1475,59 @@ class testtaskModel extends model
return $results;
}
/**
* Format ztf log.
*
* @param string $log
* @access public
* @return string
*/
public function formatZtfLog($result, $stepResults)
{
$logObj = json_decode($result);
$logs = empty($logObj->log) ? '' : $logObj->log;
if(empty($logs)) return '';
$logs = str_replace(array("\r", "\n", "\r\n"), "\n", $logs);
$logList = explode("\n", $logs);
$logHtml = "";
foreach($logList as $log)
{
$log = preg_replace("/^[\d\-:.\x20]+/", '', $log);
$log = trim($log);
if(empty($log)) continue;
$log = preg_replace(array("/:\x20失败/", "/:\x20fail/", "/:\x20成功/", "/:\x20pass/"), array(': <strong class="result-testcase fail">失败</strong>',': <strong class="result-testcase fail">fail</strong>',': <strong class="result-testcase pass">成功</strong>',': <strong class="result-testcase fail">pass</strong>'), $log);
$logHtml .= "<li>" . $log . "</li>";
}
if(!empty($stepResults))
{
$total = count($stepResults);
$failCount = $passCount = 0;
foreach($stepResults as $step)
{
if($step['result'] == 'pass')
{
$passCount++;
}
elseif($step['result'] == 'fail')
{
$failCount++;
}
}
$caseResult = $passCount ? 'pass':'fail';
$logHtml .= "<li class='result-testcase {$caseResult}'>"
. sprintf($this->lang->testtask->stepSummary, $total, $passCount, $failCount)
. "</li>";
}
return $logHtml;
}
/**
* Judge an action is clickable or not.
*