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

* adjust for commit result method.

Browse Source
This commit is contained in:
wangyidong
2020-04-03 09:53:07 +08:00
parent 57be1988f6
commit 32bbf6ada8
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/ci/control.php
+7 -7
View File
@@ -89,11 +89,11 @@ class ci extends control
$post = file_get_contents('php://input');
$post = json_decode($post);
$testType = $post->TestType;
$productID = zget($post, 'ProductId', 0);
$taskID = zget($post, 'TaskId', 0);
$zentaoData = zget($post, 'ZentaoData', '');
$frame = zget($post, 'TestFrame', 'junit');
$testType = $post->testType;
$productID = zget($post, 'productId', 0);
$taskID = zget($post, 'taskId', 0);
$zentaoData = zget($post, 'zentaoData', '');
$frame = zget($post, 'testFrame', 'junit');
/* Get compileID and jobID. */
parse_str($zentaoData, $params);
@@ -154,11 +154,11 @@ class ci extends control
/* Build data from case results. */
if($testType == 'unit')
{
$data = $this->testtask->buildDataFromUnit($post->UnitCaseResults, $frame, $productID, $jobID, $compileID);
$data = $this->testtask->buildDataFromUnit($post->unitCaseResults, $frame, $productID, $jobID, $compileID);
}
elseif($testType == 'ztf')
{
$data = $this->testtask->buildDataFromZTF($post->ZtfCaseResults, $frame, $productID, $jobID, $compileID);
$data = $this->testtask->buildDataFromZTF($post->ztfCaseResults, $frame, $productID, $jobID, $compileID);
}
$taskID = $this->testtask->saveUnit($taskID, $productID, $data['suites'], $data['cases'], $data['results'], $data['suiteNames'], $data['caseTitles']);
module/testtask/model.php
+13 -9
View File
@@ -1884,6 +1884,10 @@ class testtaskModel extends model
{
$result->stepResults[0]['real'] = (string)$matchNode->$failure;
}
elseif(isset($matchNode->$failure[0]))
{
$result->stepResults[0]['real'] = (string)$matchNode->$failure[0];
}
else
{
$failureAttrs = $matchNode->$failure->attributes();
@@ -1927,11 +1931,11 @@ class testtaskModel extends model
foreach($caseResults as $caseIndex => $caseResult)
{
$suite = '';
if(isset($caseResult->TestSuite) and !isset($suiteNames[$caseResult->TestSuite]))
if(isset($caseResult->testSuite) and !isset($suiteNames[$caseResult->testSuite]))
{
$suite = new stdclass();
$suite->product = $productID;
$suite->name = $caseResult->TestSuite;
$suite->name = $caseResult->testSuite;
$suite->type = 'unit';
$suite->addedBy = $this->app->user->account;
$suite->addedDate = $now;
@@ -1943,7 +1947,7 @@ class testtaskModel extends model
$case = new stdclass();
$case->product = $productID;
$case->title = $caseResult->Title;
$case->title = $caseResult->title;
$case->pri = 3;
$case->type = 'unit';
$case->stage = 'unittest';
@@ -1962,14 +1966,14 @@ class testtaskModel extends model
$result->job = $jobID;
$result->compile = $compileID;
$result->date = $now;
$result->duration = $caseResult->Duration;
$result->duration = $caseResult->duration;
$result->stepResults[0]['result'] = 'pass';
$result->stepResults[0]['real'] = '';
if(!empty($caseResult->Failure))
if(!empty($caseResult->failure))
{
$result->caseResult = 'fail';
$result->stepResults[0]['result'] = 'fail';
$result->stepResults[0]['real'] = $caseResult->Failure->Desc;
$result->stepResults[0]['real'] = $caseResult->failure->desc;
}
$result->stepResults = serialize($result->stepResults);
$case->lastRunner = $this->app->user->account;
@@ -2011,7 +2015,7 @@ class testtaskModel extends model
$case = new stdclass();
$case->product = $productID;
$case->title = $caseResult->Title;
$case->title = $caseResult->title;
$case->pri = 3;
$case->type = 'unit';
$case->stage = 'unittest';
@@ -2032,11 +2036,11 @@ class testtaskModel extends model
$result->date = $now;
$result->stepResults[0]['result'] = 'pass';
$result->stepResults[0]['real'] = '';
if(!empty($caseResult->Steps))
if(!empty($caseResult->steps))
{
$result->stepResults = array();
$stepStatus = 'pass';
foreach($caseResult->Steps as $i => $step)
foreach($caseResult->steps as $i => $step)
{
$result->stepResults[$i]['result'] = $step->Status ? 'pass' : 'fail';
$result->stepResults[$i]['real'] = $step->Status ? '' : $step->CheckPoints[0]->Actual;