Skip to content

Commit

Permalink
Merge pull request #3638 from IvenBach/Issue3507_Run_selected_unit_test
Browse files Browse the repository at this point in the history 
Test explorer enhancement: run selected test. First iteration only runs the first selected test.
  • Loading branch information
@retailcoder
retailcoder committed Dec 27, 2017
2 parents 58d413f + 9493c52 commit 827e708
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 30 deletions.
20 changes: 10 additions & 10 deletions RetailCoder.VBE/UI/RubberduckUI.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions RetailCoder.VBE/UI/RubberduckUI.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ Warning: All customized settings will be lost. Your old file will be saved in '
<data name="Result" xml:space="preserve">
<value>Result</value>
</data>
<data name="Outcome" xml:space="preserve">
<data name="TestExplorer_Outcome" xml:space="preserve">
<value>Outcome</value>
</data>
<data name="GeneralSettings_LanguageLabel" xml:space="preserve">
Expand Down Expand Up @@ -634,7 +634,7 @@ Warning: All customized settings will be lost. Your old file will be saved in '
<value>Passed Tests</value>
</data>
<data name="TestExplorer_RunSelectedTests" xml:space="preserve">
<value>Selected Tests</value>
<value>Selected Test</value>
</data>
<data name="Line" xml:space="preserve">
<value>Line</value>
Expand Down
42 changes: 26 additions & 16 deletions RetailCoder.VBE/UI/UnitTesting/TestExplorerControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,66 +470,76 @@

<ToolBarTray Grid.Row="0" IsLocked="True">
<ToolBar IsEnabled="{Binding Model.IsReady}" Style="{StaticResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}">
<ToolBar.Resources>
<Style TargetType="Image">
<Setter Property="Height" Value="16" />
</Style>
</ToolBar.Resources>

<Button Command="{Binding RefreshCommand}">
<Image Height="16" Source="../../Resources/arrow-circle-double.png" />
<Image Source="../../Resources/arrow-circle-double.png" />
</Button>

<Separator />
<Menu>
<MenuItem VerticalAlignment="Center" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Run}">
<MenuItem.Icon>
<Image Height="16" Source="../../Resources/control.png" />
<Image Source="../../Resources/control.png" />
</MenuItem.Icon>
<MenuItem Command="{Binding RunAllTestsCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_RunAllTests}">
<MenuItem.Icon>
<Image Height="16" Source="../../Resources/flask--arrow.png" />
<Image Source="../../Resources/flask--arrow.png" />
</MenuItem.Icon>
</MenuItem>
<Separator />
<MenuItem Command="{Binding RunNotExecutedTestsCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_RunNotRunTests}" >
<MenuItem.Icon>
<Image Height="16" Source="../../Resources/question-white.png" />
<Image Source="../../Resources/question-white.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="{Binding RunSelectedTestCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI ,Key=TestExplorer_RunSelectedTests}" >
<MenuItem.Icon>
<Image Source="../../Resources/flask--arrow.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="{Binding RunInconclusiveTestsCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_RunInconclusiveTests}" >
<MenuItem.Icon>
<Image Height="16" Source="../../Resources/flask--exclamation.png" />
<Image Source="../../Resources/flask--exclamation.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="{Binding RunPassedTestsCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_RunPassedTests}" >
<MenuItem.Icon>
<Image Height="16" Source="../../Resources/tick-circle.png" />
<Image Source="../../Resources/tick-circle.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="{Binding RunFailedTestsCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_RunFailedTests}">
<MenuItem.Icon>
<Image Height="16" Source="../../Resources/cross-circle.png" />
<Image Source="../../Resources/cross-circle.png" />
</MenuItem.Icon>
</MenuItem>
<Separator />
<MenuItem Command="{Binding RepeatLastRunCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_RunLastRunTests}">
<MenuItem.Icon>
<Image Height="16" Source="../../Resources/arrow-repeat.png" />
<Image Source="../../Resources/arrow-repeat.png" />
</MenuItem.Icon>
</MenuItem>

</MenuItem>
<MenuItem VerticalAlignment="Center" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Add}">
<MenuItem.Icon>
<Image Height="16" Source="../../Resources/flask--plus.png" />
<Image Source="../../Resources/flask--plus.png" />
</MenuItem.Icon>
<MenuItem Command="{Binding AddTestModuleCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_AddTestModule}">
</MenuItem>
<Separator />
<MenuItem Command="{Binding AddTestMethodCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_AddTestMethod}">
<MenuItem.Icon>
<Image Height="16" Source="../../Resources/flask.png" />
<Image Source="../../Resources/flask.png" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Command="{Binding AddErrorTestMethodCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_AddExpectedErrorTestMethod}">
<MenuItem.Icon>
<Image Height="16" Source="../../Resources/flask--exclamation.png" />
<Image Source="../../Resources/flask--exclamation.png" />
</MenuItem.Icon>
</MenuItem>
</MenuItem>
Expand All @@ -539,7 +549,7 @@
<Menu>
<MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=GroupingGrid_GroupingStyle}">
<MenuItem.Icon>
<Image Height="16" Source="../../Resources/Custom/PNG/GroupBy.png" />
<Image Source="../../Resources/Custom/PNG/GroupBy.png" />
</MenuItem.Icon>

<MenuItem x:Name="GroupByOutcome"
Expand All @@ -564,13 +574,13 @@
</Menu>

<Button Command="{Binding CopyResultsCommand}">
<Image Height="16" Source="../../Resources/document-copy.png" />
<Image Source="../../Resources/document-copy.png" />
<Button.ToolTip>
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_CopyToolTip}" />
</Button.ToolTip>
</Button>
<Button ToolTip="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Settings}" Command="{Binding OpenTestSettingsCommand}" BorderThickness="0" Background="Transparent">
<Image Height="16" Source="{StaticResource SettingsImage}" />
<Image Source="{StaticResource SettingsImage}" />
</Button>
</ToolBar>
</ToolBarTray>
Expand All @@ -595,7 +605,7 @@
Visibility="{Binding IsChecked, ElementName=GroupByOutcome, Converter={StaticResource BoolToVisibility}}"
Margin="-1,0,1,0">
<DataGrid.Columns>
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Outcome}">
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Outcome}">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate DataType="unitTesting:TestMethod">
<Image Source="{Binding Result.Outcome, Converter={StaticResource OutcomeIconConverter}}" Height="16" />
Expand All @@ -613,7 +623,7 @@
ShowGroupingItemCount="True"
Visibility="{Binding IsChecked, ElementName=GroupByLocation, Converter={StaticResource BoolToVisibility}}">
<DataGrid.Columns>
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Outcome}">
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Outcome}">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate DataType="unitTesting:TestMethod">
<Image Source="{Binding Result.Outcome, Converter={StaticResource OutcomeIconConverter}}" Height="16" />
Expand Down
4 changes: 2 additions & 2 deletions Retailcoder.VBE/UI/RubberduckUI.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ Warning: All customized settings will be lost. Your old file will be saved in '
<data name="Result" xml:space="preserve">
<value>Result</value>
</data>
<data name="Outcome" xml:space="preserve">
<data name="TestExplorer_Outcome" xml:space="preserve">
<value>Outcome</value>
</data>
<data name="GeneralSettings_LanguageLabel" xml:space="preserve">
Expand Down Expand Up @@ -634,7 +634,7 @@ Warning: All customized settings will be lost. Your old file will be saved in '
<value>Passed Tests</value>
</data>
<data name="TestExplorer_RunSelectedTests" xml:space="preserve">
<value>Selected Tests</value>
<value>Selected Test</value>
</data>
<data name="Line" xml:space="preserve">
<value>Line</value>
Expand Down

0 comments on commit 827e708

Please sign in to comment.