Fixed async steps (#7)

Co-authored-by: Dmitry.Gridnev <[email protected]>
testit-tms · Jun 2, 2023 · 5743f9b · 5743f9b
1 parent 5e86a39
commit 5743f9b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/Tms.Adapter.Core/Tms.Adapter.Core.csproj b/Tms.Adapter.Core/Tms.Adapter.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>1.0.2</Version>
+        <Version>1.0.3</Version>
         <TargetFramework>netstandard2.1</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>

diff --git a/Tms.Adapter.XUnit/Tms.Adapter.XUnit.csproj b/Tms.Adapter.XUnit/Tms.Adapter.XUnit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>1.0.2</Version>
+        <Version>1.0.3</Version>
         <TargetFramework>netstandard2.1</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>

diff --git a/Tms.Adapter/Tms.Adapter.csproj b/Tms.Adapter/Tms.Adapter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>1.0.2</Version>
+        <Version>1.0.3</Version>
         <TargetFramework>netstandard2.1</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>

diff --git a/TmsRunner/Services/ProcessorService.cs b/TmsRunner/Services/ProcessorService.cs
@@ -1,5 +1,6 @@
 using System.Text;
 using System.Text.Json;
+using System.Text.RegularExpressions;
 using AutoMapper;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Serilog;
@@ -52,7 +53,8 @@ public ProcessorService(
                     case MessageType.TmsStep:
                     {
                         var step = JsonSerializer.Deserialize<Step>(message.Value);
-                        if ((step.CallerMethodType != null && parentStep == null) || (step.CurrentMethodType != null && parentStep == null))
+                        if ((step.CallerMethodType != null && parentStep == null) ||
+                            (step.CurrentMethodType != null && parentStep == null))
                         {
                             step.NestingLevel = nestingLevel = 1;
                             testCaseStepsHierarchical.Add(step);
@@ -61,7 +63,9 @@ public ProcessorService(
                         }
                         else
                         {
-                            while (parentStep != null && parentStep?.CurrentMethod != step.CallerMethod)
+                            var calledMethod = GetCalledMethod(step.CallerMethod);
+
+                            while (parentStep != null && parentStep?.CurrentMethod != calledMethod)
                             {
                                 parentStep = parentStep.ParentStep;
                                 nestingLevel--;
@@ -205,6 +209,17 @@ public ProcessorService(
             return (autoTestSteps, testCaseStepsHierarchical);
         }
 
+        private static string? GetCalledMethod(string? calledMethod)
+        {
+            if (calledMethod == null || !calledMethod.Contains("<")) return calledMethod;
+
+            const string pattern = "(?<=\\<)(.*)(?=\\>)";
+            var regex = new Regex(pattern);
+            var match = regex.Match(calledMethod);
+
+            return match.Groups[1].Value;
+        }
+
         public async Task ProcessAutoTest(TestResult testResult)
         {
             var traceJson = GetTraceJson(testResult);

diff --git a/TmsRunner/TmsRunner.csproj b/TmsRunner/TmsRunner.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>