Skip to content

Commit 827e708

Browse files
retailcoderretailcoder
authored
Merge pull request #3638 from IvenBach/Issue3507_Run_selected_unit_test
Test explorer enhancement: run selected test. First iteration only runs the first selected test.
2 parents 58d413f + 9493c52 commit 827e708

File tree

4 files changed

+40
-30
lines changed

4 files changed

+40
-30
lines changed

‎RetailCoder.VBE/UI/RubberduckUI.Designer.cs

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

‎RetailCoder.VBE/UI/RubberduckUI.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ Warning: All customized settings will be lost. Your old file will be saved in '
475475
<data name="Result" xml:space="preserve">
476476
<value>Result</value>
477477
</data>
478-
<data name="Outcome" xml:space="preserve">
478+
<data name="TestExplorer_Outcome" xml:space="preserve">
479479
<value>Outcome</value>
480480
</data>
481481
<data name="GeneralSettings_LanguageLabel" xml:space="preserve">
@@ -634,7 +634,7 @@ Warning: All customized settings will be lost. Your old file will be saved in '
634634
<value>Passed Tests</value>
635635
</data>
636636
<data name="TestExplorer_RunSelectedTests" xml:space="preserve">
637-
<value>Selected Tests</value>
637+
<value>Selected Test</value>
638638
</data>
639639
<data name="Line" xml:space="preserve">
640640
<value>Line</value>

‎RetailCoder.VBE/UI/UnitTesting/TestExplorerControl.xaml

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -470,66 +470,76 @@
470470

471471
<ToolBarTray Grid.Row="0" IsLocked="True">
472472
<ToolBar IsEnabled="{Binding Model.IsReady}" Style="{StaticResource ToolBarWithOverflowOnlyShowingWhenNeededStyle}">
473+
<ToolBar.Resources>
474+
<Style TargetType="Image">
475+
<Setter Property="Height" Value="16" />
476+
</Style>
477+
</ToolBar.Resources>
473478

474479
<Button Command="{Binding RefreshCommand}">
475-
<Image Height="16" Source="../../Resources/arrow-circle-double.png" />
480+
<Image Source="../../Resources/arrow-circle-double.png" />
476481
</Button>
477482

478483
<Separator />
479484
<Menu>
480485
<MenuItem VerticalAlignment="Center" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Run}">
481486
<MenuItem.Icon>
482-
<Image Height="16" Source="../../Resources/control.png" />
487+
<Image Source="../../Resources/control.png" />
483488
</MenuItem.Icon>
484489
<MenuItem Command="{Binding RunAllTestsCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_RunAllTests}">
485490
<MenuItem.Icon>
486-
<Image Height="16" Source="../../Resources/flask--arrow.png" />
491+
<Image Source="../../Resources/flask--arrow.png" />
487492
</MenuItem.Icon>
488493
</MenuItem>
489494
<Separator />
490495
<MenuItem Command="{Binding RunNotExecutedTestsCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_RunNotRunTests}" >
491496
<MenuItem.Icon>
492-
<Image Height="16" Source="../../Resources/question-white.png" />
497+
<Image Source="../../Resources/question-white.png" />
498+
</MenuItem.Icon>
499+
</MenuItem>
500+
<MenuItem Command="{Binding RunSelectedTestCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI ,Key=TestExplorer_RunSelectedTests}" >
501+
<MenuItem.Icon>
502+
<Image Source="../../Resources/flask--arrow.png" />
493503
</MenuItem.Icon>
494504
</MenuItem>
495505
<MenuItem Command="{Binding RunInconclusiveTestsCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_RunInconclusiveTests}" >
496506
<MenuItem.Icon>
497-
<Image Height="16" Source="../../Resources/flask--exclamation.png" />
507+
<Image Source="../../Resources/flask--exclamation.png" />
498508
</MenuItem.Icon>
499509
</MenuItem>
500510
<MenuItem Command="{Binding RunPassedTestsCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_RunPassedTests}" >
501511
<MenuItem.Icon>
502-
<Image Height="16" Source="../../Resources/tick-circle.png" />
512+
<Image Source="../../Resources/tick-circle.png" />
503513
</MenuItem.Icon>
504514
</MenuItem>
505515
<MenuItem Command="{Binding RunFailedTestsCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_RunFailedTests}">
506516
<MenuItem.Icon>
507-
<Image Height="16" Source="../../Resources/cross-circle.png" />
517+
<Image Source="../../Resources/cross-circle.png" />
508518
</MenuItem.Icon>
509519
</MenuItem>
510520
<Separator />
511521
<MenuItem Command="{Binding RepeatLastRunCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_RunLastRunTests}">
512522
<MenuItem.Icon>
513-
<Image Height="16" Source="../../Resources/arrow-repeat.png" />
523+
<Image Source="../../Resources/arrow-repeat.png" />
514524
</MenuItem.Icon>
515525
</MenuItem>
516526

517527
</MenuItem>
518528
<MenuItem VerticalAlignment="Center" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Add}">
519529
<MenuItem.Icon>
520-
<Image Height="16" Source="../../Resources/flask--plus.png" />
530+
<Image Source="../../Resources/flask--plus.png" />
521531
</MenuItem.Icon>
522532
<MenuItem Command="{Binding AddTestModuleCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_AddTestModule}">
523533
</MenuItem>
524534
<Separator />
525535
<MenuItem Command="{Binding AddTestMethodCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_AddTestMethod}">
526536
<MenuItem.Icon>
527-
<Image Height="16" Source="../../Resources/flask.png" />
537+
<Image Source="../../Resources/flask.png" />
528538
</MenuItem.Icon>
529539
</MenuItem>
530540
<MenuItem Command="{Binding AddErrorTestMethodCommand}" Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_AddExpectedErrorTestMethod}">
531541
<MenuItem.Icon>
532-
<Image Height="16" Source="../../Resources/flask--exclamation.png" />
542+
<Image Source="../../Resources/flask--exclamation.png" />
533543
</MenuItem.Icon>
534544
</MenuItem>
535545
</MenuItem>
@@ -539,7 +549,7 @@
539549
<Menu>
540550
<MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=GroupingGrid_GroupingStyle}">
541551
<MenuItem.Icon>
542-
<Image Height="16" Source="../../Resources/Custom/PNG/GroupBy.png" />
552+
<Image Source="../../Resources/Custom/PNG/GroupBy.png" />
543553
</MenuItem.Icon>
544554

545555
<MenuItem x:Name="GroupByOutcome"
@@ -564,13 +574,13 @@
564574
</Menu>
565575

566576
<Button Command="{Binding CopyResultsCommand}">
567-
<Image Height="16" Source="../../Resources/document-copy.png" />
577+
<Image Source="../../Resources/document-copy.png" />
568578
<Button.ToolTip>
569579
<TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_CopyToolTip}" />
570580
</Button.ToolTip>
571581
</Button>
572582
<Button ToolTip="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Settings}" Command="{Binding OpenTestSettingsCommand}" BorderThickness="0" Background="Transparent">
573-
<Image Height="16" Source="{StaticResource SettingsImage}" />
583+
<Image Source="{StaticResource SettingsImage}" />
574584
</Button>
575585
</ToolBar>
576586
</ToolBarTray>
@@ -595,7 +605,7 @@
595605
Visibility="{Binding IsChecked, ElementName=GroupByOutcome, Converter={StaticResource BoolToVisibility}}"
596606
Margin="-1,0,1,0">
597607
<DataGrid.Columns>
598-
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Outcome}">
608+
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Outcome}">
599609
<DataGridTemplateColumn.CellTemplate>
600610
<DataTemplate DataType="unitTesting:TestMethod">
601611
<Image Source="{Binding Result.Outcome, Converter={StaticResource OutcomeIconConverter}}" Height="16" />
@@ -613,7 +623,7 @@
613623
ShowGroupingItemCount="True"
614624
Visibility="{Binding IsChecked, ElementName=GroupByLocation, Converter={StaticResource BoolToVisibility}}">
615625
<DataGrid.Columns>
616-
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Outcome}">
626+
<DataGridTemplateColumn Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=TestExplorer_Outcome}">
617627
<DataGridTemplateColumn.CellTemplate>
618628
<DataTemplate DataType="unitTesting:TestMethod">
619629
<Image Source="{Binding Result.Outcome, Converter={StaticResource OutcomeIconConverter}}" Height="16" />

‎Retailcoder.VBE/UI/RubberduckUI.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ Warning: All customized settings will be lost. Your old file will be saved in '
475475
<data name="Result" xml:space="preserve">
476476
<value>Result</value>
477477
</data>
478-
<data name="Outcome" xml:space="preserve">
478+
<data name="TestExplorer_Outcome" xml:space="preserve">
479479
<value>Outcome</value>
480480
</data>
481481
<data name="GeneralSettings_LanguageLabel" xml:space="preserve">
@@ -634,7 +634,7 @@ Warning: All customized settings will be lost. Your old file will be saved in '
634634
<value>Passed Tests</value>
635635
</data>
636636
<data name="TestExplorer_RunSelectedTests" xml:space="preserve">
637-
<value>Selected Tests</value>
637+
<value>Selected Test</value>
638638
</data>
639639
<data name="Line" xml:space="preserve">
640640
<value>Line</value>

0 commit comments

Comments
 (0)