More changes

jakubch1 · jakubch1 · commit 5ae0b3a193c3 · 2020-06-12T21:36:02.000+02:00
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectorAttachmentsHandler.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectorAttachmentsHandler.cs
@@ -28,16 +28,18 @@ public void HandleAttachements(ICollection<AttachmentSet> attachments, Cancellat
                 if (attachementUri != null)
                 {
                     var attachmentsToBeProcessed = attachments.Where(dataCollectionAttachment => attachementUri.Equals(dataCollectionAttachment.Uri)).ToArray();
-
-                    foreach (var attachment in attachmentsToBeProcessed)
+                    if(attachmentsToBeProcessed.Any())
                     {
-                        attachments.Remove(attachment);
-                    }
+                        foreach (var attachment in attachmentsToBeProcessed)
+                        {
+                            attachments.Remove(attachment);
+                        }
 
-                    ICollection<AttachmentSet> processedAttachements = dataCollectorAttachmentsHandler.HandleDataCollectionAttachmentSets(new Collection<AttachmentSet>(attachmentsToBeProcessed), cancellationToken);
-                    foreach (var attachment in processedAttachements)
-                    {
-                        attachments.Add(attachment);
+                        ICollection<AttachmentSet> processedAttachements = dataCollectorAttachmentsHandler.HandleDataCollectionAttachmentSets(new Collection<AttachmentSet>(attachmentsToBeProcessed), cancellationToken);
+                        foreach (var attachment in processedAttachements)
+                        {
+                            attachments.Add(attachment);
+                        }
                     }
                 }
             }
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs
@@ -5,7 +5,6 @@ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
 {
     using System;
     using System.Collections.Generic;
-    using System.Linq;
     using System.Threading;
 
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers;
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IFrameworkHandle.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/Interfaces/IFrameworkHandle.cs
@@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
     public interface IFrameworkHandle : ITestExecutionRecorder, IMessageLogger
     {
         /// <summary>
-        /// Gets or sets a value indicating whether the execution framework enables the shutdown of execution process after the test run is complete. This should be used only in out of process test run when IRunContext.KeepAlive is true
+        /// Gets or sets a value indicating whether the execution framework enables the shutdown of execution process after the test run is complete. This should be used only in out of process test runs when IRunContext.KeepAlive is true
         /// and should be used only when absolutely required as using it degrades the performance of the subsequent run.
         /// It throws InvalidOperationException when it is attempted to be enabled when keepAlive is false.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -28,16 +28,18 @@ public void HandleAttachements(ICollection<AttachmentSet> attachments, Cancellat`
`28`	`28`	`if (attachementUri != null)`
`29`	`29`	`{`
`30`	`30`	`var attachmentsToBeProcessed = attachments.Where(dataCollectionAttachment => attachementUri.Equals(dataCollectionAttachment.Uri)).ToArray();`
`31`		`-`
`32`		`- foreach (var attachment in attachmentsToBeProcessed)`
	`31`	`+ if(attachmentsToBeProcessed.Any())`
`33`	`32`	`{`
`34`		`- attachments.Remove(attachment);`
`35`		`- }`
	`33`	`+ foreach (var attachment in attachmentsToBeProcessed)`
	`34`	`+ {`
	`35`	`+ attachments.Remove(attachment);`
	`36`	`+ }`
`36`	`37`
`37`		`- ICollection<AttachmentSet> processedAttachements = dataCollectorAttachmentsHandler.HandleDataCollectionAttachmentSets(new Collection<AttachmentSet>(attachmentsToBeProcessed), cancellationToken);`
`38`		`- foreach (var attachment in processedAttachements)`
`39`		`- {`
`40`		`- attachments.Add(attachment);`
	`38`	`+ ICollection<AttachmentSet> processedAttachements = dataCollectorAttachmentsHandler.HandleDataCollectionAttachmentSets(new Collection<AttachmentSet>(attachmentsToBeProcessed), cancellationToken);`
	`39`	`+ foreach (var attachment in processedAttachements)`
	`40`	`+ {`
	`41`	`+ attachments.Add(attachment);`
	`42`	`+ }`
`41`	`43`	`}`
`42`	`44`	`}`
`43`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities`
`5`	`5`	`{`
`6`	`6`	`using System;`
`7`	`7`	`using System.Collections.Generic;`
`8`		`- using System.Linq;`
`9`	`8`	`using System.Threading;`
`10`	`9`
`11`	`10`	`using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter`
`12`	`12`	`public interface IFrameworkHandle : ITestExecutionRecorder, IMessageLogger`
`13`	`13`	`{`
`14`	`14`	`/// <summary>`
`15`		`- /// Gets or sets a value indicating whether the execution framework enables the shutdown of execution process after the test run is complete. This should be used only in out of process test run when IRunContext.KeepAlive is true`
	`15`	`+ /// Gets or sets a value indicating whether the execution framework enables the shutdown of execution process after the test run is complete. This should be used only in out of process test runs when IRunContext.KeepAlive is true`
`16`	`16`	`/// and should be used only when absolutely required as using it degrades the performance of the subsequent run.`
`17`	`17`	`/// It throws InvalidOperationException when it is attempted to be enabled when keepAlive is false.`
`18`	`18`	`/// </summary>`