Skip to content

Commit

Permalink
Update Timeout to time unit in minutes
Browse files Browse the repository at this point in the history
  • Loading branch information
ricaun committed Dec 9, 2024
1 parent 7007c28 commit 16f1c68
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Update `ricaun.NUnit` to `1.4.1`.
- Add `MetadataMapper` to map `AssemblyMetadata` configuration.
- Update to use `Task.Run` to force run outside the Revit context.
- Update `Timeout` to time unit in minutes.
### Command
- Update `AssemblyName` to use `Version`.
- Update `Timeout` to `double`.
Expand Down
14 changes: 9 additions & 5 deletions ricaun.RevitTest.Application/Revit/Utils/TestExecuteUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ private static async Task<TestAssemblyModel> TestDirectoryAsync(IRevitTask revit
{
TestAssemblyModel modelTest = null;

Log.WriteLine("----------------------------------");
Log.WriteLine();
Log.WriteLine($"TestEngine: {ricaun.NUnit.TestEngine.Initialize(out string testInitialize)} {testInitialize}");
Log.WriteLine("----------------------------------");
Log.WriteLine();

foreach (var filePath in Directory.GetFiles(directory, filePattern)) // "*.dll"
{
Expand All @@ -104,8 +104,8 @@ private static async Task<TestAssemblyModel> TestDirectoryAsync(IRevitTask revit

if (configurationMetadata.Timeout > 0)
{
TestEngineFilter.CancellationTokenTimeOut = TimeSpan.FromSeconds(configurationMetadata.Timeout);
Log.WriteLine($"Tasks.Timeout: {configurationMetadata.Timeout}");
TestEngineFilter.CancellationTokenTimeOut = TimeSpan.FromMinutes(configurationMetadata.Timeout);
Log.WriteLine($"Tasks.Timeout: {configurationMetadata.Timeout:0.00} minutes");
}

string containTestNameForNoRevitContext = configurationMetadata.Name;
Expand Down Expand Up @@ -156,6 +156,7 @@ private static async Task<TestAssemblyModel> TestDirectoryAsync(IRevitTask revit
var passed = modelTest.Success ? "Passed" : "Failed";
if (modelTest.TestCount == 0) { passed = "No Tests"; }

Log.WriteLine();
Log.WriteLine($"{modelTest}\t {passed}");

var tests = modelTest.Tests.SelectMany(e => e.Tests);
Expand Down Expand Up @@ -188,14 +189,17 @@ private static async Task<TestAssemblyModel> TestDirectoryAsync(IRevitTask revit
}
}

Log.WriteLine("----------------------------------");
Log.WriteLine();

return modelTest;
}

private class ConfigurationMetadata
{
public string Name { get; set; }
/// <summary>
/// Timeout in minutes
/// </summary>
public double Timeout { get; set; }

public static ConfigurationMetadata GetConfigurationMetadata(string filePath)
Expand Down
2 changes: 1 addition & 1 deletion ricaun.RevitTest.Tests/TestsRevitTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//[assembly: System.Reflection.AssemblyDescription("{\"TestAsync\":\"RevitTask\",\"TimeOut\":60.0}")]

[assembly: System.Reflection.AssemblyMetadata("ricaun.RevitTest.Application.Tasks.Name", "RevitTask")]
[assembly: System.Reflection.AssemblyMetadata("ricaun.RevitTest.Application.Tasks.Timeout", "5")]
[assembly: System.Reflection.AssemblyMetadata("ricaun.RevitTest.Application.Tasks.Timeout", "0.05")]

namespace ricaun.RevitTest.Tests
{
Expand Down

0 comments on commit 16f1c68

Please sign in to comment.