Parser changes for test results (#4974)

* Parser changes for test results * Adding featureflagservice * Updating the version * updating packages * adding psmodule * using tokens * adding parameters * Added System.IdentityModel.Tokens.Jwt package --------- Co-authored-by: Denis Nikulin (Akvelon Inc) <denis.nikulin@akvelon.com>
microsoft · Sep 6, 2024 · 1a3d532 · 1a3d532
1 parent 5b51e45
commit 1a3d532
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/src/Agent.Sdk/Agent.Sdk.csproj b/src/Agent.Sdk/Agent.Sdk.csproj
@@ -19,5 +19,6 @@
  <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
  <PackageReference Include="System.Private.Uri" Version="4.3.2" />
  <PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
+ <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
  </ItemGroup>
 </Project>
diff --git a/src/Agent.Worker/TestResults/Parser.cs b/src/Agent.Worker/TestResults/Parser.cs
@@ -74,7 +74,8 @@ protected override ITestResultParser GetTestResultParser(IExecutionContext execu
  var traceListener = new CommandTraceListener(executionContext);
  var featureFlagService = executionContext.GetHostContext().GetService<IFeatureFlagService>();
  var enableJunitAttachments = featureFlagService.GetFeatureFlagState(TestResultsConstants.JUnitTestCaseAttachmentsEnabled, TestResultsConstants.TCMServiceInstanceGuid);
- return new JUnitResultParser(traceListener, false, enableJunitAttachments);
+ bool enableCustomTestFields = featureFlagService.GetFeatureFlagState(TestResultsConstants.CustomTestFieldsInPTRInputFilesEnabled, TestResultsConstants.TCMServiceInstanceGuid);
+ return new JUnitResultParser(traceListener, false, enableJunitAttachments,enableCustomTestFields);
  }
  }
 
@@ -86,7 +87,9 @@ public class XUnitParser : Parser, IParser
  protected override ITestResultParser GetTestResultParser(IExecutionContext executionContext)
  {
  var traceListener = new CommandTraceListener(executionContext);
- return new XUnitResultParser(traceListener);
+ var featureFlagService = executionContext.GetHostContext().GetService<IFeatureFlagService>();
+ bool enableCustomTestFields = featureFlagService.GetFeatureFlagState(TestResultsConstants.CustomTestFieldsInPTRInputFilesEnabled, TestResultsConstants.TCMServiceInstanceGuid);
+ return new XUnitResultParser(traceListener, setNameAsDisplayName: false, isTestCaseParallelReportingEnabled: false, enableCustomTestFields);
  }
 
  }
@@ -101,7 +104,8 @@ protected override ITestResultParser GetTestResultParser(IExecutionContext execu
  var traceListener = new CommandTraceListener(executionContext);
  var featureFlagService = executionContext.GetHostContext().GetService<IFeatureFlagService>();
  var enableXUnitHeirarchicalParsing = featureFlagService.GetFeatureFlagState(TestResultsConstants.EnableXUnitHeirarchicalParsing, TestResultsConstants.TFSServiceInstanceGuid);
- return new TrxResultParser(traceListener, enableXUnitHeirarchicalParsing);
+ bool enableCustomTestFields = featureFlagService.GetFeatureFlagState(TestResultsConstants.CustomTestFieldsInPTRInputFilesEnabled, TestResultsConstants.TCMServiceInstanceGuid);
+ return new TrxResultParser(traceListener, enableXUnitHeirarchicalParsing, enableCustomTestFields);
  }
 
  }
@@ -114,7 +118,9 @@ public class NUnitParser : Parser, IParser
  protected override ITestResultParser GetTestResultParser(IExecutionContext executionContext)
  {
  var traceListener = new CommandTraceListener(executionContext);
- return new NUnitResultParser(traceListener);
+ var featureFlagService = executionContext.GetHostContext().GetService<IFeatureFlagService>();
+ bool enableCustomTestFields = featureFlagService.GetFeatureFlagState(TestResultsConstants.CustomTestFieldsInPTRInputFilesEnabled, TestResultsConstants.TCMServiceInstanceGuid);
+ return new NUnitResultParser(traceListener, isTestCaseParallelReportingEnabled: false, enableCustomTestFields);
  }
 
  }
@@ -143,4 +149,4 @@ protected override ITestResultParser GetTestResultParser(IExecutionContext execu
  return new ContainerStructureTestResultParser(traceListener);
  }
  }
-}
+}
diff --git a/src/Agent.Worker/TestResults/Utils/TestResultsConstants.cs b/src/Agent.Worker/TestResults/Utils/TestResultsConstants.cs
@@ -26,5 +26,7 @@ public class TestResultsConstants
  public static readonly string JUnitTestCaseAttachmentsEnabled = "TestManagement.Server.JUnitTestCaseAttachmentsEnabled";
 
  public static readonly string EnableAzureTestPlanTaskFeatureFlag = "TestManagement.Server.EnableAzureTestPlanTaskFlow";
+
+ public static readonly string CustomTestFieldsInPTRInputFilesEnabled = "TestManagement.Server.CustomTestFieldsInPTRInputFilesEnabled";
  }
 }
diff --git a/src/Common.props b/src/Common.props
@@ -11,7 +11,7 @@
  <OSPlatform>OS_UNKNOWN</OSPlatform>
  <OSArchitecture>ARCH_UNKNOWN</OSArchitecture>
  <DebugConstant></DebugConstant>
- <VssApiVersion>0.5.238-private</VssApiVersion>
+ <VssApiVersion>0.5.245-private</VssApiVersion>
  <CodeAnalysis>$(CodeAnalysis)</CodeAnalysis>
  <InvariantGlobalization>false</InvariantGlobalization>
  <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>