Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert test changes

Browse Source
This commit is contained in:
Jackson Kearl
2021-01-25 17:52:12 -08:00
parent 684459c8dc
commit a331c2b515
1 changed files with 8 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/search/test/browser/queryBuilder.test.ts
+8 -99
View File
@@ -572,42 +572,15 @@ suite('QueryBuilder', () => {
].forEach(([includePattern, expectedPatterns]) => testSimpleIncludes(<string>includePattern, <string[]>expectedPatterns));
});
test('strict includes', () => {
function testSimpleIncludes(includePattern: string, expectedPatterns: string[]): void {
assert.deepEqual(
queryBuilder.parseSearchPaths(includePattern, true),
{
pattern: patternsToIExpression(...expectedPatterns)
},
includePattern);
}
[
['a', ['a']],
['a/b', ['a/b']],
['a/b, c', ['a/b', 'c']],
['a,.txt', ['a', '.txt']],
['a,,,b', ['a', 'b']],
['**/a,b/**', ['**/a', 'b/**']]
].forEach(([includePattern, expectedPatterns]) => testSimpleIncludes(<string>includePattern, <string[]>expectedPatterns));
});
function testIncludes(includePattern: string, expectedResultLoose: ISearchPathsInfo, expectedResultStrict?: ISearchPathsInfo): void {
function testIncludes(includePattern: string, expectedResult: ISearchPathsInfo): void {
assertEqualSearchPathResults(
queryBuilder.parseSearchPaths(includePattern),
expectedResultLoose,
expectedResult,
includePattern);
if (expectedResultStrict) {
assertEqualSearchPathResults(
queryBuilder.parseSearchPaths(includePattern, true),
expectedResultStrict,
includePattern);
}
}
function testIncludesDataItem([includePattern, expectedResultLoose, expectedResultStrict]: [string, ISearchPathsInfo, ISearchPathsInfo] | [string, ISearchPathsInfo]): void {
testIncludes(includePattern, expectedResultLoose, expectedResultStrict);
function testIncludesDataItem([includePattern, expectedResult]: [string, ISearchPathsInfo]): void {
testIncludes(includePattern, expectedResult);
}
test('absolute includes', () => {
@@ -680,7 +653,7 @@ suite('QueryBuilder', () => {
});
test('relative includes w/single root folder', () => {
const cases: ([string, ISearchPathsInfo] | [string, ISearchPathsInfo, ISearchPathsInfo])[] = [
const cases: [string, ISearchPathsInfo][] = [
[
'./a',
{
@@ -688,12 +661,6 @@ suite('QueryBuilder', () => {
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('a', 'a/**')
}]
},
{
searchPaths: [{
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('a')
}]
}
],
[
@@ -703,12 +670,6 @@ suite('QueryBuilder', () => {
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('a', 'a/**')
}]
},
{
searchPaths: [{
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('a')
}]
}
],
[
@@ -740,12 +701,6 @@ suite('QueryBuilder', () => {
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('a/b', 'a/b/**', 'c/d', 'c/d/**')
}]
},
{
searchPaths: [{
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('a/b', 'c/d',)
}]
}
],
[
@@ -781,14 +736,9 @@ suite('QueryBuilder', () => {
mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }, { path: getUri(ROOT_2).fsPath }], WS_CONFIG_PATH, extUriBiasedIgnorePathCase);
mockWorkspace.configuration = uri.file(fixPath('config'));
const cases: ([string, ISearchPathsInfo] | [string, ISearchPathsInfo, ISearchPathsInfo])[] = [
const cases: [string, ISearchPathsInfo][] = [
[
'./root1',
{
searchPaths: [{
searchPath: getUri(ROOT_1)
}]
},
{
searchPaths: [{
searchPath: getUri(ROOT_1)
@@ -801,36 +751,6 @@ suite('QueryBuilder', () => {
searchPaths: [{
searchPath: getUri(ROOT_2),
}]
},
{
searchPaths: [{
searchPath: getUri(ROOT_2),
}]
}
],
[
'./root1/a/b, ./root2/a.txt',
{
searchPaths: [
{
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('a/b', 'a/b/**')
},
{
searchPath: getUri(ROOT_2),
pattern: patternsToIExpression('a.txt', 'a.txt/**')
}]
},
{
searchPaths: [
{
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('a/b')
},
{
searchPath: getUri(ROOT_2),
pattern: patternsToIExpression('a.txt')
}]
}
],
[
@@ -857,7 +777,7 @@ suite('QueryBuilder', () => {
mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath, name: ROOT_1_FOLDERNAME }, { path: getUri(ROOT_2).fsPath }], WS_CONFIG_PATH, extUriBiasedIgnorePathCase);
mockWorkspace.configuration = uri.file(fixPath('config'));
const cases: ([string, ISearchPathsInfo] | [string, ISearchPathsInfo, ISearchPathsInfo])[] = [
const cases: [string, ISearchPathsInfo][] = [
[
'./foldername',
{
@@ -873,12 +793,6 @@ suite('QueryBuilder', () => {
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('foo', 'foo/**')
}]
},
{
searchPaths: [{
searchPath: ROOT_1_URI,
pattern: patternsToIExpression('foo', 'foo')
}]
}
]
];
@@ -891,7 +805,7 @@ suite('QueryBuilder', () => {
mockWorkspace.folders = toWorkspaceFolders([{ path: ROOT_1_URI.fsPath }, { path: getUri(ROOT_2).fsPath }, { path: getUri(ROOT_3).fsPath }], WS_CONFIG_PATH, extUriBiasedIgnorePathCase);
mockWorkspace.configuration = uri.file(fixPath('/config'));
const cases: ([string, ISearchPathsInfo] | [string, ISearchPathsInfo, ISearchPathsInfo])[] = [
const cases: [string, ISearchPathsInfo][] = [
[
'',
{
@@ -906,11 +820,6 @@ suite('QueryBuilder', () => {
],
[
'./root1',
{
searchPaths: [{
searchPath: getUri(ROOT_1)
}]
},
{
searchPaths: [{
searchPath: getUri(ROOT_1)