diff --git a/AUTS_Win/AUTS_Win.vbproj b/AUTS_Win/AUTS_Win.vbproj index 69289ab..866f727 100644 --- a/AUTS_Win/AUTS_Win.vbproj +++ b/AUTS_Win/AUTS_Win.vbproj @@ -26,7 +26,7 @@ false true 0 - 1.8.2.%2a + 1.8.3.%2a false true diff --git a/AUTS_Win/My Project/AssemblyInfo.vb b/AUTS_Win/My Project/AssemblyInfo.vb index ec06b11..e4c5be1 100644 --- a/AUTS_Win/My Project/AssemblyInfo.vb +++ b/AUTS_Win/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices '通过使用 "*"，如下所示: ' - - + + diff --git a/AUTS_Win/bin/Debug/AUTS_Win.exe b/AUTS_Win/bin/Debug/AUTS_Win.exe index b40b52c..cc29ea6 100644 Binary files a/AUTS_Win/bin/Debug/AUTS_Win.exe and b/AUTS_Win/bin/Debug/AUTS_Win.exe differ diff --git a/AUTS_Win/bin/Debug/AUTS_Win.pdb b/AUTS_Win/bin/Debug/AUTS_Win.pdb index 11663b4..7561450 100644 Binary files a/AUTS_Win/bin/Debug/AUTS_Win.pdb and b/AUTS_Win/bin/Debug/AUTS_Win.pdb differ diff --git a/AUTS_Win/bin/Debug/UTS_Core.dll b/AUTS_Win/bin/Debug/UTS_Core.dll index e071b63..2726812 100644 Binary files a/AUTS_Win/bin/Debug/UTS_Core.dll and b/AUTS_Win/bin/Debug/UTS_Core.dll differ diff --git a/AUTS_Win/bin/Debug/UTS_Core.pdb b/AUTS_Win/bin/Debug/UTS_Core.pdb index fe98f90..746bb99 100644 Binary files a/AUTS_Win/bin/Debug/UTS_Core.pdb and b/AUTS_Win/bin/Debug/UTS_Core.pdb differ diff --git a/AUTS_Win/bin/Debug/UTS_Core.xml b/AUTS_Win/bin/Debug/UTS_Core.xml index 698c690..0af166c 100644 --- a/AUTS_Win/bin/Debug/UTS_Core.xml +++ b/AUTS_Win/bin/Debug/UTS_Core.xml @@ -6753,6 +6753,12 @@ UTS_Core + + + 记录总使用的说明内容 + + + 子节点总数 diff --git a/AUTS_Win/obj/Debug/AUTS_Win.exe b/AUTS_Win/obj/Debug/AUTS_Win.exe index b40b52c..cc29ea6 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.exe and b/AUTS_Win/obj/Debug/AUTS_Win.exe differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.pdb b/AUTS_Win/obj/Debug/AUTS_Win.pdb index 11663b4..7561450 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.pdb and b/AUTS_Win/obj/Debug/AUTS_Win.pdb differ diff --git a/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache b/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache index 402c98f..82a02c6 100644 Binary files a/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache and b/AUTS_Win/obj/Debug/AUTS_Win.vbprojAssemblyReference.cache differ diff --git a/UTS_Core/UTSModule/Station/RowNode.vb b/UTS_Core/UTSModule/Station/RowNode.vb index d4dcf8e..c85b36a 100644 --- a/UTS_Core/UTSModule/Station/RowNode.vb +++ b/UTS_Core/UTSModule/Station/RowNode.vb @@ -153,6 +153,13 @@ Namespace UTSModule.Station ''' Public Property RowIndex As Integer + ''' + ''' 记录总使用的说明内容 + ''' + ''' + Public Property Desc4Record As String + + ''' ''' 子节点总数 ''' diff --git a/UTS_Core/UTSModule/Test/Command/SystemCommand/CallExecutor.vb b/UTS_Core/UTSModule/Test/Command/SystemCommand/CallExecutor.vb index ec23b4e..9fa3cf5 100644 --- a/UTS_Core/UTSModule/Test/Command/SystemCommand/CallExecutor.vb +++ b/UTS_Core/UTSModule/Test/Command/SystemCommand/CallExecutor.vb @@ -24,7 +24,7 @@ Namespace UTSModule.Test.Command.SystemCommand Dim rowNode As RowNode = tester.GetModule(_moduleName) rowNode.IsRetry = IsRetry - If rownode Is Nothing Then + If rowNode Is Nothing Then CommandReturn.ExecuteResult = False CommandReturn.RecordValue = String.Empty CommandReturn.ExecuteResultTipString = $"未查询到[{_moduleName}]模块存在" diff --git a/UTS_Core/UTSModule/Test/TestResult.vb b/UTS_Core/UTSModule/Test/TestResult.vb index 4b32c2a..2bc1a77 100644 --- a/UTS_Core/UTSModule/Test/TestResult.vb +++ b/UTS_Core/UTSModule/Test/TestResult.vb @@ -198,7 +198,7 @@ Namespace UTSModule.Test End If steps.Append(node.RowListIndex) - msg.Append(node.Description) + msg.Append(node.Desc4Record) msg.Append($" {node.TestReturn.RecordValue} ({node.TestReturn.LowerLimit},{node.TestReturn.UpperLimit})") Next dic.Add($"{TestLogTable.ColNames.FailSteps}", steps.ToString()) diff --git a/UTS_Core/UTSModule/Test/UtsTester.vb b/UTS_Core/UTSModule/Test/UtsTester.vb index f446c36..c59a4df 100644 --- a/UTS_Core/UTSModule/Test/UtsTester.vb +++ b/UTS_Core/UTSModule/Test/UtsTester.vb @@ -746,6 +746,8 @@ Namespace UTSModule.Test ReplaceValue(cmd, localVariable) '执行前变量替换 Dim executor As TestCommandExecutor = TestCommandManger.CreateExecutor(cmd) '创建执行器 + node.Desc4Record = ReplaceString(node.Description, localVariable) '替换记录名称中变量 + '最大执行总数为：1+重试次数 For retry As Integer = 0 To node.Retry If _exitTest Then Exit For diff --git a/UTS_Core/bin/Debug/UTS_Core.dll b/UTS_Core/bin/Debug/UTS_Core.dll index e071b63..2726812 100644 Binary files a/UTS_Core/bin/Debug/UTS_Core.dll and b/UTS_Core/bin/Debug/UTS_Core.dll differ diff --git a/UTS_Core/bin/Debug/UTS_Core.pdb b/UTS_Core/bin/Debug/UTS_Core.pdb index fe98f90..746bb99 100644 Binary files a/UTS_Core/bin/Debug/UTS_Core.pdb and b/UTS_Core/bin/Debug/UTS_Core.pdb differ diff --git a/UTS_Core/bin/Debug/UTS_Core.xml b/UTS_Core/bin/Debug/UTS_Core.xml index 698c690..0af166c 100644 --- a/UTS_Core/bin/Debug/UTS_Core.xml +++ b/UTS_Core/bin/Debug/UTS_Core.xml @@ -6753,6 +6753,12 @@ UTS_Core + + + 记录总使用的说明内容 + + + 子节点总数 diff --git a/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 8696654..472a1bb 100644 Binary files a/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/UTS_Core/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/UTS_Core/obj/Debug/UTS_Core.dll b/UTS_Core/obj/Debug/UTS_Core.dll index e071b63..2726812 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.dll and b/UTS_Core/obj/Debug/UTS_Core.dll differ diff --git a/UTS_Core/obj/Debug/UTS_Core.pdb b/UTS_Core/obj/Debug/UTS_Core.pdb index fe98f90..746bb99 100644 Binary files a/UTS_Core/obj/Debug/UTS_Core.pdb and b/UTS_Core/obj/Debug/UTS_Core.pdb differ diff --git a/UTS_Core/obj/Debug/UTS_Core.xml b/UTS_Core/obj/Debug/UTS_Core.xml index 698c690..0af166c 100644 --- a/UTS_Core/obj/Debug/UTS_Core.xml +++ b/UTS_Core/obj/Debug/UTS_Core.xml @@ -6753,6 +6753,12 @@ UTS_Core + + + 记录总使用的说明内容 + + + 子节点总数