From 32bbf6ada803228585618f3eeb06cc53aec249ba Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 3 Apr 2020 09:53:07 +0800
Subject: [PATCH]  * adjust for commit result method.

---
 module/ci/control.php     | 14 +++++++-------
 module/testtask/model.php | 22 +++++++++++++---------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/module/ci/control.php b/module/ci/control.php
index bc963f99dd..df2253e9f0 100644
--- a/module/ci/control.php
+++ b/module/ci/control.php
@@ -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']);
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 6521454012..d3d3712f9c 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -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;