Skip to content

Commit 63d6aed

Browse files
committed
Add method ITestTreeView.EnableTestFilter(bool enable) to enable/disable all filter all at once
1 parent b740ef8 commit 63d6aed

File tree

5 files changed

+14
-33
lines changed

5 files changed

+14
-33
lines changed

src/TestCentric/testcentric.gui/Presenters/DisplayStrategy.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ public bool HasResults
7575
public void OnTestUnloaded()
7676
{
7777
ClearTree();
78-
_view.OutcomeFilter.Enabled = false;
79-
_view.TextFilter.Enabled = false;
78+
_view.EnableTestFilter(false);
8079
}
8180

8281
public virtual void OnTestFinished(ResultNode result)

src/TestCentric/testcentric.gui/Presenters/NUnitTreeDisplayStrategy.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ public override void OnTestLoaded(TestNode testNode, VisualState visualState)
4949
else
5050
SetDefaultInitialExpansion();
5151

52-
_view.OutcomeFilter.Enabled = true;
53-
_view.TextFilter.Enabled = true;
52+
_view.EnableTestFilter(true);
5453
}
5554

5655
protected override VisualState CreateVisualState() => new VisualState("NUNIT_TREE", _settings.Gui.TestTree.ShowNamespace).LoadFrom(_view.TreeView);

src/TestCentric/testcentric.gui/Views/ITestTreeView.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ public interface ITestTreeView : IView
5757

5858
void SetTestFilterVisibility(bool visible);
5959

60+
void EnableTestFilter(bool enable);
61+
6062
// Tree-related Methods
6163
void Clear();
6264
void Add(TreeNode treeNode);

src/TestCentric/testcentric.gui/Views/TestTreeView.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,12 @@ public void SetTestFilterVisibility(bool isVisible)
211211
filterTextToolStrip.Visible = isVisible;
212212
}
213213

214+
public void EnableTestFilter(bool enable)
215+
{
216+
filterToolStrip.Enabled = enable;
217+
filterTextToolStrip.Enabled = enable;
218+
}
219+
214220
public void LoadAlternateImages(string imageSet)
215221
{
216222
string[] imageNames = { "Skipped", "Inconclusive", "Success", "Ignored", "Failure" };

src/TestCentric/tests/Presenters/NUnitTreeDisplayStrategyTests.cs

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ public void OnTestLoaded_SetupFixtureNode_ContainingTwoNamespaces_AreNotFolded()
360360
}
361361

362362
[Test]
363-
public void OnTestLoaded_OutcomeFilter_IsEnabled()
363+
public void OnTestLoaded_TestFilters_AreEnabled()
364364
{
365365
// Arrange
366366
string xml =
@@ -371,42 +371,17 @@ public void OnTestLoaded_OutcomeFilter_IsEnabled()
371371
_strategy.OnTestLoaded(new TestNode(xml), null);
372372

373373
// Assert
374-
_view.OutcomeFilter.Received().Enabled = true;
374+
_view.Received().EnableTestFilter(true);
375375
}
376376

377377
[Test]
378-
public void OnTestUnloaded_OutcomeFilter_IsDisabled()
378+
public void OnTestUnloaded_TestFilters_AreDisabled()
379379
{
380380
// Arrange + Act
381381
_strategy.OnTestUnloaded();
382382

383383
// Assert
384-
_view.OutcomeFilter.Received().Enabled = false;
385-
}
386-
387-
[Test]
388-
public void OnTestLoaded_TextFilter_IsEnabled()
389-
{
390-
// Arrange
391-
string xml =
392-
"<test-suite type='Assembly' id='1-1030' name='Library.Test.dll'>" +
393-
"</test-suite>";
394-
395-
// Act
396-
_strategy.OnTestLoaded(new TestNode(xml), null);
397-
398-
// Assert
399-
_view.TextFilter.Received().Enabled = true;
400-
}
401-
402-
[Test]
403-
public void OnTestUnloaded_TextFilter_IsDisabled()
404-
{
405-
// Arrange + Act
406-
_strategy.OnTestUnloaded();
407-
408-
// Assert
409-
_view.TextFilter.Received().Enabled = false;
384+
_view.Received().EnableTestFilter(false);
410385
}
411386
}
412387

0 commit comments

Comments
 (0)