NIT Changes

Author: avishmsft

src/Agent.Worker/TestResults/ResultsCommandExtension.cs

@@ -85,24 +85,22 @@ public void Execute(IExecutionContext context, Command command)
             var executionContext = _executionContext;
             var testResultFiles = _testResultFiles;
             var testRunner = _testRunner;
-            var mergeResults = _mergeResults;
-            var runTitle = _runTitle;
-            var publishRunLevelAttachments = _publishRunLevelAttachments;
             var testCaseResults = _testCaseResults;
             var testPlanId = _testPlanId;
+            var runTitle = _runTitle;
             var publishTestResultsLibFeatureState = _publishTestResultsLibFeatureState;
             var triggerCoverageMergeJobFeatureState = _triggerCoverageMergeJobFeatureState;
             var failTaskOnFailedTests = _failTaskOnFailedTests;
+            var publishOptions = GetPublishOptions();
             var telemetryProperties = _telemetryProperties;
 
             var commandContext = context.GetHostContext().CreateService<IAsyncCommandContext>();
             commandContext.InitializeCommandContext(context, StringUtil.Loc("PublishTestResults"));
             commandContext.Task = PublishTestRunDataAsync(
-                executionContext, teamProject, runContext,
-                testResultFiles, testRunner, mergeResults, runTitle,
-                publishRunLevelAttachments, testCaseResults, testPlanId,
-                publishTestResultsLibFeatureState, triggerCoverageMergeJobFeatureState,
-                failTaskOnFailedTests, telemetryProperties);
+                teamProject, runContext, executionContext, testResultFiles, testRunner,
+                testCaseResults, testPlanId, runTitle, publishTestResultsLibFeatureState,
+                triggerCoverageMergeJobFeatureState, failTaskOnFailedTests,
+                publishOptions, telemetryProperties);
             executionContext.AsyncCommands.Add(commandContext);
         }
 
@@ -313,23 +311,31 @@ private TestRunContext CreateTestRunContext()
 
         }
 
-        private PublishOptions GetPublishOptions(bool publishRunLevelAttachments)
+        private PublishOptions GetPublishOptions()
         {
             var publishOptions = new PublishOptions()
             {
                 IsMergeTestResultsToSingleRun = _mergeResults,
-                IsAddTestRunAttachments = publishRunLevelAttachments
+                IsAddTestRunAttachments = _publishRunLevelAttachments
             };
 
             return publishOptions;
         }
 
         private async Task PublishTestRunDataAsync(
-            IExecutionContext executionContext, string teamProject, TestRunContext testRunContext,
-            List<string> testResultFiles, string testRunner, bool mergeResults, string runTitle,
-            bool publishRunLevelAttachments, TestCaseResult[] testCaseResults, string testPlanId,
-            bool publishTestResultsLibFeatureState, bool triggerCoverageMergeJobFeatureState,
-            bool failTaskOnFailedTests, Dictionary<string, object> telemetryProperties)
+            string teamProject,
+            TestRunContext testRunContext,
+            IExecutionContext executionContext,
+            List<string> testResultFiles,
+            string testRunner,
+            TestCaseResult[] testCaseResults,
+            string testPlanId,
+            string runTitle,
+            bool publishTestResultsLibFeatureState,
+            bool triggerCoverageMergeJobFeatureState,
+            bool failTaskOnFailedTests,
+            PublishOptions publishOptions,
+            Dictionary<string, object> telemetryProperties)
         {
             bool isTestRunOutcomeFailed = false;
 
@@ -345,19 +351,19 @@ private async Task PublishTestRunDataAsync(
 
                     if (!testCaseResults.IsNullOrEmpty() && !testPlanId.IsNullOrEmpty())
                     {
-                        isTestRunOutcomeFailed = await publisher.PublishAsync(testRunContext, testResultFiles, testCaseResults, GetPublishOptions(publishRunLevelAttachments), executionContext.CancellationToken);
+                        isTestRunOutcomeFailed = await publisher.PublishAsync(testRunContext, testResultFiles, testCaseResults, publishOptions, executionContext.CancellationToken);
                     }
                     else
                     {
-                        isTestRunOutcomeFailed = await publisher.PublishAsync(testRunContext, testResultFiles, GetPublishOptions(publishRunLevelAttachments), executionContext.CancellationToken);
+                        isTestRunOutcomeFailed = await publisher.PublishAsync(testRunContext, testResultFiles, publishOptions, executionContext.CancellationToken);
                     }
                 }
                 else
                 {
                     var publisher = executionContext.GetHostContext().CreateService<ILegacyTestRunDataPublisher>();
-                    publisher.InitializePublisher(executionContext, teamProject, connection, testRunner, publishRunLevelAttachments);
+                    publisher.InitializePublisher(executionContext, teamProject, connection, testRunner, publishOptions.IsAddTestRunAttachments);
 
-                    isTestRunOutcomeFailed = await publisher.PublishAsync(testRunContext, testResultFiles, runTitle, executionContext.Variables.Build_BuildId, mergeResults);
+                    isTestRunOutcomeFailed = await publisher.PublishAsync(testRunContext, testResultFiles, runTitle, executionContext.Variables.Build_BuildId, publishOptions.IsMergeTestResultsToSingleRun);
                 }
 
                 if (isTestRunOutcomeFailed && failTaskOnFailedTests)