Skip to content

Commit a84f243

Browse files
hediethediet
committed
Refactors fixtures
1 parent 40a2f79 commit a84f243

21 files changed

Lines changed: 1381 additions & 334 deletions

‎src/vs/sessions/contrib/agentFeedback/test/browser/agentFeedbackEditorWidget.fixture.ts‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import { DisposableStore } from '../../../../../base/common/lifecycle.js';
99
import { IMarkdownRendererService, MarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.js';
1010
import { URI } from '../../../../../base/common/uri.js';
1111
import { mock } from '../../../../../base/test/common/mock.js';
12-
import { observableValue } from '../../../../../base/common/observable.js';
1312
import { CodeEditorWidget, ICodeEditorWidgetOptions } from '../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
1413
import { IRange } from '../../../../../editor/common/core/range.js';
1514
import { TokenizationRegistry } from '../../../../../editor/common/languages.js';
1615
import { IAgentFeedback, IAgentFeedbackService } from '../../browser/agentFeedbackService.js';
1716
import { AgentFeedbackEditorWidget } from '../../browser/agentFeedbackEditorWidgetContribution.js';
1817
import { ComponentFixtureContext, createEditorServices, createTextModel, defineComponentFixture, defineThemedFixtureGroup } from '../../../../../workbench/test/browser/componentFixtures/fixtureUtils.js';
19-
import { CodeReviewStateKind, ICodeReviewService, ICodeReviewState, ICodeReviewSuggestion, IPRReviewState, PRReviewStateKind } from '../../../codeReview/browser/codeReviewService.js';
18+
import { ICodeReviewService, ICodeReviewSuggestion } from '../../../codeReview/browser/codeReviewService.js';
19+
import { createMockCodeReviewService } from '../../../../../workbench/test/browser/componentFixtures/sessions/mockCodeReviewService.js';
2020
import { ISessionEditorComment, SessionEditorCommentSource } from '../../browser/sessionEditorComments.js';
2121

2222
const sessionResource = URI.parse('vscode-agent-session://fixture/session-1');
@@ -146,34 +146,6 @@ function createMockAgentFeedbackService(): IAgentFeedbackService {
146146
}();
147147
}
148148

149-
function createMockCodeReviewService(): ICodeReviewService {
150-
return new class extends mock<ICodeReviewService>() {
151-
private readonly _state = observableValue<ICodeReviewState>('fixture.reviewState', { kind: CodeReviewStateKind.Idle });
152-
153-
override getReviewState() {
154-
return this._state;
155-
}
156-
157-
override hasReview(): boolean {
158-
return false;
159-
}
160-
161-
override requestReview(): void { }
162-
163-
override removeComment(): void { }
164-
165-
override dismissReview(): void { }
166-
167-
private readonly _prState = observableValue<IPRReviewState>('fixture.prReviewState', { kind: PRReviewStateKind.None });
168-
169-
override getPRReviewState() {
170-
return this._prState;
171-
}
172-
173-
override async resolvePRReviewThread(): Promise<void> { }
174-
}();
175-
}
176-
177149
function ensureTokenColorMap(): void {
178150
if (TokenizationRegistry.getColorMap()?.length) {
179151
return;

‎src/vs/workbench/test/browser/componentFixtures/aiCustomizationManagementEditor.fixture.ts‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ import { IIterativePager } from '../../../../base/common/paging.js';
5050
// eslint-disable-next-line local/code-import-patterns
5151
import { IAgentFeedbackService } from '../../../../sessions/contrib/agentFeedback/browser/agentFeedbackService.js';
5252
// eslint-disable-next-line local/code-import-patterns
53-
import { CodeReviewStateKind, ICodeReviewService, ICodeReviewState, IPRReviewState, PRReviewStateKind } from '../../../../sessions/contrib/codeReview/browser/codeReviewService.js';
53+
import { ICodeReviewService } from '../../../../sessions/contrib/codeReview/browser/codeReviewService.js';
54+
import { createMockCodeReviewService } from './sessions/mockCodeReviewService.js';
5455
import { IChatEditingService } from '../../../contrib/chat/common/editing/chatEditingService.js';
5556
import { IAgentSessionsService } from '../../../contrib/chat/browser/agentSessions/agentSessionsService.js';
5657
import { ComponentFixtureContext, createEditorServices, defineComponentFixture, defineThemedFixtureGroup, registerWorkbenchServices } from './fixtureUtils.js';
@@ -211,30 +212,6 @@ function createMockAgentFeedbackService(): IAgentFeedbackService {
211212
}();
212213
}
213214

214-
function createMockCodeReviewService(): ICodeReviewService {
215-
return new class extends mock<ICodeReviewService>() {
216-
private readonly reviewState = observableValue<ICodeReviewState>('fixture.reviewState', { kind: CodeReviewStateKind.Idle });
217-
private readonly prReviewState = observableValue<IPRReviewState>('fixture.prReviewState', { kind: PRReviewStateKind.None });
218-
219-
override getReviewState() {
220-
return this.reviewState;
221-
}
222-
223-
override getPRReviewState() {
224-
return this.prReviewState;
225-
}
226-
227-
override hasReview(): boolean {
228-
return false;
229-
}
230-
231-
override requestReview(): void { }
232-
override removeComment(): void { }
233-
override dismissReview(): void { }
234-
override async resolvePRReviewThread(): Promise<void> { }
235-
}();
236-
}
237-
238215
// ============================================================================
239216
// Realistic test data — a project that has Copilot + Claude customizations
240217
// ============================================================================

src/vs/workbench/test/browser/componentFixtures/chatArtifacts.fixture.ts renamed to src/vs/workbench/test/browser/componentFixtures/chat/chatArtifacts.fixture.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import * as dom from '../../../../base/browser/dom.js';
7-
import { Event } from '../../../../base/common/event.js';
8-
import { observableValue } from '../../../../base/common/observable.js';
9-
import { URI } from '../../../../base/common/uri.js';
10-
import { mock } from '../../../../base/test/common/mock.js';
11-
import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
12-
import { IFileService } from '../../../../platform/files/common/files.js';
13-
import { IListService, ListService } from '../../../../platform/list/browser/listService.js';
14-
import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
15-
import { ChatArtifactsWidget } from '../../../contrib/chat/browser/widget/chatArtifactsWidget.js';
16-
import { IChatImageCarouselService } from '../../../contrib/chat/browser/chatImageCarouselService.js';
17-
import { IChatArtifact, IChatArtifacts, IChatArtifactsService } from '../../../contrib/chat/common/tools/chatArtifactsService.js';
18-
import { ComponentFixtureContext, createEditorServices, defineComponentFixture, defineThemedFixtureGroup } from './fixtureUtils.js';
19-
20-
import '../../../contrib/chat/browser/widget/media/chat.css';
6+
import * as dom from '../../../../../base/browser/dom.js';
7+
import { Event } from '../../../../../base/common/event.js';
8+
import { observableValue } from '../../../../../base/common/observable.js';
9+
import { URI } from '../../../../../base/common/uri.js';
10+
import { mock } from '../../../../../base/test/common/mock.js';
11+
import { IFileDialogService } from '../../../../../platform/dialogs/common/dialogs.js';
12+
import { IFileService } from '../../../../../platform/files/common/files.js';
13+
import { IListService, ListService } from '../../../../../platform/list/browser/listService.js';
14+
import { IContextViewService } from '../../../../../platform/contextview/browser/contextView.js';
15+
import { ChatArtifactsWidget } from '../../../../contrib/chat/browser/widget/chatArtifactsWidget.js';
16+
import { IChatImageCarouselService } from '../../../../contrib/chat/browser/chatImageCarouselService.js';
17+
import { IChatArtifact, IChatArtifacts, IChatArtifactsService } from '../../../../contrib/chat/common/tools/chatArtifactsService.js';
18+
import { ComponentFixtureContext, createEditorServices, defineComponentFixture, defineThemedFixtureGroup } from '../fixtureUtils.js';
19+
20+
import '../../../../contrib/chat/browser/widget/media/chat.css';
2121

2222
function createMockArtifacts(artifacts: IChatArtifact[]): IChatArtifacts {
2323
const obs = observableValue<readonly IChatArtifact[]>('artifacts', artifacts);

src/vs/workbench/test/browser/componentFixtures/chatInput.fixture.ts renamed to src/vs/workbench/test/browser/componentFixtures/chat/chatInput.fixture.ts

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,58 +3,58 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { Emitter, Event } from '../../../../base/common/event.js';
7-
import { observableValue } from '../../../../base/common/observable.js';
8-
import { URI } from '../../../../base/common/uri.js';
9-
import { mock } from '../../../../base/test/common/mock.js';
10-
import { Codicon } from '../../../../base/common/codicons.js';
11-
import { IMenuService, IMenu, MenuId, MenuItemAction, IMenuItem } from '../../../../platform/actions/common/actions.js';
12-
import { ICommandService } from '../../../../platform/commands/common/commands.js';
13-
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
14-
import { TestConfigurationService } from '../../../../platform/configuration/test/common/testConfigurationService.js';
15-
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
16-
import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
17-
import { IFileService } from '../../../../platform/files/common/files.js';
18-
import { ISharedWebContentExtractorService } from '../../../../platform/webContentExtractor/common/webContentExtractor.js';
19-
import { IDecorationsService } from '../../../services/decorations/common/decorations.js';
20-
import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
21-
import { IExtensionService } from '../../../services/extensions/common/extensions.js';
22-
import { IPathService } from '../../../services/path/common/pathService.js';
23-
import { IChatWidgetHistoryService } from '../../../contrib/chat/common/widget/chatWidgetHistoryService.js';
24-
import { IChatContextPickService } from '../../../contrib/chat/browser/attachments/chatContextPickService.js';
25-
import { IWorkspaceContextService, IWorkspace } from '../../../../platform/workspace/common/workspace.js';
26-
import { IViewDescriptorService } from '../../../common/views.js';
27-
import { IChatWidget } from '../../../contrib/chat/browser/chat.js';
28-
import { IAgentSessionsService } from '../../../contrib/chat/browser/agentSessions/agentSessionsService.js';
29-
import { IChatAttachmentResolveService } from '../../../contrib/chat/browser/attachments/chatAttachmentResolveService.js';
30-
import { IChatAttachmentWidgetRegistry } from '../../../contrib/chat/browser/attachments/chatAttachmentWidgetRegistry.js';
31-
import { IChatContextService } from '../../../contrib/chat/browser/contextContrib/chatContextService.js';
32-
import { ChatInputPart, IChatInputPartOptions, IChatInputStyles } from '../../../contrib/chat/browser/widget/input/chatInputPart.js';
33-
import { IChatArtifacts, IChatArtifactsService } from '../../../contrib/chat/common/tools/chatArtifactsService.js';
34-
import { ChatEditingSessionState, IChatEditingSession, IModifiedFileEntry, ModifiedFileEntryState } from '../../../contrib/chat/common/editing/chatEditingService.js';
35-
import { IChatRequestDisablement } from '../../../contrib/chat/common/model/chatModel.js';
36-
import { IChatTodo, IChatTodoListService } from '../../../contrib/chat/common/tools/chatTodoListService.js';
37-
import { ChatAgentLocation, ChatConfiguration } from '../../../contrib/chat/common/constants.js';
38-
import { IChatEntitlementService } from '../../../services/chat/common/chatEntitlementService.js';
39-
import { IChatModeService } from '../../../contrib/chat/common/chatModes.js';
40-
import { IChatService } from '../../../contrib/chat/common/chatService/chatService.js';
41-
import { IChatSessionsService } from '../../../contrib/chat/common/chatSessionsService.js';
42-
import { ILanguageModelsService } from '../../../contrib/chat/common/languageModels.js';
43-
import { IChatAgentService } from '../../../contrib/chat/common/participants/chatAgents.js';
44-
import { ILanguageModelToolsService } from '../../../contrib/chat/common/tools/languageModelToolsService.js';
45-
import { IWorkbenchAssignmentService } from '../../../services/assignment/common/assignmentService.js';
46-
import { IEditorService } from '../../../services/editor/common/editorService.js';
47-
import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
48-
import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
49-
import { IProductService } from '../../../../platform/product/common/productService.js';
50-
import { IUpdateService, StateType } from '../../../../platform/update/common/update.js';
51-
import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
52-
import { IListService, ListService } from '../../../../platform/list/browser/listService.js';
53-
import { INotebookDocumentService } from '../../../services/notebook/common/notebookDocumentService.js';
54-
import { ISCMService } from '../../../contrib/scm/common/scm.js';
55-
import { ComponentFixtureContext, createEditorServices, defineComponentFixture, defineThemedFixtureGroup, registerWorkbenchServices } from './fixtureUtils.js';
6+
import { Emitter, Event } from '../../../../../base/common/event.js';
7+
import { observableValue } from '../../../../../base/common/observable.js';
8+
import { URI } from '../../../../../base/common/uri.js';
9+
import { mock } from '../../../../../base/test/common/mock.js';
10+
import { Codicon } from '../../../../../base/common/codicons.js';
11+
import { IMenuService, IMenu, MenuId, MenuItemAction, IMenuItem } from '../../../../../platform/actions/common/actions.js';
12+
import { ICommandService } from '../../../../../platform/commands/common/commands.js';
13+
import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
14+
import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js';
15+
import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
16+
import { ITextModelService } from '../../../../../editor/common/services/resolverService.js';
17+
import { IFileService } from '../../../../../platform/files/common/files.js';
18+
import { ISharedWebContentExtractorService } from '../../../../../platform/webContentExtractor/common/webContentExtractor.js';
19+
import { IDecorationsService } from '../../../../services/decorations/common/decorations.js';
20+
import { ITextFileService } from '../../../../services/textfile/common/textfiles.js';
21+
import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
22+
import { IPathService } from '../../../../services/path/common/pathService.js';
23+
import { IChatWidgetHistoryService } from '../../../../contrib/chat/common/widget/chatWidgetHistoryService.js';
24+
import { IChatContextPickService } from '../../../../contrib/chat/browser/attachments/chatContextPickService.js';
25+
import { IWorkspaceContextService, IWorkspace } from '../../../../../platform/workspace/common/workspace.js';
26+
import { IViewDescriptorService } from '../../../../common/views.js';
27+
import { IChatWidget } from '../../../../contrib/chat/browser/chat.js';
28+
import { IAgentSessionsService } from '../../../../contrib/chat/browser/agentSessions/agentSessionsService.js';
29+
import { IChatAttachmentResolveService } from '../../../../contrib/chat/browser/attachments/chatAttachmentResolveService.js';
30+
import { IChatAttachmentWidgetRegistry } from '../../../../contrib/chat/browser/attachments/chatAttachmentWidgetRegistry.js';
31+
import { IChatContextService } from '../../../../contrib/chat/browser/contextContrib/chatContextService.js';
32+
import { ChatInputPart, IChatInputPartOptions, IChatInputStyles } from '../../../../contrib/chat/browser/widget/input/chatInputPart.js';
33+
import { IChatArtifacts, IChatArtifactsService } from '../../../../contrib/chat/common/tools/chatArtifactsService.js';
34+
import { ChatEditingSessionState, IChatEditingSession, IModifiedFileEntry, ModifiedFileEntryState } from '../../../../contrib/chat/common/editing/chatEditingService.js';
35+
import { IChatRequestDisablement } from '../../../../contrib/chat/common/model/chatModel.js';
36+
import { IChatTodo, IChatTodoListService } from '../../../../contrib/chat/common/tools/chatTodoListService.js';
37+
import { ChatAgentLocation, ChatConfiguration } from '../../../../contrib/chat/common/constants.js';
38+
import { IChatEntitlementService } from '../../../../services/chat/common/chatEntitlementService.js';
39+
import { IChatModeService } from '../../../../contrib/chat/common/chatModes.js';
40+
import { IChatService } from '../../../../contrib/chat/common/chatService/chatService.js';
41+
import { IChatSessionsService } from '../../../../contrib/chat/common/chatSessionsService.js';
42+
import { ILanguageModelsService } from '../../../../contrib/chat/common/languageModels.js';
43+
import { IChatAgentService } from '../../../../contrib/chat/common/participants/chatAgents.js';
44+
import { ILanguageModelToolsService } from '../../../../contrib/chat/common/tools/languageModelToolsService.js';
45+
import { IWorkbenchAssignmentService } from '../../../../services/assignment/common/assignmentService.js';
46+
import { IEditorService } from '../../../../services/editor/common/editorService.js';
47+
import { IWorkbenchLayoutService } from '../../../../services/layout/browser/layoutService.js';
48+
import { IActionWidgetService } from '../../../../../platform/actionWidget/browser/actionWidget.js';
49+
import { IProductService } from '../../../../../platform/product/common/productService.js';
50+
import { IUpdateService, StateType } from '../../../../../platform/update/common/update.js';
51+
import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
52+
import { IListService, ListService } from '../../../../../platform/list/browser/listService.js';
53+
import { INotebookDocumentService } from '../../../../services/notebook/common/notebookDocumentService.js';
54+
import { ISCMService } from '../../../../contrib/scm/common/scm.js';
55+
import { ComponentFixtureContext, createEditorServices, defineComponentFixture, defineThemedFixtureGroup, registerWorkbenchServices } from '../fixtureUtils.js';
5656

57-
import '../../../contrib/chat/browser/widget/media/chat.css';
57+
import '../../../../contrib/chat/browser/widget/media/chat.css';
5858

5959
class FixtureMenuService implements IMenuService {
6060
declare readonly _serviceBrand: undefined;

0 commit comments

Comments
 (0)