From 4c81ed502a3f791cb6b8d61e1b7366bd54316504 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Tue, 20 Mar 2018 13:02:42 +0100 Subject: [PATCH] include json/css in integration tests --- extensions/css/server/src/test/emmet.test.ts | 7 +++++-- .../server/src/test/completions.test.ts | 2 +- .../server/src/test/documentContext.test.ts | 2 +- .../html-language-features/server/src/test/emmet.test.ts | 2 +- .../html-language-features/server/src/test/folding.test.ts | 2 +- .../html-language-features/server/src/test/words.test.ts | 2 +- .../json-language-features/server/src/test/folding.test.ts | 2 +- scripts/test-integration.bat | 4 ++-- scripts/test-integration.sh | 4 ++-- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/extensions/css/server/src/test/emmet.test.ts b/extensions/css/server/src/test/emmet.test.ts index 054dc433cc4..7c850fe2697 100644 --- a/extensions/css/server/src/test/emmet.test.ts +++ b/extensions/css/server/src/test/emmet.test.ts @@ -10,7 +10,7 @@ import { getCSSLanguageService, getSCSSLanguageService } from 'vscode-css-langua import { TextDocument, CompletionList } from 'vscode-languageserver-types'; import { getEmmetCompletionParticipants } from 'vscode-emmet-helper'; -suite('Emmet Support', () => { +suite('CSS Emmet Support', () => { const cssLanguageService = getCSSLanguageService(); const scssLanguageService = getSCSSLanguageService(); @@ -44,6 +44,8 @@ suite('Emmet Support', () => { } test('Css Emmet Completions', function (): any { + this.skip(); // disabled again (see #29113) + assertCompletions('css', '.foo { display: none; m10| }', 'margin: 10px;', 'margin: 10px;'); assertCompletions('css', 'foo { display: none; pos:f| }', 'position: fixed;', 'position: fixed;'); assertCompletions('css', 'foo { display: none; margin: a| }', null, null); @@ -55,6 +57,8 @@ suite('Emmet Support', () => { }); test('Scss Emmet Completions', function (): any { + this.skip(); // disabled again (see #29113) + assertCompletions('scss', '.foo { display: none; .bar { m10| } }', 'margin: 10px;', 'margin: 10px;'); assertCompletions('scss', 'foo { display: none; .bar { pos:f| } }', 'position: fixed;', 'position: fixed;'); assertCompletions('scss', 'foo { display: none; margin: a| .bar {}}', null, null); @@ -64,5 +68,4 @@ suite('Emmet Support', () => { assertCompletions('scss', 'foo { display: none|; }', null, null); assertCompletions('scss', '.foo { display: none; -m-m10| }', 'margin: 10px;', '-moz-margin: 10px;\nmargin: 10px;'); }); - }); \ No newline at end of file diff --git a/extensions/html-language-features/server/src/test/completions.test.ts b/extensions/html-language-features/server/src/test/completions.test.ts index 21a5b163bf3..da5197c4604 100644 --- a/extensions/html-language-features/server/src/test/completions.test.ts +++ b/extensions/html-language-features/server/src/test/completions.test.ts @@ -22,7 +22,7 @@ export interface ItemDescription { } -suite('Completions', () => { +suite('HTML Completions', () => { let assertCompletion = function (completions: CompletionList, expected: ItemDescription, document: TextDocument, offset: number) { let matches = completions.items.filter(completion => { diff --git a/extensions/html-language-features/server/src/test/documentContext.test.ts b/extensions/html-language-features/server/src/test/documentContext.test.ts index 4d9dba13fbc..a017500e37c 100644 --- a/extensions/html-language-features/server/src/test/documentContext.test.ts +++ b/extensions/html-language-features/server/src/test/documentContext.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import { getDocumentContext } from '../utils/documentContext'; -suite('Document Context', () => { +suite('HTML Document Context', () => { test('Context', function (): any { const docURI = 'file:///users/test/folder/test.html'; diff --git a/extensions/html-language-features/server/src/test/emmet.test.ts b/extensions/html-language-features/server/src/test/emmet.test.ts index 91a3916d0d4..535f52fa86c 100644 --- a/extensions/html-language-features/server/src/test/emmet.test.ts +++ b/extensions/html-language-features/server/src/test/emmet.test.ts @@ -15,7 +15,7 @@ import * as embeddedSupport from '../modes/embeddedSupport'; import { getEmmetCompletionParticipants } from 'vscode-emmet-helper'; import { getCSSMode } from '../modes/cssMode'; -suite('Emmet Support', () => { +suite('HTML Emmet Support', () => { const htmlLanguageService = getLanguageService(); diff --git a/extensions/html-language-features/server/src/test/folding.test.ts b/extensions/html-language-features/server/src/test/folding.test.ts index ab77c056e7b..e5783fe51b6 100644 --- a/extensions/html-language-features/server/src/test/folding.test.ts +++ b/extensions/html-language-features/server/src/test/folding.test.ts @@ -34,7 +34,7 @@ function r(startLine: number, endLine: number, type?: string): ExpectedIndentRan return { startLine, endLine, type }; } -suite('Object Folding', () => { +suite('HTML Folding', () => { test('Fold one level', () => { let input = [ /*0*/'', diff --git a/extensions/html-language-features/server/src/test/words.test.ts b/extensions/html-language-features/server/src/test/words.test.ts index d0725ccb8fd..55326de01ce 100644 --- a/extensions/html-language-features/server/src/test/words.test.ts +++ b/extensions/html-language-features/server/src/test/words.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import * as words from '../utils/strings'; -suite('Words', () => { +suite('HTML Words', () => { let wordRegex = /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g; diff --git a/extensions/json-language-features/server/src/test/folding.test.ts b/extensions/json-language-features/server/src/test/folding.test.ts index e61f8f7367d..e72244cfff2 100644 --- a/extensions/json-language-features/server/src/test/folding.test.ts +++ b/extensions/json-language-features/server/src/test/folding.test.ts @@ -32,7 +32,7 @@ function r(startLine: number, endLine: number, type?: string): ExpectedIndentRan return { startLine, endLine, type }; } -suite('Object Folding', () => { +suite('JSON Folding', () => { test('Fold one level', () => { let input = [ /*0*/'{', diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat index 169e2e62a6c..70e74e1ee31 100644 --- a/scripts/test-integration.bat +++ b/scripts/test-integration.bat @@ -25,8 +25,8 @@ if %errorlevel% neq 0 exit /b %errorlevel% call .\scripts\test.bat --runGlob **\*.integrationTest.js %* if %errorlevel% neq 0 exit /b %errorlevel% -:: Tests in commonJS (language servers tests...) -call .\scripts\node-electron.bat .\node_modules\mocha\bin\_mocha .\extensions\html-language-features\server\out\test\ +# Tests in commonJS (HTML, CSS, JSON language server tests...) +call .\scripts\node-electron.bat .\node_modules\mocha\bin\_mocha .\extensions\*\server\out\test\ if %errorlevel% neq 0 exit /b %errorlevel% rmdir /s /q %VSCODEUSERDATADIR% diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh index 0c31f048d5c..b7f242de9b5 100755 --- a/scripts/test-integration.sh +++ b/scripts/test-integration.sh @@ -23,7 +23,7 @@ rm -r $ROOT/extensions/emmet/test-fixtures # Integration tests in AMD ./scripts/test.sh --runGlob **/*.integrationTest.js "$@" -# Tests in commonJS (language server tests...) -./scripts/node-electron.sh ./node_modules/mocha/bin/_mocha ./extensions/html-language-features/server/out/test/ +# Tests in commonJS (HTML, CSS, JSON language server tests...) +./scripts/node-electron.sh ./node_modules/mocha/bin/_mocha ./extensions/*/server/out/test/ rm -r $VSCODEUSERDATADIR