Skip to content

Commit 4b9761b

Browse files
AaaaashAaaaash
committed
chore: test cases
1 parent 09e7317 commit 4b9761b

8 files changed

Lines changed: 154 additions & 20 deletions

File tree

‎packages/debug/__tests__/browser/launch-preferences.test.ts‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import path from 'path';
33

44
import * as fs from 'fs-extra';
55

6+
import { WSChannelHandler } from '@opensumi/ide-connection/lib/browser/ws-channel-handler';
67
import {
78
AppConfig,
89
Disposable,
@@ -15,11 +16,15 @@ import {
1516
} from '@opensumi/ide-core-browser';
1617
import { DebugModule } from '@opensumi/ide-debug/lib/browser';
1718
import { DebugContribution } from '@opensumi/ide-debug/lib/browser/debug-contribution';
19+
import { createBrowserInjector } from '@opensumi/ide-dev-tool/src/injector-helper';
20+
import { MockInjector } from '@opensumi/ide-dev-tool/src/mock-injector';
1821
import { EditorCollectionService } from '@opensumi/ide-editor/lib/browser';
1922
import { IDiskFileProvider, IFileServiceClient } from '@opensumi/ide-file-service';
2023
import { FileServiceClientModule } from '@opensumi/ide-file-service/lib/browser';
2124
import { FileServiceContribution } from '@opensumi/ide-file-service/lib/browser/file-service-contribution';
2225
import { DiskFileSystemProvider } from '@opensumi/ide-file-service/lib/node/disk-file-system.provider';
26+
import { WatcherProcessManagerToken } from '@opensumi/ide-file-service/lib/node/watcher-process-manager';
27+
import { MockContextKeyService } from '@opensumi/ide-monaco/__mocks__/monaco.context-key.service';
2328
import { IMessageService } from '@opensumi/ide-overlay';
2429
import { IUserStorageService } from '@opensumi/ide-preferences';
2530
import { PreferencesModule } from '@opensumi/ide-preferences/lib/browser';
@@ -28,10 +33,6 @@ import { IWorkspaceService } from '@opensumi/ide-workspace';
2833
import { WorkspacePreferences } from '@opensumi/ide-workspace/lib/browser/workspace-preferences';
2934
import { WorkspaceService } from '@opensumi/ide-workspace/lib/browser/workspace-service';
3035

31-
import { createBrowserInjector } from '../../../../tools/dev-tool/src/injector-helper';
32-
import { MockInjector } from '../../../../tools/dev-tool/src/mock-injector';
33-
import { MockContextKeyService } from '../../../monaco/__mocks__/monaco.context-key.service';
34-
3536
/**
3637
* launch配置项需要与VSCode中的配置项对齐
3738
* 见 https://github.com/akosyakov/vscode-launch/blob/master/src/test/extension.test.ts
@@ -442,6 +443,21 @@ describe('Launch Preferences', () => {
442443
onPreferenceChanged: () => {},
443444
},
444445
},
446+
{
447+
token: WSChannelHandler,
448+
useValue: {
449+
clientId: 'test_client_id',
450+
},
451+
},
452+
{
453+
token: WatcherProcessManagerToken,
454+
useValue: {
455+
setClient: () => void 0,
456+
watch: (() => 1) as any,
457+
unWatch: () => void 0,
458+
createProcess: () => void 0,
459+
},
460+
},
445461
{
446462
token: IWorkspaceService,
447463
useValue: {

‎packages/extension-storage/__tests__/browser/storage.test.ts‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ import path from 'path';
33
import * as fs from 'fs-extra';
44
import temp from 'temp';
55

6+
import { WSChannelHandler } from '@opensumi/ide-connection/lib/browser';
67
import { AppConfig } from '@opensumi/ide-core-browser';
78
import { FileUri, IFileServiceClient, ILoggerManagerClient, StoragePaths, URI } from '@opensumi/ide-core-common';
89
import { IHashCalculateService } from '@opensumi/ide-core-common/lib/hash-calculate/hash-calculate';
10+
import { createBrowserInjector } from '@opensumi/ide-dev-tool/src/injector-helper';
11+
import { MockInjector } from '@opensumi/ide-dev-tool/src/mock-injector';
912
import { IExtensionStoragePathServer, IExtensionStorageServer } from '@opensumi/ide-extension-storage';
1013
import { FileStat, IDiskFileProvider } from '@opensumi/ide-file-service';
1114
import { FileServiceClient } from '@opensumi/ide-file-service/lib/browser/file-service-client';
1215
import { DiskFileSystemProvider } from '@opensumi/ide-file-service/lib/node/disk-file-system.provider';
16+
import { WatcherProcessManagerToken } from '@opensumi/ide-file-service/lib/node/watcher-process-manager';
1317

14-
import { createBrowserInjector } from '../../../../tools/dev-tool/src/injector-helper';
15-
import { MockInjector } from '../../../../tools/dev-tool/src/mock-injector';
1618
import { ExtensionStorageModule } from '../../src/browser';
1719

1820
process.on('unhandledRejection', (reason) => {
@@ -41,6 +43,22 @@ describe('Extension Storage Server -- Setup directory should be worked', () => {
4143
token: IDiskFileProvider,
4244
useClass: DiskFileSystemProvider,
4345
},
46+
{
47+
token: WSChannelHandler,
48+
useValue: {
49+
clientId: 'test_client_id',
50+
},
51+
},
52+
{
53+
token: WatcherProcessManagerToken,
54+
useValue: {
55+
setClient: () => void 0,
56+
watch: (() => 1) as any,
57+
unWatch: () => void 0,
58+
createProcess: () => void 0,
59+
setWatcherFileExcludes: () => void 0,
60+
},
61+
},
4462
);
4563
const hashImpl = injector.get(IHashCalculateService) as IHashCalculateService;
4664
await hashImpl.initialize();
@@ -106,6 +124,22 @@ describe('Extension Storage Server -- Data operation should be worked', () => {
106124
token: IDiskFileProvider,
107125
useClass: DiskFileSystemProvider,
108126
},
127+
{
128+
token: WSChannelHandler,
129+
useValue: {
130+
clientId: 'test_client_id',
131+
},
132+
},
133+
{
134+
token: WatcherProcessManagerToken,
135+
useValue: {
136+
setClient: () => void 0,
137+
watch: (() => 1) as any,
138+
unWatch: () => void 0,
139+
createProcess: () => void 0,
140+
setWatcherFileExcludes: () => void 0,
141+
},
142+
},
109143
);
110144

111145
const fileServiceClient: FileServiceClient = injector.get(IFileServiceClient);

‎packages/extension/__tests__/browser/main.thread.workspace.test.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ import {
8484
import { IFileServiceClient } from '@opensumi/ide-file-service/lib/common';
8585
import { FileService, FileSystemNodeOptions } from '@opensumi/ide-file-service/lib/node';
8686
import { DiskFileSystemProvider } from '@opensumi/ide-file-service/lib/node/disk-file-system.provider';
87+
import { WatcherProcessManagerToken } from '@opensumi/ide-file-service/lib/node/watcher-process-manager';
8788
import { MonacoService } from '@opensumi/ide-monaco';
8889
import MonacoServiceImpl from '@opensumi/ide-monaco/lib/browser/monaco.service';
8990
import { IWebviewService } from '@opensumi/ide-webview';
@@ -241,6 +242,14 @@ describe('MainThreadWorkspace API Test Suite', () => {
241242
clientId: 'CODE_WINDOW_CLIENT_ID:1',
242243
},
243244
},
245+
{
246+
token: WatcherProcessManagerToken,
247+
useValue: {
248+
setClient: () => void 0,
249+
watch: (() => 1) as any,
250+
unWatch: () => void 0,
251+
},
252+
},
244253
);
245254

246255
injectMockPreferences(injector);

‎packages/file-service/__tests__/browser/file-service-client.test.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import fs from 'fs-extra';
22
import temp from 'temp';
33

4+
import { WSChannelHandler } from '@opensumi/ide-connection/lib/browser';
45
import { DisposableCollection, FileUri, UTF8 } from '@opensumi/ide-core-common';
56
import { createBrowserInjector } from '@opensumi/ide-dev-tool/src/injector-helper';
67
import { FileService } from '@opensumi/ide-file-service/lib/node';
78
import { DiskFileSystemProvider } from '@opensumi/ide-file-service/lib/node/disk-file-system.provider';
9+
import { WatcherProcessManagerToken } from '@opensumi/ide-file-service/lib/node/watcher-process-manager';
810

911
import { FileServicePath, IDiskFileProvider, IFileServiceClient } from '../../src';
1012
import { FileServiceClientModule } from '../../src/browser';
@@ -28,6 +30,22 @@ describe('FileServiceClient should be work', () => {
2830
token: IDiskFileProvider,
2931
useClass: DiskFileSystemProvider,
3032
},
33+
{
34+
token: WSChannelHandler,
35+
useValue: {
36+
clientId: 'test_client_id',
37+
},
38+
},
39+
{
40+
token: WatcherProcessManagerToken,
41+
useValue: {
42+
setClient: () => void 0,
43+
watch: (() => 1) as any,
44+
unWatch: () => void 0,
45+
createProcess: () => void 0,
46+
setWatcherFileExcludes: () => void 0,
47+
},
48+
},
3149
);
3250

3351
beforeAll(() => {

‎packages/file-tree-next/__tests__/browser/file-tree.test.ts‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@ import temp from 'temp';
55

66
import { TreeNodeEvent, TreeNodeType } from '@opensumi/ide-components';
77
import {
8+
AppConfig,
89
CorePreferences,
910
EDITOR_COMMANDS,
1011
Emitter,
1112
IContextKeyService,
13+
ILogger,
1214
PreferenceService,
1315
} from '@opensumi/ide-core-browser';
14-
import { ILogger } from '@opensumi/ide-core-browser';
15-
import { AppConfig } from '@opensumi/ide-core-browser';
1616
import { MockContextKeyService } from '@opensumi/ide-core-browser/__mocks__/context-key';
1717
import { MockedStorageProvider } from '@opensumi/ide-core-browser/__mocks__/storage';
1818
import {
19-
CommandRegistry,
2019
Deferred,
2120
Disposable,
2221
FileUri,
@@ -28,11 +27,14 @@ import {
2827
} from '@opensumi/ide-core-common';
2928
import { IDecorationsService } from '@opensumi/ide-decoration';
3029
import { FileDecorationsService } from '@opensumi/ide-decoration/lib/browser/decorationsService';
30+
import { createBrowserInjector } from '@opensumi/ide-dev-tool/src/injector-helper';
31+
import { MockInjector } from '@opensumi/ide-dev-tool/src/mock-injector';
3132
import { WorkbenchEditorService } from '@opensumi/ide-editor';
3233
import { FileServicePath, FileStat, IDiskFileProvider, IFileServiceClient } from '@opensumi/ide-file-service';
3334
import { FileServiceClient } from '@opensumi/ide-file-service/lib/browser/file-service-client';
3435
import { FileService, FileSystemNodeOptions } from '@opensumi/ide-file-service/lib/node';
3536
import { DiskFileSystemProvider } from '@opensumi/ide-file-service/lib/node/disk-file-system.provider';
37+
import { WatcherProcessManagerToken } from '@opensumi/ide-file-service/lib/node/watcher-process-manager';
3638
import { FileContextKey } from '@opensumi/ide-file-tree-next/lib/browser/file-contextkey';
3739
import { IMainLayoutService } from '@opensumi/ide-main-layout';
3840
import { RETRACT_BOTTOM_PANEL } from '@opensumi/ide-main-layout/lib/browser/main-layout.contribution';
@@ -41,10 +43,7 @@ import { IThemeService } from '@opensumi/ide-theme';
4143
import { IWorkspaceService } from '@opensumi/ide-workspace';
4244
import { MockWorkspaceService } from '@opensumi/ide-workspace/lib/common/mocks';
4345

44-
import { createBrowserInjector } from '../../../../tools/dev-tool/src/injector-helper';
45-
import { MockInjector } from '../../../../tools/dev-tool/src/mock-injector';
46-
import { FileTreeNextModule } from '../../src';
47-
import { PasteTypes } from '../../src';
46+
import { FileTreeNextModule, PasteTypes } from '../../src';
4847
import { FileTreeContribution } from '../../src/browser/file-tree-contribution';
4948
import styles from '../../src/browser/file-tree-node.module.less';
5049
import { FileTreeService } from '../../src/browser/file-tree.service';
@@ -210,6 +209,14 @@ describe('FileTree should be work while on single workspace model', () => {
210209
useValue: mockMainLayoutService,
211210
},
212211
);
212+
injector.addProviders({
213+
token: WatcherProcessManagerToken,
214+
useValue: {
215+
setClient: () => void 0,
216+
watch: (() => 1) as any,
217+
unWatch: () => void 0,
218+
},
219+
});
213220
const fileServiceClient: FileServiceClient = injector.get(IFileServiceClient);
214221
fileServiceClient.registerProvider('file', injector.get(IDiskFileProvider));
215222

@@ -317,7 +324,7 @@ describe('FileTree should be work while on single workspace model', () => {
317324
it('Style decoration should be right while click the item', async () => {
318325
const { handleItemClick, decorations } = fileTreeModelService;
319326

320-
let retracted = jest.fn();
327+
const retracted = jest.fn();
321328
injector.mockCommand(RETRACT_BOTTOM_PANEL.id, () => {
322329
mockMainLayoutService.bottomExpanded = false;
323330
retracted();

‎packages/keymaps/__tests__/browser/keymaps.service.test.ts‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import path from 'path';
44
import * as fs from 'fs-extra';
55

66
import { Injectable, Provider } from '@opensumi/di';
7+
import { WSChannelHandler } from '@opensumi/ide-connection/lib/browser';
78
import {
89
AppConfig,
910
BrowserModule,
@@ -19,18 +20,18 @@ import {
1920
} from '@opensumi/ide-core-browser';
2021
import { MockProgressService } from '@opensumi/ide-core-browser/__mocks__/progress-service';
2122
import { IProgressService } from '@opensumi/ide-core-browser/lib/progress';
23+
import { createBrowserInjector } from '@opensumi/ide-dev-tool/src/injector-helper';
24+
import { MockInjector } from '@opensumi/ide-dev-tool/src/mock-injector';
2225
import { IDiskFileProvider, IFileServiceClient } from '@opensumi/ide-file-service';
2326
import { FileServiceClientModule } from '@opensumi/ide-file-service/lib/browser';
2427
import { FileServiceContribution } from '@opensumi/ide-file-service/lib/browser/file-service-contribution';
2528
import { DiskFileSystemProvider } from '@opensumi/ide-file-service/lib/node/disk-file-system.provider';
29+
import { WatcherProcessManagerToken } from '@opensumi/ide-file-service/lib/node/watcher-process-manager';
2630
import { KeymapsModule } from '@opensumi/ide-keymaps/lib/browser';
2731
import { KeymapService } from '@opensumi/ide-keymaps/lib/browser/keymaps.service';
2832
import { IUserStorageService } from '@opensumi/ide-preferences';
2933
import { UserStorageContribution, UserStorageServiceImpl } from '@opensumi/ide-preferences/lib/browser/userstorage';
3034

31-
import { createBrowserInjector } from '../../../../tools/dev-tool/src/injector-helper';
32-
import { MockInjector } from '../../../../tools/dev-tool/src/mock-injector';
33-
3435
@Injectable()
3536
export class AddonModule extends BrowserModule {
3637
providers: Provider[] = [UserStorageContribution];
@@ -103,6 +104,21 @@ describe('KeymapsService should be work', () => {
103104
token: IProgressService,
104105
useClass: MockProgressService,
105106
},
107+
{
108+
token: WSChannelHandler,
109+
useValue: {
110+
clientId: 'test_client_id',
111+
},
112+
},
113+
{
114+
token: WatcherProcessManagerToken,
115+
useValue: {
116+
setClient: () => void 0,
117+
watch: (() => 1) as any,
118+
unWatch: () => void 0,
119+
createProcess: () => void 0,
120+
},
121+
},
106122
{
107123
token: AppConfig,
108124
useValue: {

‎packages/preferences/__tests__/browser/preference-service.test.ts‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import path from 'path';
44
import * as fs from 'fs-extra';
55

66
import { Injectable, Provider } from '@opensumi/di';
7+
import { WSChannelHandler } from '@opensumi/ide-connection/lib/browser/ws-channel-handler';
78
import {
89
BrowserModule,
910
Domain,
@@ -26,17 +27,17 @@ import {
2627
isObject,
2728
isString,
2829
} from '@opensumi/ide-core-browser';
30+
import { createBrowserInjector } from '@opensumi/ide-dev-tool/src/injector-helper';
31+
import { MockInjector } from '@opensumi/ide-dev-tool/src/mock-injector';
2932
import { IDiskFileProvider, IFileServiceClient } from '@opensumi/ide-file-service';
3033
import { FileServiceClientModule } from '@opensumi/ide-file-service/lib/browser';
3134
import { FileServiceContribution } from '@opensumi/ide-file-service/lib/browser/file-service-contribution';
3235
import { DiskFileSystemProvider } from '@opensumi/ide-file-service/lib/node/disk-file-system.provider';
36+
import { WatcherProcessManagerToken } from '@opensumi/ide-file-service/lib/node/watcher-process-manager';
3337
import { PreferencesModule } from '@opensumi/ide-preferences/lib/browser';
3438
import { UserStorageContribution } from '@opensumi/ide-preferences/lib/browser/userstorage';
3539
import { IWorkspaceService } from '@opensumi/ide-workspace';
3640

37-
import { createBrowserInjector } from '../../../../tools/dev-tool/src/injector-helper';
38-
import { MockInjector } from '../../../../tools/dev-tool/src/mock-injector';
39-
4041
@Injectable()
4142
export class AddonModule extends BrowserModule {
4243
providers: Provider[] = [EditorPreferenceContribution, UserStorageContribution];
@@ -200,6 +201,21 @@ describe('PreferenceService should be work', () => {
200201
token: PreferenceService,
201202
useClass: PreferenceServiceImpl,
202203
},
204+
{
205+
token: WSChannelHandler,
206+
useValue: {
207+
clientId: 'test_client_id',
208+
},
209+
},
210+
{
211+
token: WatcherProcessManagerToken,
212+
useValue: {
213+
setClient: () => void 0,
214+
watch: (() => 1) as any,
215+
unWatch: () => void 0,
216+
createProcess: () => void 0,
217+
},
218+
},
203219
);
204220

205221
// PreferenceService 的初始化时机要更早

‎packages/storage/__tests__/browser/index.test.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ import * as fs from 'fs-extra';
44
import temp from 'temp';
55

66
import { Injectable, Injector } from '@opensumi/di';
7+
import { WSChannelHandler } from '@opensumi/ide-connection/lib/browser';
78
import { AppConfig, Disposable, FileUri, STORAGE_SCHEMA, URI } from '@opensumi/ide-core-browser';
89
import { createBrowserInjector } from '@opensumi/ide-dev-tool/src/injector-helper';
910
import { IDiskFileProvider, IFileServiceClient } from '@opensumi/ide-file-service';
1011
import { FileServiceClient } from '@opensumi/ide-file-service/lib/browser/file-service-client';
1112
import { DiskFileSystemProvider } from '@opensumi/ide-file-service/lib/node/disk-file-system.provider';
13+
import { WatcherProcessManagerToken } from '@opensumi/ide-file-service/lib/node/watcher-process-manager';
1214
import { Storage } from '@opensumi/ide-storage/lib/browser/storage';
1315
import { DatabaseStorageContribution } from '@opensumi/ide-storage/lib/browser/storage.contribution';
1416
import { IWorkspaceService } from '@opensumi/ide-workspace';
@@ -81,6 +83,22 @@ describe('WorkspaceStorage should be work', () => {
8183
token: IWorkspaceService,
8284
useValue: MockWorkspaceService,
8385
},
86+
{
87+
token: WSChannelHandler,
88+
useValue: {
89+
clientId: 'test_client_id',
90+
},
91+
},
92+
{
93+
token: WatcherProcessManagerToken,
94+
useValue: {
95+
setClient: () => void 0,
96+
watch: (() => 1) as any,
97+
unWatch: () => void 0,
98+
createProcess: () => void 0,
99+
setWatcherFileExcludes: () => void 0,
100+
},
101+
},
84102
);
85103
const fileServiceClient: FileServiceClient = injector.get(IFileServiceClient);
86104
fileServiceClient.registerProvider('file', injector.get(IDiskFileProvider));

0 commit comments

Comments
 (0)