修复测试进度异常问题;修复Main以外固定模块调用Call命令异常问题
This commit is contained in:
@@ -162,6 +162,11 @@ Namespace UTSModule.Station
|
|||||||
''' 测试流程固定模块
|
''' 测试流程固定模块
|
||||||
''' </summary>
|
''' </summary>
|
||||||
Enum FixedModuleEnum
|
Enum FixedModuleEnum
|
||||||
|
''' <summary>
|
||||||
|
''' 空模块,无测试时默认值
|
||||||
|
''' </summary>
|
||||||
|
None
|
||||||
|
|
||||||
''' <summary>
|
''' <summary>
|
||||||
''' 主模块,测试起始模块
|
''' 主模块,测试起始模块
|
||||||
''' </summary>
|
''' </summary>
|
||||||
|
|||||||
@@ -886,13 +886,14 @@ Namespace UTSModule.Test
|
|||||||
|
|
||||||
Private Sub UpdateTestNode(node As RowNode)
|
Private Sub UpdateTestNode(node As RowNode)
|
||||||
If _tester.DebugMode Then Return
|
If _tester.DebugMode Then Return
|
||||||
|
If _tester.TestFiexdModule <> FixedModuleEnum.Main Then Return
|
||||||
|
If node.Action = False Then Return
|
||||||
|
|
||||||
If LblTestStep.InvokeRequired Then '判断是否需要开委托
|
If LblTestStep.InvokeRequired Then '判断是否需要开委托
|
||||||
LblTestStep.Invoke(New Action(Of RowNode)(AddressOf UpdateTestNode), New Object() {node})
|
LblTestStep.Invoke(New Action(Of RowNode)(AddressOf UpdateTestNode), New Object() {node})
|
||||||
Return
|
Return
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If node.Action = False Then Return
|
|
||||||
|
|
||||||
LblTestStep.Text = $"Step : [{node.RowListIndex}] - [{_recordGrid.GetRowByNode(node)}]"
|
LblTestStep.Text = $"Step : [{node.RowListIndex}] - [{_recordGrid.GetRowByNode(node)}]"
|
||||||
LblStepTip.Text = $"[{node.RowListIndex}]-{node.ParentNode.Label}:{node.Description}"
|
LblStepTip.Text = $"[{node.RowListIndex}]-{node.ParentNode.Label}:{node.Description}"
|
||||||
|
|
||||||
|
|||||||
@@ -149,6 +149,9 @@ Namespace UTSModule.Test
|
|||||||
''' <summary>当前测试节点</summary>
|
''' <summary>当前测试节点</summary>
|
||||||
Private _testNode As RowNode
|
Private _testNode As RowNode
|
||||||
|
|
||||||
|
''' <summary> 当前测试固定模块</summary>
|
||||||
|
Private _testFixedModule As FixedModuleEnum = FixedModuleEnum.None
|
||||||
|
|
||||||
''' <summary>测试耗时计时器</summary>
|
''' <summary>测试耗时计时器</summary>
|
||||||
Private ReadOnly _testWatch As New Stopwatch
|
Private ReadOnly _testWatch As New Stopwatch
|
||||||
|
|
||||||
@@ -271,6 +274,12 @@ Namespace UTSModule.Test
|
|||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
|
Public ReadOnly Property TestFiexdModule As FixedModuleEnum
|
||||||
|
Get
|
||||||
|
Return _testFixedModule
|
||||||
|
End Get
|
||||||
|
End Property
|
||||||
|
|
||||||
''' <summary>
|
''' <summary>
|
||||||
''' 判定测试失败的模式
|
''' 判定测试失败的模式
|
||||||
''' </summary>
|
''' </summary>
|
||||||
@@ -437,6 +446,8 @@ Namespace UTSModule.Test
|
|||||||
''' <returns></returns>
|
''' <returns></returns>
|
||||||
Public Function ExecuteFixedModule(moduleName As FixedModuleEnum) As TestCommandReturn
|
Public Function ExecuteFixedModule(moduleName As FixedModuleEnum) As TestCommandReturn
|
||||||
Dim result As TestCommandReturn
|
Dim result As TestCommandReturn
|
||||||
|
|
||||||
|
_testFixedModule = moduleName
|
||||||
If _testModules.ContainsKey(moduleName.ToString()) Then
|
If _testModules.ContainsKey(moduleName.ToString()) Then
|
||||||
Dim node As RowNode = _testModules(moduleName.ToString())
|
Dim node As RowNode = _testModules(moduleName.ToString())
|
||||||
node.IsRetry = False '顶级节点最初重试状态为false
|
node.IsRetry = False '顶级节点最初重试状态为false
|
||||||
@@ -447,6 +458,7 @@ Namespace UTSModule.Test
|
|||||||
result.ExecuteResultTipString = $"未搜索到[{moduleName}]模块"
|
result.ExecuteResultTipString = $"未搜索到[{moduleName}]模块"
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
_testFixedModule = FixedModuleEnum.None '重置测试固定模块
|
||||||
Return result
|
Return result
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
@@ -755,8 +767,8 @@ Namespace UTSModule.Test
|
|||||||
result.StepTimeSpan = watch.Elapsed
|
result.StepTimeSpan = watch.Elapsed
|
||||||
|
|
||||||
'进度修改
|
'进度修改
|
||||||
If node.RowListIndex > _startTestIndex AndAlso node.RowIndex < _endTestIndex Then
|
If node.RowListIndex > _startTestIndex AndAlso node.RowListIndex < _endTestIndex Then
|
||||||
Dim p As Double = (node.RowListIndex - _startTestIndex) / _testCount * 100
|
Dim p As Double = (node.RowListIndex - _startTestIndex) / (_testCount * 100)
|
||||||
RaiseEvent TestProgressChanged(Me, New TestProgressChangedEventArgs(p))
|
RaiseEvent TestProgressChanged(Me, New TestProgressChangedEventArgs(p))
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user