Skip to content

Commit 06b7116

Browse files
dibarbetdibarbet
authored
Merge pull request #6271 from dibarbet/jest_test_test
Add unit test integration tests + cleanup test running
2 parents 1a624d3 + f584cc3 commit 06b7116

File tree

159 files changed

+1028
-811
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+1028
-811
lines changed

‎.vscode/launch.json

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,34 @@
1515
],
1616
"preLaunchTask": "buildDev"
1717
},
18+
{
19+
"name": "Launch Current File slnWithCsproj Integration Tests",
20+
"type": "extensionHost",
21+
"request": "launch",
22+
"runtimeExecutable": "${execPath}",
23+
"args": [
24+
// Create a temp profile that has no extensions / user settings.
25+
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
26+
"--profile-temp",
27+
"${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace",
28+
"--extensionDevelopmentPath=${workspaceRoot}",
29+
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests",
30+
],
31+
"env": {
32+
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
33+
"TEST_FILE_FILTER": "${file}"
34+
},
35+
"sourceMaps": true,
36+
"outFiles": [
37+
"${workspaceRoot}/dist/*.js",
38+
"${workspaceRoot}/out/test/**/*.js"
39+
],
40+
"resolveSourceMapLocations": [
41+
"${workspaceFolder}/**",
42+
"!**/node_modules/**"
43+
],
44+
"preLaunchTask": "buildDev"
45+
},
1846
{
1947
"type": "node",
2048
"request": "launch",
@@ -66,7 +94,7 @@
6694
// Create a temp profile that has no extensions / user settings.
6795
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
6896
"--profile-temp",
69-
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj",
97+
"${workspaceRoot}/test/integrationTests/testAssets/singleCsproj/.vscode/omnisharp_singleCsproj.code-workspace",
7098
"--extensionDevelopmentPath=${workspaceRoot}",
7199
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
72100
],
@@ -90,7 +118,7 @@
90118
// Create a temp profile that has no extensions / user settings.
91119
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
92120
"--profile-temp",
93-
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1",
121+
"${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
94122
"--extensionDevelopmentPath=${workspaceRoot}",
95123
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
96124
],
@@ -108,7 +136,7 @@
108136
// Create a temp profile that has no extensions / user settings.
109137
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
110138
"--profile-temp",
111-
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_slnWithCsproj.code-workspace",
139+
"${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_slnWithCsproj.code-workspace",
112140
"--extensionDevelopmentPath=${workspaceRoot}",
113141
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
114142
],
@@ -123,29 +151,6 @@
123151
],
124152
"preLaunchTask": "buildDev"
125153
},
126-
{
127-
"name": "LSP Tools Host: Launch slnWithCsproj Workspace Tests",
128-
"type": "extensionHost",
129-
"request": "launch",
130-
"runtimeExecutable": "${execPath}",
131-
"args": [
132-
// Create a temp profile that has no extensions / user settings.
133-
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
134-
"--profile-temp",
135-
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace",
136-
"--extensionDevelopmentPath=${workspaceRoot}",
137-
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests",
138-
],
139-
"env": {
140-
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
141-
},
142-
"sourceMaps": true,
143-
"outFiles": [
144-
"${workspaceRoot}/dist/*.js",
145-
"${workspaceRoot}/out/test/**/*.js"
146-
],
147-
"preLaunchTask": "buildDev"
148-
},
149154
{
150155
"name": "Omnisharp: Launch singleCsproj Workspace Tests [LSP]",
151156
"type": "extensionHost",
@@ -155,7 +160,7 @@
155160
// Create a temp profile that has no extensions / user settings.
156161
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
157162
"--profile-temp",
158-
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace",
163+
"${workspaceRoot}/test/integrationTests/testAssets/singleCsproj/.vscode/omnisharp_lsp_singleCsproj.code-workspace",
159164
"--extensionDevelopmentPath=${workspaceRoot}",
160165
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
161166
],
@@ -179,7 +184,7 @@
179184
// Create a temp profile that has no extensions / user settings.
180185
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
181186
"--profile-temp",
182-
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1",
187+
"${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
183188
"--extensionDevelopmentPath=${workspaceRoot}",
184189
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
185190
],
@@ -197,7 +202,7 @@
197202
// Create a temp profile that has no extensions / user settings.
198203
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
199204
"--profile-temp",
200-
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace",
205+
"${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace",
201206
"--extensionDevelopmentPath=${workspaceRoot}",
202207
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
203208
],
@@ -221,7 +226,7 @@
221226
// Create a temp profile that has no extensions / user settings.
222227
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
223228
"--profile-temp",
224-
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj",
229+
"${workspaceRoot}/test/integrationTests/testAssets/slnFilterWithCsproj",
225230
"--extensionDevelopmentPath=${workspaceRoot}",
226231
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
227232
],
@@ -245,7 +250,7 @@
245250
// Create a temp profile that has no extensions / user settings.
246251
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
247252
"--profile-temp",
248-
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator",
253+
"${workspaceRoot}/test/integrationTests/testAssets/slnWithGenerator",
249254
"--extensionDevelopmentPath=${workspaceRoot}",
250255
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
251256
],

‎.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@
2020
"omnisharp.autoStart": false,
2121
"editor.formatOnSave": false,
2222
"eslint.lintTask.enable": true,
23-
"dotnet.defaultSolution": "disable"
23+
"dotnet.defaultSolution": "disable",
24+
"jest.autoRun": "off"
2425
}

‎omnisharptest/omnisharpIntegrationTests/advisor.integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
88
import { expect, should } from 'chai';
99
import * as path from 'path';
1010
import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
11-
import testAssetWorkspace from './testAssets/testAssetWorkspace';
11+
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
1212

1313
import { Advisor } from '../../src/features/diagnosticsProvider';
1414

‎omnisharptest/omnisharpIntegrationTests/codeActionRename.integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
77

88
import { should, expect } from 'chai';
99
import { activateCSharpExtension, isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
10-
import testAssetWorkspace from './testAssets/testAssetWorkspace';
10+
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
1111
import * as path from 'path';
1212
import { assertWithPoll } from './poll';
1313
import { isNotNull } from '../testUtil';

‎omnisharptest/omnisharpIntegrationTests/codeLensProvider.integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as path from 'path';
88

99
import { should, expect } from 'chai';
1010
import { activateCSharpExtension, isSlnWithCsproj, isSlnWithGenerator } from './integrationHelpers';
11-
import testAssetWorkspace from './testAssets/testAssetWorkspace';
11+
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
1212
import { isNotNull } from '../testUtil';
1313

1414
suite(`CodeLensProvider: ${testAssetWorkspace.description}`, function () {

‎omnisharptest/omnisharpIntegrationTests/completionProvider.integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import OmniSharpCompletionProvider from '../../src/features/completionProvider';
77
import * as vscode from 'vscode';
8-
import testAssetWorkspace from './testAssets/testAssetWorkspace';
8+
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
99
import * as path from 'path';
1010
import { use, expect, should } from 'chai';
1111
import * as chaiArray from 'chai-arrays';

‎omnisharptest/omnisharpIntegrationTests/definitionProvider.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import * as vscode from 'vscode';
77
import OmniSharpDefinitionProvider from '../../src/features/definitionProvider';
88
import * as path from 'path';
9-
import testAssetWorkspace from './testAssets/testAssetWorkspace';
9+
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
1010
import { expect, should } from 'chai';
1111
import {
1212
activateCSharpExtension,

‎omnisharptest/omnisharpIntegrationTests/diagnostics.integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
isSlnWithGenerator,
1414
restartOmniSharpServer,
1515
} from './integrationHelpers';
16-
import testAssetWorkspace from './testAssets/testAssetWorkspace';
16+
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
1717
import { poll, assertWithPoll, pollDoesNotHappen } from './poll';
1818
import { isNotNull } from '../testUtil';
1919

‎omnisharptest/omnisharpIntegrationTests/documentSymbolProvider.integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as path from 'path';
88

99
import { should, expect } from 'chai';
1010
import * as integrationHelpers from './integrationHelpers';
11-
import testAssetWorkspace from './testAssets/testAssetWorkspace';
11+
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
1212

1313
suite(`DocumentSymbolProvider: ${testAssetWorkspace.description}`, function () {
1414
let fileUri: vscode.Uri;

‎omnisharptest/omnisharpIntegrationTests/documentationCommentAutoFormatting.integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as chaiArray from 'chai-arrays';
88
import * as vscode from 'vscode';
99
import * as path from 'path';
1010
import { isRazorWorkspace, isSlnWithGenerator } from './integrationHelpers';
11-
import testAssetWorkspace from './testAssets/testAssetWorkspace';
11+
import testAssetWorkspace from './testAssets/activeTestAssetWorkspace';
1212

1313
use(chaiArray);
1414

0 commit comments

Comments
 (0)