testing: adding tests count badge for the testing explorer (microsoft#182399)

* feat: adding count badge for the testing explorer

Signed-off-by: Fawzi Abdulfattah <iifawzie@gmail.com>

* register the change listener

Signed-off-by: Fawzi Abdulfattah <iifawzie@gmail.com>

* adding badgeTooltip to handle all tests case

Signed-off-by: Fawzi Abdulfattah <iifawzie@gmail.com>

* Update src/vs/workbench/contrib/testing/common/configuration.ts

Co-authored-by: John Murray <johnm@georgejames.com>

* get the config value by the enum key

Signed-off-by: Fawzi Abdulfattah <iifawzie@gmail.com>

* Adding getLocalizedBadgeString method

Signed-off-by: Fawzi Abdulfattah <iifawzie@gmail.com>

* removing the all option

Signed-off-by: Fawzi Abdulfattah <iifawzie@gmail.com>

* changing the type of countSummary and add a guard check

Signed-off-by: Fawzi Abdulfattah <iifawzie@gmail.com>

---------

Signed-off-by: Fawzi Abdulfattah <iifawzie@gmail.com>
Co-authored-by: John Murray <johnm@georgejames.com>

Author: iifawzi

src/vs/workbench/contrib/testing/browser/testingExplorerView.ts

@@ -54,8 +54,8 @@ import { TestingObjectTree } from 'vs/workbench/contrib/testing/browser/explorer
 import { ISerializedTestTreeCollapseState } from 'vs/workbench/contrib/testing/browser/explorerProjections/testingViewState';
 import * as icons from 'vs/workbench/contrib/testing/browser/icons';
 import { TestingExplorerFilter } from 'vs/workbench/contrib/testing/browser/testingExplorerFilter';
-import { ITestingProgressUiService } from 'vs/workbench/contrib/testing/browser/testingProgressUiService';
-import { TestingConfigKeys, getTestingConfiguration } from 'vs/workbench/contrib/testing/common/configuration';
+import { CountSummary, ITestingProgressUiService } from 'vs/workbench/contrib/testing/browser/testingProgressUiService';
+import { TestingConfigKeys, TestingCountBadge, getTestingConfiguration } from 'vs/workbench/contrib/testing/common/configuration';
 import { TestCommandId, TestExplorerViewMode, TestExplorerViewSorting, Testing, labelForTestInState } from 'vs/workbench/contrib/testing/common/constants';
 import { StoredValue } from 'vs/workbench/contrib/testing/common/storedValue';
 import { ITestExplorerFilterState, TestExplorerFilterState, TestFilterTerm } from 'vs/workbench/contrib/testing/common/testExplorerFilterState';
@@ -70,6 +70,7 @@ import { ITestingPeekOpener } from 'vs/workbench/contrib/testing/common/testingP
 import { cmpPriority, isFailedState, isStateWithResult } from 'vs/workbench/contrib/testing/common/testingStates';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ITestingContinuousRunService } from 'vs/workbench/contrib/testing/common/testingContinuousRunService';
+import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
 
 const enum LastFocusState {
 	Input,
@@ -81,8 +82,10 @@ export class TestingExplorerView extends ViewPane {
 	private filterActionBar = this._register(new MutableDisposable());
 	private container!: HTMLElement;
 	private treeHeader!: HTMLElement;
+	private countSummary: CountSummary | undefined;
 	private discoveryProgress = this._register(new MutableDisposable<UnmanagedProgress>());
 	private readonly filter = this._register(new MutableDisposable<TestingExplorerFilter>());
+	private readonly badgeDisposable = this._register(new MutableDisposable<IDisposable>());
 	private readonly filterFocusListener = this._register(new MutableDisposable());
 	private readonly dimensions = { width: 0, height: 0 };
 	private lastFocusState = LastFocusState.Input;
@@ -93,6 +96,7 @@ export class TestingExplorerView extends ViewPane {
 
 	constructor(
 		options: IViewletViewOptions,
+		@IActivityService private readonly activityService: IActivityService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IConfigurationService configurationService: IConfigurationService,
@@ -121,6 +125,8 @@ export class TestingExplorerView extends ViewPane {
 		}));
 
 		this._register(testProfileService.onDidChange(() => this.updateActions()));
+		const onDidChangeTestingCountBadge = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('testing.countBadge'));
+		this._register(onDidChangeTestingCountBadge(this.renderActivityCount, this));
 	}
 
 	public override shouldShowWelcome() {
@@ -269,6 +275,10 @@ export class TestingExplorerView extends ViewPane {
 				this.layoutBody();
 			}
 		}));
+		this._register(this.testProgressService.onCountChange((text: CountSummary) => {
+			this.countSummary = text;
+			this.renderActivityCount();
+		}));
 
 		const listContainer = dom.append(this.container, dom.$('.test-explorer-tree'));
 		this.viewModel = this.instantiationService.createInstance(TestingExplorerViewModel, listContainer, this.onDidChangeBodyVisibility);
@@ -417,6 +427,27 @@ export class TestingExplorerView extends ViewPane {
 		}
 	}
 
+	private renderActivityCount() {
+		const countBadgeType = this.configurationService.getValue<TestingCountBadge>(TestingConfigKeys.CountBadge);
+		if (!this.countSummary || countBadgeType === TestingCountBadge.Off || this.countSummary[countBadgeType] === 0) {
+			this.badgeDisposable.value = undefined;
+		} else {
+			const badge = new NumberBadge(this.countSummary[countBadgeType], num => this.getLocalizedBadgeString(countBadgeType, num));
+			this.badgeDisposable.value = this.activityService.showViewActivity(Testing.ExplorerViewId, { badge });
+		}
+	}
+
+	private getLocalizedBadgeString(countBadgeType: TestingCountBadge, count: number): string {
+		switch (countBadgeType) {
+			case TestingCountBadge.Passed:
+				return localize('testingCountBadgePassed', '{0} passed tests', count);
+			case TestingCountBadge.Skipped:
+				return localize('testingCountBadgeSkipped', '{0} skipped tests', count);
+			default:
+				return localize('testingCountBadgeFailed', '{0} failed tests', count);
+		}
+	}
+
 	/**
 	 * @override
 	 */

src/vs/workbench/contrib/testing/browser/testingProgressUiService.ts

@@ -100,7 +100,7 @@ export class TestingProgressUiService extends Disposable implements ITestingProg
 
 	constructor(
 		@ITestResultService private readonly resultService: ITestResultService,
-		@IInstantiationService private readonly instantiaionService: IInstantiationService,
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
 	) {
 		super();
 	}
@@ -126,11 +126,11 @@ export class TestingProgressUiService extends Disposable implements ITestingProg
 		}
 
 		if (!this.windowProg.value) {
-			this.windowProg.value = this.instantiaionService.createInstance(UnmanagedProgress, {
+			this.windowProg.value = this.instantiationService.createInstance(UnmanagedProgress, {
 				location: ProgressLocation.Window,
 				type: 'loading'
 			});
-			this.testViewProg.value = this.instantiaionService.createInstance(UnmanagedProgress, {
+			this.testViewProg.value = this.instantiationService.createInstance(UnmanagedProgress, {
 				location: Testing.ViewletId,
 				total: 1000,
 			});
@@ -148,7 +148,7 @@ export class TestingProgressUiService extends Disposable implements ITestingProg
 	}
 }
 
-type CountSummary = ReturnType<typeof collectTestStateCounts>;
+export type CountSummary = ReturnType<typeof collectTestStateCounts>;
 
 
 const collectTestStateCounts = (isRunning: boolean, ...counts: ReadonlyArray<TestStateCount>) => {

src/vs/workbench/contrib/testing/common/configuration.ts

@@ -16,7 +16,8 @@ export const enum TestingConfigKeys {
 	DefaultGutterClickAction = 'testing.defaultGutterClickAction',
 	GutterEnabled = 'testing.gutterEnabled',
 	SaveBeforeTest = 'testing.saveBeforeTest',
-	AlwaysRevealTestOnStateChange = 'testing.alwaysRevealTestOnStateChange'
+	AlwaysRevealTestOnStateChange = 'testing.alwaysRevealTestOnStateChange',
+	CountBadge = 'testing.countBadge'
 }
 
 export const enum AutoOpenTesting {
@@ -37,6 +38,13 @@ export const enum DefaultGutterClickAction {
 	ContextMenu = 'contextMenu',
 }
 
+export const enum TestingCountBadge {
+	Failed = 'failed',
+	Off = 'off',
+	Passed = 'passed',
+	Skipped = 'skipped',
+}
+
 export const testingConfiguration: IConfigurationNode = {
 	id: 'testing',
 	order: 21,
@@ -68,6 +76,22 @@ export const testingConfiguration: IConfigurationNode = {
 			type: 'boolean',
 			default: false,
 		},
+		[TestingConfigKeys.CountBadge]: {
+			description: localize('testing.countBadge', 'Controls the count badge on the Testing icon on the Activity Bar.'),
+			enum: [
+				TestingCountBadge.Failed,
+				TestingCountBadge.Off,
+				TestingCountBadge.Passed,
+				TestingCountBadge.Skipped,
+			],
+			enumDescriptions: [
+				localize('testing.countBadge.failed', 'Show the number of failed tests'),
+				localize('testing.countBadge.off', 'Disable the testing count badge'),
+				localize('testing.countBadge.passed', 'Show the number of passed tests'),
+				localize('testing.countBadge.skipped', 'Show the number of skipped tests'),
+			],
+			default: TestingCountBadge.Failed,
+		},
 		[TestingConfigKeys.FollowRunningTest]: {
 			description: localize('testing.followRunningTest', 'Controls whether the running test should be followed in the Test Explorer view.'),
 			type: 'boolean',
@@ -123,6 +147,7 @@ export interface ITestingConfiguration {
 	[TestingConfigKeys.AutoRunDelay]: number;
 	[TestingConfigKeys.AutoOpenPeekView]: AutoOpenPeekViewWhen;
 	[TestingConfigKeys.AutoOpenPeekViewDuringContinuousRun]: boolean;
+	[TestingConfigKeys.CountBadge]: TestingCountBadge;
 	[TestingConfigKeys.FollowRunningTest]: boolean;
 	[TestingConfigKeys.DefaultGutterClickAction]: DefaultGutterClickAction;
 	[TestingConfigKeys.GutterEnabled]: boolean;