Skip to content

Commit 0aa43b6

Browse files
bclothierbclothier
committed
Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into BuildRegistryWithWix
# Conflicts: # LICENSE # Rubberduck.Deployment/InnoSetup/license # license
2 parents 60595eb + 63b5a81 commit 0aa43b6

File tree

5 files changed

+35
-51
lines changed

5 files changed

+35
-51
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you like this project and would like to thank its contributors, you are welco
1919
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/rubberduck-vba/Rubberduck.svg)](http://isitmaintained.com/project/rubberduck-vba/Rubberduck "Average time to resolve an issue") [![Percentage of issues still open](http://isitmaintained.com/badge/open/rubberduck-vba/Rubberduck.svg)](http://isitmaintained.com/project/rubberduck-vba/Rubberduck "Percentage of issues still open")
2020

2121
> **[rubberduckvba.com](http://rubberduckvba.com)** [Wiki](https://github.com/retailcoder/Rubberduck/wiki) [Rubberduck News](https://rubberduckvba.wordpress.com/)
22-
> contact@rubberduckvba.com
22+
> devs@rubberduckvba.com
2323
> Follow [@rubberduckvba](https://twitter.com/rubberduckvba) on Twitter
2424
2525
---

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

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -599,48 +599,45 @@
599599
</ProgressBar>
600600

601601
<Border Grid.Row="2" Padding="2">
602-
<ScrollViewer PreviewMouseWheel="ScrollViewer_MouseWheel"
603-
VerticalScrollBarVisibility="Auto">
604-
<Grid>
605-
<controls:GroupingGrid ItemsSource="{Binding Source={StaticResource ResultsByOutcome}}"
602+
<Grid>
603+
<controls:GroupingGrid ItemsSource="{Binding Source={StaticResource ResultsByOutcome}}"
606604
SelectedItem="{Binding SelectedTest}"
607605
ShowGroupingItemCount="True"
608606
Visibility="{Binding IsChecked, ElementName=GroupByOutcome, Converter={StaticResource BoolToVisibility}}"
609607
Margin="-1,0,1,0">
610-
<DataGrid.Columns>
611-
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Outcome}">
612-
<DataGridTemplateColumn.CellTemplate>
613-
<DataTemplate DataType="unitTesting:TestMethod">
614-
<Image Source="{Binding Result.Outcome, Converter={StaticResource OutcomeIconConverter}}" Height="16" />
615-
</DataTemplate>
616-
</DataGridTemplateColumn.CellTemplate>
617-
</DataGridTemplateColumn>
618-
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_QualifiedModuleName}" Binding="{Binding Declaration.QualifiedName.QualifiedModuleName}" />
619-
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_MethodName}" Binding="{Binding Declaration.IdentifierName}" />
620-
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Message}" Binding="{Binding Result.Output}" Width="*" />
621-
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Duration}" Binding="{Binding Result.Duration, StringFormat={}{0}ms}" />
622-
</DataGrid.Columns>
623-
</controls:GroupingGrid>
624-
<controls:GroupingGrid ItemsSource="{Binding Source={StaticResource ResultsByModule}}"
608+
<DataGrid.Columns>
609+
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Outcome}">
610+
<DataGridTemplateColumn.CellTemplate>
611+
<DataTemplate DataType="unitTesting:TestMethod">
612+
<Image Source="{Binding Result.Outcome, Converter={StaticResource OutcomeIconConverter}}" Height="16" />
613+
</DataTemplate>
614+
</DataGridTemplateColumn.CellTemplate>
615+
</DataGridTemplateColumn>
616+
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_QualifiedModuleName}" Binding="{Binding Declaration.QualifiedName.QualifiedModuleName}" />
617+
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_MethodName}" Binding="{Binding Declaration.IdentifierName}" />
618+
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Message}" Binding="{Binding Result.Output}" Width="*" />
619+
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Duration}" Binding="{Binding Result.Duration, StringFormat={}{0}ms}" />
620+
</DataGrid.Columns>
621+
</controls:GroupingGrid>
622+
<controls:GroupingGrid ItemsSource="{Binding Source={StaticResource ResultsByModule}}"
625623
SelectedItem="{Binding SelectedTest}"
626624
ShowGroupingItemCount="True"
627625
Visibility="{Binding IsChecked, ElementName=GroupByLocation, Converter={StaticResource BoolToVisibility}}">
628-
<DataGrid.Columns>
629-
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Outcome}">
630-
<DataGridTemplateColumn.CellTemplate>
631-
<DataTemplate DataType="unitTesting:TestMethod">
632-
<Image Source="{Binding Result.Outcome, Converter={StaticResource OutcomeIconConverter}}" Height="16" />
633-
</DataTemplate>
634-
</DataGridTemplateColumn.CellTemplate>
635-
</DataGridTemplateColumn>
636-
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_QualifiedModuleName}" Binding="{Binding Declaration.QualifiedName.QualifiedModuleName}" />
637-
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_MethodName}" Binding="{Binding Declaration.QualifiedName.MemberName}" />
638-
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Message}" Binding="{Binding Result.Output}" Width="*" />
639-
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Duration}" Binding="{Binding Result.Duration, StringFormat={}{0}ms}" />
640-
</DataGrid.Columns>
641-
</controls:GroupingGrid>
642-
</Grid>
643-
</ScrollViewer>
626+
<DataGrid.Columns>
627+
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Outcome}">
628+
<DataGridTemplateColumn.CellTemplate>
629+
<DataTemplate DataType="unitTesting:TestMethod">
630+
<Image Source="{Binding Result.Outcome, Converter={StaticResource OutcomeIconConverter}}" Height="16" />
631+
</DataTemplate>
632+
</DataGridTemplateColumn.CellTemplate>
633+
</DataGridTemplateColumn>
634+
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_QualifiedModuleName}" Binding="{Binding Declaration.QualifiedName.QualifiedModuleName}" />
635+
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_MethodName}" Binding="{Binding Declaration.QualifiedName.MemberName}" />
636+
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Message}" Binding="{Binding Result.Output}" Width="*" />
637+
<DataGridTextColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Duration}" Binding="{Binding Result.Duration, StringFormat={}{0}ms}" />
638+
</DataGrid.Columns>
639+
</controls:GroupingGrid>
640+
</Grid>
644641
</Border>
645642
<controls:BusyIndicator Grid.Row="2" Width="120" Height="120" Visibility="{Binding Model.IsBusy, Converter={StaticResource BoolToVisibility}}" />
646643
</Grid>

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,5 @@ public void Dispose()
5454

5555
_isDisposed = true;
5656
}
57-
58-
private void ScrollViewer_MouseWheel(object sender, MouseWheelEventArgs e)
59-
{
60-
if (e.Delta > 0)
61-
{
62-
((ScrollViewer)sender).LineUp();
63-
}
64-
else
65-
{
66-
((ScrollViewer)sender).LineDown();
67-
}
68-
69-
}
7057
}
7158
}

‎Rubberduck.Core/UnitTesting/IFakes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public interface IFakes
88

99
public interface IFakesFactory
1010
{
11-
IFakes GetFakes();
11+
IFakes Create();
1212
void Release(IFakes fakes);
1313
}
1414
}

‎Rubberduck.Core/UnitTesting/TestEngine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void Run(IEnumerable<TestMethod> tests)
7474
.Where(test => test.Declaration.QualifiedName.QualifiedModuleName.ProjectId == capturedModule.Key.ProjectId
7575
&& test.Declaration.QualifiedName.QualifiedModuleName.ComponentName == capturedModule.Key.ComponentName);
7676

77-
var fakes = _fakesFactory.GetFakes();
77+
var fakes = _fakesFactory.Create();
7878
try
7979
{
8080
Run(module.Key.FindModuleInitializeMethods(_state));

0 commit comments

Comments
 (0)