-
Notifications
You must be signed in to change notification settings - Fork 31
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.
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
Provide filter logic of TestNodes; starting with filtering by outcome #1155
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
// *********************************************************************** | ||
// Copyright (c) Charlie Poole and TestCentric contributors. | ||
// Licensed under the MIT License. See LICENSE file in root directory. | ||
// *********************************************************************** | ||
|
||
using System.Collections.Generic; | ||
|
||
namespace TestCentric.Gui.Model | ||
{ | ||
/// <summary> | ||
/// Provides filter functionality: by outcome, by duration, by category... | ||
/// </summary> | ||
public interface ITestCentricTestFilter | ||
{ | ||
/// <summary> | ||
/// Filters the loaded TestNodes by outcome | ||
/// </summary> | ||
IEnumerable<string> OutcomeFilter { get; set; } | ||
} | ||
} |
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,84 @@ | ||
// *********************************************************************** | ||
// Copyright (c) Charlie Poole and TestCentric contributors. | ||
// Licensed under the MIT License. See LICENSE file in root directory. | ||
// *********************************************************************** | ||
|
||
using System; | ||
using System.Collections.Generic; | ||
using System.Linq; | ||
|
||
namespace TestCentric.Gui.Model | ||
{ | ||
internal class TestCentricTestFilter : ITestCentricTestFilter | ||
{ | ||
// By default: all outcome filters are enabled | ||
List<string> _outcomeFilter = new List<string>() | ||
{ | ||
"Passed", | ||
"Failed", | ||
"Ignored", | ||
"Skipped", | ||
"Inconclusive", | ||
"Not Run", | ||
}; | ||
|
||
internal TestCentricTestFilter(TestModel model, Action filterChangedEvent) | ||
{ | ||
TestModel = model; | ||
FireFilterChangedEvent = filterChangedEvent; | ||
} | ||
|
||
private ITestModel TestModel { get; } | ||
|
||
private Action FireFilterChangedEvent; | ||
|
||
public IEnumerable<string> OutcomeFilter | ||
{ | ||
get => _outcomeFilter; | ||
|
||
set | ||
{ | ||
_outcomeFilter = value.ToList(); | ||
FilterNodes(TestModel.LoadedTests); | ||
FireFilterChangedEvent(); | ||
} | ||
} | ||
|
||
private bool FilterNodes(TestNode testNode) | ||
{ | ||
// 1. Check if any child is visible => parent must be visible too | ||
bool childIsVisible = false; | ||
foreach (TestNode child in testNode.Children) | ||
if (FilterNodes(child)) | ||
childIsVisible = true; | ||
|
||
// 2. Check if node itself is visible | ||
bool isVisible = IsOutcomeFilterMatching(testNode); | ||
testNode.IsVisible = isVisible || childIsVisible; | ||
return testNode.IsVisible; | ||
} | ||
|
||
private bool IsOutcomeFilterMatching(TestNode testNode) | ||
{ | ||
string outcome = "Not Run"; | ||
|
||
var result = TestModel.GetResultForTest(testNode.Id); | ||
if (result != null) | ||
{ | ||
switch (result.Outcome.Status) | ||
{ | ||
case TestStatus.Failed: | ||
case TestStatus.Passed: | ||
case TestStatus.Inconclusive: | ||
outcome = result.Outcome.Status.ToString(); | ||
break; | ||
case TestStatus.Skipped: | ||
outcome = result.Outcome.Label == "Ignored" ? "Ignored" : "Skippeed"; | ||
break; | ||
} | ||
} | ||
|
||
return OutcomeFilter.Contains(outcome); | ||
} | ||
} | ||
} |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"In the NUnit Test Tree" right?