Skip to content

Commit 7ba5932

Browse files
IvenBachIvenBach
committed
Finish filtering & Remove easter egg
Remove all usage and reference to SpectacularFail easter egg.
1 parent 5cafc06 commit 7ba5932

18 files changed

+5
-126
lines changed

‎Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050

5151
<BitmapImage x:Key="FilterImage" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/Funnel.png" />
5252
<BitmapImage x:Key="OutcomeUnknown" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/question-white.png" />
53-
<BitmapImage x:Key="OutcomeSpectacularFail" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/skull-mad.png" />
5453
<BitmapImage x:Key="OutcomeFail" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/cross-circle.png" />
5554
<BitmapImage x:Key="OutcomeInconclusive" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/exclamation.png" />
5655
<BitmapImage x:Key="OutcomeSucceeded" UriSource="pack://application:,,,/Rubberduck.Resources;component/Icons/Fugue/tick-circle.png" />
@@ -235,11 +234,6 @@
235234
IsChecked="{Binding Path=OutcomeFilter, Converter={StaticResource OutcomeFilterConverter}, ConverterParameter={x:Static local:TestExplorerOutcomeFilter.Unknown}}" >
236235
<Image Source="{StaticResource OutcomeUnknown}" />
237236
</ToggleButton>
238-
<ToggleButton Style="{StaticResource ToolBarToggleStyle}"
239-
ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=TestOutcome_SpectacularFail}"
240-
IsChecked="{Binding Path=OutcomeFilter, Converter={StaticResource OutcomeFilterConverter}, ConverterParameter={x:Static local:TestExplorerOutcomeFilter.SpectacularFail}}" >
241-
<Image Source="{StaticResource OutcomeSpectacularFail}" />
242-
</ToggleButton>
243237
<ToggleButton Style="{StaticResource ToolBarToggleStyle}"
244238
ToolTip="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=TestOutcome_Fail}"
245239
IsChecked="{Binding Path=OutcomeFilter, Converter={StaticResource OutcomeFilterConverter}, ConverterParameter={x:Static local:TestExplorerOutcomeFilter.Fail}}" >
@@ -318,13 +312,6 @@
318312
<TextBlock Margin="2" Padding="4,2,4,2" FontWeight="Bold" VerticalAlignment="Center"
319313
Text="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestOutcome_SummaryCaption}"/>
320314
<TextBlock Style="{StaticResource ResultsTestOutcomeStyle}" Text="{Binding Model.LastTestRunSummary, Mode=OneWay}"/>
321-
<StackPanel Orientation="Horizontal" Visibility="{Binding Model.LastTestSpectacularFailCount, Mode=OneWay, Converter={StaticResource NonZeroToVisibility}}" >
322-
<Image Style="{StaticResource TestOutcomeIconStyle}" Source="{StaticResource EasterEggTestImage}" Margin="4,0,4,0"/>
323-
<TextBlock Style="{StaticResource ResultsTestOutcomeStyle}">
324-
<Run Text="{Binding Model.LastTestSpectacularFailCount, Mode=OneWay}"/>
325-
<Run Text="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestOutcome_SpectacularFail}"/>
326-
</TextBlock>
327-
</StackPanel>
328315
<StackPanel Orientation="Horizontal" Visibility="{Binding Model.LastTestFailedCount, Mode=OneWay, Converter={StaticResource NonZeroToVisibility}}" >
329316
<Image Style="{StaticResource TestOutcomeIconStyle}" Source="{StaticResource RunFailedTestsImage}" Margin="4,0,4,0"/>
330317
<TextBlock Style="{StaticResource ResultsTestOutcomeStyle}">

‎Rubberduck.Core/UI/UnitTesting/TestExplorerModel.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ public bool IsRefreshing
100100
public string LastTestRunSummary =>
101101
string.Format(Resources.UnitTesting.TestExplorer.TestOutcome_RunSummaryFormat, CurrentRunTestCount, Tests.Count, TimeSpan.FromMilliseconds(TotalDuration));
102102

103-
public int LastTestSpectacularFailCount => Tests.Count(test => test.Result.Outcome == TestOutcome.SpectacularFail && _testEngine.LastRunTests.Contains(test.Method));
104-
105103
public int LastTestFailedCount => Tests.Count(test => test.Result.Outcome == TestOutcome.Failed && _testEngine.LastRunTests.Contains(test.Method));
106104

107105
public int LastTestInconclusiveCount => Tests.Count(test => test.Result.Outcome == TestOutcome.Inconclusive && _testEngine.LastRunTests.Contains(test.Method));
@@ -181,7 +179,6 @@ private void HandleRunCompletion(object sender, TestRunCompletedEventArgs e)
181179
IsBusy = false;
182180

183181
OnPropertyChanged(nameof(LastTestRunSummary));
184-
OnPropertyChanged(nameof(LastTestSpectacularFailCount));
185182
OnPropertyChanged(nameof(LastTestFailedCount));
186183
OnPropertyChanged(nameof(LastTestIgnoredCount));
187184
OnPropertyChanged(nameof(LastTestInconclusiveCount));
@@ -246,7 +243,6 @@ private void OnTestCompleted(TestCompletedEventArgs args)
246243
{ TestOutcome.Inconclusive, Colors.Gold },
247244
{ TestOutcome.Ignored, Colors.Orange },
248245
{ TestOutcome.Failed, Colors.Red },
249-
{ TestOutcome.SpectacularFail, Colors.Black }
250246
};
251247

252248
private TestOutcome _worstOutcome = TestOutcome.Unknown;

‎Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ public enum TestExplorerOutcomeFilter
3434
{
3535
None = 0,
3636
Unknown = 1,
37-
SpectacularFail = 1 << 1,
38-
Fail = 1 << 2,
39-
Inconclusive = 1 << 3,
40-
Succeeded = 1 << 4,
41-
All = Unknown | SpectacularFail | Fail | Inconclusive | Succeeded
37+
Fail = 1 << 1,
38+
Inconclusive = 1 << 2,
39+
Succeeded = 1 << 3,
40+
All = Unknown | Fail | Inconclusive | Succeeded
4241
}
4342

4443
internal sealed class TestExplorerViewModel : ViewModelBase, INavigateSelection, IDisposable

‎Rubberduck.Core/UI/UnitTesting/TestOutcomeImageSourceConverter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ public class TestOutcomeImageSourceConverter : ImageSourceConverter, IMultiValue
2222
{ TestOutcome.Succeeded, ToImageSource(RubberduckUI.tick_circle) },
2323
{ TestOutcome.Failed, ToImageSource(RubberduckUI.cross_circle) },
2424
{ TestOutcome.Inconclusive, ToImageSource(RubberduckUI.exclamation) },
25-
{ TestOutcome.Ignored, ToImageSource(RubberduckUI.minus_white) },
26-
{ TestOutcome.SpectacularFail, ToImageSource(RubberduckUI.skull_mad) }
25+
{ TestOutcome.Ignored, ToImageSource(RubberduckUI.minus_white) }
2726
};
2827

2928
public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)

‎Rubberduck.Resources/RubberduckUI.Designer.cs

Lines changed: 0 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Rubberduck.Resources/RubberduckUI.resx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1537,9 +1537,6 @@ NOTE: Restart is required for the setting to take effect.</value>
15371537
<data name="hourglass" type="System.Resources.ResXFileRef, System.Windows.Forms">
15381538
<value>Icons\Fugue\hourglass.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
15391539
</data>
1540-
<data name="skull_mad" type="System.Resources.ResXFileRef, System.Windows.Forms">
1541-
<value>Icons\Fugue\skull-mad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
1542-
</data>
15431540
<data name="Language_ES" xml:space="preserve">
15441541
<value>Español</value>
15451542
</data>
@@ -1599,9 +1596,6 @@ NOTE: Restart is required for the setting to take effect.</value>
15991596
<data name="TestOutcome_Inconclusive" xml:space="preserve">
16001597
<value>Inconclusive</value>
16011598
</data>
1602-
<data name="TestOutcome_SpectacularFail" xml:space="preserve">
1603-
<value>SpectacularFail</value>
1604-
</data>
16051599
<data name="TestOutcome_Succeeded" xml:space="preserve">
16061600
<value>Suceeded</value>
16071601
</data>

‎Rubberduck.Resources/UnitTesting/TestExplorer.Designer.cs

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Rubberduck.Resources/UnitTesting/TestExplorer.cs.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,4 @@
324324
<data name="TestOutcome_SummaryCaption" xml:space="preserve">
325325
<value>Shrnutí:</value>
326326
</data>
327-
<data name="TestOutcome_SpectacularFail" xml:space="preserve">
328-
<value>Pozoruhodné Selhání</value>
329-
</data>
330327
</root>

‎Rubberduck.Resources/UnitTesting/TestExplorer.de.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,6 @@
297297
<data name="TestOutcome_SummaryCaption" xml:space="preserve">
298298
<value>Zusammenfassung:</value>
299299
</data>
300-
<data name="TestOutcome_SpectacularFail" xml:space="preserve">
301-
<value>Spektakulärer Fehlschlag</value>
302-
</data>
303300
<data name="TestOutcome_RunSummaryFormat" xml:space="preserve">
304301
<value>{0} von {1} Test(s) ausgeführt. (Laufzeit: {2:g})</value>
305302
</data>

‎Rubberduck.Resources/UnitTesting/TestExplorer.es.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,4 @@
312312
<data name="TestOutcome_SummaryCaption" xml:space="preserve">
313313
<value>Resumen:</value>
314314
</data>
315-
<data name="TestOutcome_SpectacularFail" xml:space="preserve">
316-
<value>Fracaso espectacular</value>
317-
</data>
318315
</root>

0 commit comments

Comments
 (0)