-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
312 additions
and
130 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| using DotLiquid; | ||
| using LiquidTestReports.Core.Models; | ||
| using Microsoft.Extensions.FileSystemGlobbing; | ||
| using Microsoft.Extensions.FileSystemGlobbing.Abstractions; | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Linq; | ||
|
|
||
| namespace LiquidTestReports.Cli.Models | ||
| { | ||
| /// <summary> | ||
| /// Per Test File Configuration | ||
| /// </summary> | ||
| public class ReportInput : IReportInput | ||
| { | ||
| /// <summary> | ||
| /// Configuration for test report input | ||
| /// </summary> | ||
| /// <example></example> | ||
| /// <param name="inputString"> | ||
| /// Formatted configuration string for test report input - example: "File=TestRun1.trx;GroupTitle=.NETCORE 3.1 Tests;TestSuffix=Windows 10" | ||
| /// (Required) File=file-name - The path or glob pattern for input files | ||
| /// (Optional) Folder=folder-name - Base directory for finding test files | ||
| /// (Optional) Format=report-format - Optional input report format, case insensitive, supported values are `Trx` of `JUnit` | ||
| /// (Optional) GroupTitle=group-title - Optional title to group reports under, test runs with the same group title will be merged | ||
| /// (Optional) TestPrefix=optional:test-prefix - Optional test suffix, if provided test origination for the provided report will have the suffix appended to its name | ||
| /// </param> | ||
| public ReportInput(string inputString) | ||
| { | ||
| if(string.IsNullOrWhiteSpace(inputString)) | ||
| throw new ArgumentNullException(nameof(inputString)); | ||
|
|
||
| var splitInputs = inputString.Split(';'); | ||
| var parameters = new Dictionary<string, string>(Template.NamingConvention.StringComparer); | ||
| foreach (var input in splitInputs) | ||
| { | ||
| var parameter = input.Split('='); | ||
| if (parameter.Length == 2 && !string.IsNullOrEmpty(parameter[0]) && !string.IsNullOrEmpty(parameter[1])) | ||
| { | ||
| parameters.Add(parameter[0], parameter[1]); | ||
| } | ||
| else | ||
| { | ||
| throw new ArgumentException($"Incorrect number of arguments provided, Confirm parameter '{inputString}' uses the convention of 'key=value;'"); | ||
| } | ||
| } | ||
|
|
||
| if (parameters.TryGetValue(nameof(Folder), out var folder)) | ||
| { | ||
| Folder = new DirectoryInfo(folder); | ||
| } | ||
|
|
||
| if (parameters.TryGetValue(nameof(File), out var file)) | ||
| { | ||
| FileInfo fileInfo = null; | ||
|
|
||
| if (Folder is null) | ||
| { | ||
| fileInfo = new FileInfo(file); | ||
| } | ||
|
|
||
| if (fileInfo?.Exists is true) | ||
| { | ||
| Files = new[] { fileInfo }; | ||
| } | ||
| else // treat as glob pattern | ||
| { | ||
| var workingFolder = Folder ?? new DirectoryInfo(Directory.GetCurrentDirectory()); | ||
| var results = new Matcher() | ||
| .AddInclude(file) | ||
| .Execute(new DirectoryInfoWrapper(workingFolder)); | ||
|
|
||
| Files = results.HasMatches ? | ||
| results.Files.Select(match => new FileInfo(match.Path)) : | ||
| throw new ArgumentException("File did not match any files"); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| throw new ArgumentNullException("No parameter file name has been provided"); | ||
| } | ||
|
|
||
| if (parameters.TryGetValue(nameof(GroupTitle), out var title)) | ||
| { | ||
| GroupTitle = title; | ||
| } | ||
|
|
||
| if (parameters.TryGetValue(nameof(TestSuffix), out var testPrefix)) | ||
| { | ||
| TestSuffix = testPrefix; | ||
| } | ||
|
|
||
| if (parameters.TryGetValue(nameof(Format), out var format)) | ||
| { | ||
| Format = Enum.TryParse<InputFormatType>(format, true, out var formatType) | ||
| ? formatType | ||
| : InputFormatType.Unknown; | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Base directory for finding test files | ||
| /// </summary> | ||
| public DirectoryInfo Folder { get; } | ||
|
|
||
| /// <summary> | ||
| /// File containing test content | ||
| /// </summary> | ||
| public IEnumerable<FileInfo> Files { get; } | ||
|
|
||
| /// <summary> | ||
| /// Test file format, if not provided, defaults to Trx | ||
| /// </summary> | ||
| public InputFormatType Format { get; } = InputFormatType.Trx; | ||
|
|
||
| /// <summary> | ||
| /// Test group title, title used for all tests from this input, | ||
| /// Where group titles are the same, results will be merged into the same group | ||
| /// </summary> | ||
| public string GroupTitle { get; } | ||
|
|
||
| /// <summary> | ||
| /// Test suffix, this prefix will be appended to individual test titles | ||
| /// </summary> | ||
| public string TestSuffix { get; } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
|
|
||
| namespace LiquidTestReports.Core.Models | ||
| { | ||
| public interface IReportInput | ||
| { | ||
| IEnumerable<FileInfo> Files { get; } | ||
| InputFormatType Format { get; } | ||
| string GroupTitle { get; } | ||
| string TestSuffix { get; } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.