Skip to content

Commit b157974

Browse files
akhera99akhera99
authored
Integration Tests - Change directory name of omnisharp tests (#6146)
* rename progress * more updates * change lsptoolshosttest to test * fix ci * whoops * fix tslint
1 parent d59ad2d commit b157974

File tree

207 files changed

+609
-620
lines changed

Some content is hidden

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

207 files changed

+609
-620
lines changed

‎.vscode/launch.json‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,25 @@
1818
{
1919
"type": "node",
2020
"request": "launch",
21-
"name": "Launch Unit tests",
21+
"name": "Omnisharp: Launch Unit tests",
2222
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
2323
"args": [
2424
"-u",
2525
"tdd",
2626
"--timeout",
2727
"999999",
2828
"--colors",
29-
"${workspaceFolder}/out/test/unitTests/**/*.test.js"
29+
"${workspaceFolder}/out/omnisharptest/omnisharpUnitTests/**/*.test.js"
3030
],
3131
"sourceMaps": true,
3232
"internalConsoleOptions": "openOnSessionStart",
3333
"outFiles": [
34-
"${workspaceRoot}/out/test/**/*.js"
34+
"${workspaceRoot}/out/omnisharptest/**/*.js"
3535
],
3636
"preLaunchTask": "build"
3737
},
3838
{
39-
"name": "Launch Feature Tests",
39+
"name": "Omnisharp: Launch Feature Tests",
4040
"type": "extensionHost",
4141
"request": "launch",
4242
"runtimeExecutable": "${execPath}",
@@ -45,30 +45,30 @@
4545
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
4646
"--profile-temp",
4747
"--extensionDevelopmentPath=${workspaceRoot}",
48-
"--extensionTestsPath=${workspaceRoot}/out/test/featureTests"
48+
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpFeatureTests"
4949
],
5050
"env": {
5151
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
5252
"OSVC_SUITE": "featureTests",
5353
},
5454
"sourceMaps": true,
5555
"outFiles": [
56-
"${workspaceRoot}/out/test/**/*.js"
56+
"${workspaceRoot}/out/omnisharptest/**/*.js"
5757
],
5858
"preLaunchTask": "build"
5959
},
6060
{
61-
"name": "Launch singleCsproj Workspace Tests",
61+
"name": "Omnisharp: Launch singleCsproj Workspace Tests",
6262
"type": "extensionHost",
6363
"request": "launch",
6464
"runtimeExecutable": "${execPath}",
6565
"args": [
6666
// Create a temp profile that has no extensions / user settings.
6767
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
6868
"--profile-temp",
69-
"${workspaceRoot}/test/integrationTests/testAssets/singleCsproj",
69+
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/singleCsproj",
7070
"--extensionDevelopmentPath=${workspaceRoot}",
71-
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
71+
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
7272
],
7373
"env": {
7474
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
@@ -77,40 +77,40 @@
7777
"sourceMaps": true,
7878
"outFiles": [
7979
"${workspaceRoot}/dist/*.js",
80-
"${workspaceRoot}/out/test/**/*.js"
80+
"${workspaceRoot}/out/omnisharptest/**/*.js"
8181
],
8282
"preLaunchTask": "buildDev"
8383
},
8484
{
85-
"name": "Launch razorcsproj Workspace Tests",
85+
"name": "Omnisharp: Launch razorcsproj Workspace Tests",
8686
"type": "extensionHost",
8787
"request": "launch",
8888
"runtimeExecutable": "${execPath}",
8989
"args": [
9090
// Create a temp profile that has no extensions / user settings.
9191
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
9292
"--profile-temp",
93-
"${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
93+
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1",
9494
"--extensionDevelopmentPath=${workspaceRoot}",
95-
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
95+
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
9696
],
9797
"env": {
9898
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
9999
"OSVC_SUITE": "BasicRazorApp2_1",
100100
},
101101
},
102102
{
103-
"name": "Launch slnWithCsproj Workspace Tests",
103+
"name": "Omnisharp: Launch slnWithCsproj Workspace Tests",
104104
"type": "extensionHost",
105105
"request": "launch",
106106
"runtimeExecutable": "${execPath}",
107107
"args": [
108108
// Create a temp profile that has no extensions / user settings.
109109
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
110110
"--profile-temp",
111-
"${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_slnWithCsproj.code-workspace",
111+
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_slnWithCsproj.code-workspace",
112112
"--extensionDevelopmentPath=${workspaceRoot}",
113-
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
113+
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
114114
],
115115
"env": {
116116
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
@@ -119,7 +119,7 @@
119119
"sourceMaps": true,
120120
"outFiles": [
121121
"${workspaceRoot}/dist/*.js",
122-
"${workspaceRoot}/out/test/**/*.js"
122+
"${workspaceRoot}/out/omnisharptest/**/*.js"
123123
],
124124
"preLaunchTask": "buildDev"
125125
},
@@ -132,9 +132,9 @@
132132
// Create a temp profile that has no extensions / user settings.
133133
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
134134
"--profile-temp",
135-
"${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace",
135+
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/lsp_tools_host_slnWithCsproj.code-workspace",
136136
"--extensionDevelopmentPath=${workspaceRoot}",
137-
"--extensionTestsPath=${workspaceRoot}/out/lsptoolshosttest/lspToolsHostIntegrationTests",
137+
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests",
138138
],
139139
"env": {
140140
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
@@ -143,22 +143,22 @@
143143
"sourceMaps": true,
144144
"outFiles": [
145145
"${workspaceRoot}/dist/*.js",
146-
"${workspaceRoot}/out/bluetest/**/*.js"
146+
"${workspaceRoot}/out/test/**/*.js"
147147
],
148148
"preLaunchTask": "buildDev"
149149
},
150150
{
151-
"name": "Launch singleCsproj Workspace Tests [LSP]",
151+
"name": "Omnisharp: Launch singleCsproj Workspace Tests [LSP]",
152152
"type": "extensionHost",
153153
"request": "launch",
154154
"runtimeExecutable": "${execPath}",
155155
"args": [
156156
// Create a temp profile that has no extensions / user settings.
157157
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
158158
"--profile-temp",
159-
"${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace",
159+
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace",
160160
"--extensionDevelopmentPath=${workspaceRoot}",
161-
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
161+
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
162162
],
163163
"env": {
164164
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
@@ -167,40 +167,40 @@
167167
"sourceMaps": true,
168168
"outFiles": [
169169
"${workspaceRoot}/dist/*.js",
170-
"${workspaceRoot}/out/test/**/*.js"
170+
"${workspaceRoot}/out/omnisharptest/**/*.js"
171171
],
172172
"preLaunchTask": "buildDev"
173173
},
174174
{
175-
"name": "Launch razorcsproj Workspace Tests [LSP]",
175+
"name": "Omnisharp: Launch razorcsproj Workspace Tests [LSP]",
176176
"type": "extensionHost",
177177
"request": "launch",
178178
"runtimeExecutable": "${execPath}",
179179
"args": [
180180
// Create a temp profile that has no extensions / user settings.
181181
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
182182
"--profile-temp",
183-
"${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
183+
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/BasicRazorApp2_1",
184184
"--extensionDevelopmentPath=${workspaceRoot}",
185-
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
185+
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
186186
],
187187
"env": {
188188
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
189189
"OSVC_SUITE": "BasicRazorApp2_1",
190190
},
191191
},
192192
{
193-
"name": "Launch slnWithCsproj Workspace Tests [LSP]",
193+
"name": "Omnisharp: Launch slnWithCsproj Workspace Tests [LSP]",
194194
"type": "extensionHost",
195195
"request": "launch",
196196
"runtimeExecutable": "${execPath}",
197197
"args": [
198198
// Create a temp profile that has no extensions / user settings.
199199
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
200200
"--profile-temp",
201-
"${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace",
201+
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithCsproj/.vscode/omnisharp_lsp_slnWithCsproj.code-workspace",
202202
"--extensionDevelopmentPath=${workspaceRoot}",
203-
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
203+
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
204204
],
205205
"env": {
206206
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
@@ -209,22 +209,22 @@
209209
"sourceMaps": true,
210210
"outFiles": [
211211
"${workspaceRoot}/dist/*.js",
212-
"${workspaceRoot}/out/test/**/*.js"
212+
"${workspaceRoot}/out/omnisharptest/**/*.js"
213213
],
214214
"preLaunchTask": "buildDev"
215215
},
216216
{
217-
"name": "Launch slnFilterWithCsproj Workspace Tests",
217+
"name": "Omnisharp: Launch slnFilterWithCsproj Workspace Tests",
218218
"type": "extensionHost",
219219
"request": "launch",
220220
"runtimeExecutable": "${execPath}",
221221
"args": [
222222
// Create a temp profile that has no extensions / user settings.
223223
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
224224
"--profile-temp",
225-
"${workspaceRoot}/test/integrationTests/testAssets/slnFilterWithCsproj",
225+
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnFilterWithCsproj",
226226
"--extensionDevelopmentPath=${workspaceRoot}",
227-
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
227+
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
228228
],
229229
"env": {
230230
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
@@ -233,22 +233,22 @@
233233
"sourceMaps": true,
234234
"outFiles": [
235235
"${workspaceRoot}/dist/*.js",
236-
"${workspaceRoot}/out/test/**/*.js"
236+
"${workspaceRoot}/out/omnisharptest/**/*.js"
237237
],
238238
"preLaunchTask": "buildDev"
239239
},
240240
{
241-
"name": "Launch slnWithGenerator Workspace Tests",
241+
"name": "Omnisharp: Launch slnWithGenerator Workspace Tests",
242242
"type": "extensionHost",
243243
"request": "launch",
244244
"runtimeExecutable": "${execPath}",
245245
"args": [
246246
// Create a temp profile that has no extensions / user settings.
247247
// This allows us to only have the C# extension + the dotnet runtime installer extension dependency.
248248
"--profile-temp",
249-
"${workspaceRoot}/test/integrationTests/testAssets/slnWithGenerator",
249+
"${workspaceRoot}/omnisharptest/omnisharpIntegrationTests/testAssets/slnWithGenerator",
250250
"--extensionDevelopmentPath=${workspaceRoot}",
251-
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
251+
"--extensionTestsPath=${workspaceRoot}/out/omnisharptest/omnisharpIntegrationTests"
252252
],
253253
"env": {
254254
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
@@ -257,7 +257,7 @@
257257
"sourceMaps": true,
258258
"outFiles": [
259259
"${workspaceRoot}/dist/*.js",
260-
"${workspaceRoot}/out/test/**/*.js"
260+
"${workspaceRoot}/out/omnisharptest/**/*.js"
261261
],
262262
"preLaunchTask": "buildDev"
263263
},

‎azure-pipelines/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ steps:
2222
targetPath: '$(Build.SourcesDirectory)/vsix'
2323
artifactName: 'VSIXs - Attempt $(System.JobAttempt)'
2424

25-
- script: npm run test:artifacts
25+
- script: npm run omnisharptest:artifacts
2626
displayName: 'Run artifacts tests'

‎azure-pipelines/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ steps:
1515
Write-Host "Now running tests"
1616
}
1717
18-
npm run test
18+
npm run omnisharptest
1919
displayName: 🧪 Run unit and integration tests
2020

2121
- task: PublishPipelineArtifact@1

‎lsptoolshosttest/lspToolsHostIntegrationTests/lspToolsHostIntegrationHelpers.ts‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎test/artifactTests/vsix.test.ts‎ renamed to ‎omnisharptest/omnisharpArtifactTests/vsix.test.ts‎

File renamed without changes.

‎test/featureTests/assets.test.ts‎ renamed to ‎omnisharptest/omnisharpFeatureTests/assets.test.ts‎

File renamed without changes.

‎test/featureTests/index.ts‎ renamed to ‎omnisharptest/omnisharpFeatureTests/index.ts‎

File renamed without changes.

‎test/featureTests/processPicker.test.ts‎ renamed to ‎omnisharptest/omnisharpFeatureTests/processPicker.test.ts‎

File renamed without changes.

‎test/integrationTests/advisor.integration.test.ts‎ renamed to ‎omnisharptest/omnisharpIntegrationTests/advisor.integration.test.ts‎

File renamed without changes.

‎test/integrationTests/codeActionRename.integration.test.ts‎ renamed to ‎omnisharptest/omnisharpIntegrationTests/codeActionRename.integration.test.ts‎

File renamed without changes.

0 commit comments

Comments
 (0)