Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Generating cc attachments with correct uri #2750

Merged
2 commits merged into from
Feb 16, 2021
Merged

Generating cc attachments with correct uri #2750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a12f543
Generating cc attachments with correct uri
Feb 16, 2021
1d740b9
Remove constructor
Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/Microsoft.TestPlatform.Common/DataCollection/DataCollectionAttachmentManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,9 @@ private void AddNewFileTransfer(FileTransferInformation fileTransferInfo, AsyncC
{
if (t.Exception == null)
{
// Uri doesn't recognize file paths in unix. See https://github.com/dotnet/corefx/issues/1745
var attachmentUri = new UriBuilder() { Scheme = "file", Host = "", Path = localFilePath }.Uri;
lock (attachmentTaskLock)
{
this.AttachmentSets[fileTransferInfo.Context][uri].Attachments.Add(new UriDataAttachment(attachmentUri, fileTransferInfo.Description));
this.AttachmentSets[fileTransferInfo.Context][uri].Attachments.Add(UriDataAttachment.CreateFrom(localFilePath, fileTransferInfo.Description));
}
}

Expand Down
6 changes: 6 additions & 0 deletions src/Microsoft.TestPlatform.ObjectModel/AttachmentSet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,11 @@ public override string ToString()
{
return $"{nameof(Uri)}: {Uri.AbsoluteUri}, {nameof(Description)}: {Description}";
}

public static UriDataAttachment CreateFrom(string localFilePath, string description)
{
var uri = new UriBuilder() { Scheme = "file", Host = "", Path = localFilePath }.Uri;
return new UriDataAttachment(uri, description);
}
}
}
4 changes: 2 additions & 2 deletions src/Microsoft.TestPlatform.Utilities/CodeCoverageDataAttachmentsHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ public async Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(ICollec
if (!string.IsNullOrEmpty(mergedCoverageReportFilePath))
{
var resultAttachmentSet = new AttachmentSet(CodeCoverageDataCollectorUri, CoverageFriendlyName);
resultAttachmentSet.Attachments.Add(new UriDataAttachment(new Uri(mergedCoverageReportFilePath), CoverageFriendlyName));
resultAttachmentSet.Attachments.Add(UriDataAttachment.CreateFrom(mergedCoverageReportFilePath, CoverageFriendlyName));

foreach (var coverageOtherFilePath in coverageOtherFilePaths)
{
resultAttachmentSet.Attachments.Add(new UriDataAttachment(new Uri(coverageOtherFilePath), string.Empty));
resultAttachmentSet.Attachments.Add(UriDataAttachment.CreateFrom(coverageOtherFilePath, string.Empty));
}

return new Collection<AttachmentSet> { resultAttachmentSet };
Expand Down