Fix test failures on Windows

src/vs/base/test/common/glob.test.ts

@@ -772,20 +772,20 @@ suite('Glob', () => {
 	});
 
 	test('expression/pattern path', function () {
-		assert.strictEqual(glob.parse('**/foo/bar')('foo/baz', 'baz'), false);
-		assert.strictEqual(glob.parse('**/foo/bar')('foo/bar', 'bar'), true);
-		assert.strictEqual(glob.parse('**/foo/bar')('bar/foo/bar', 'bar'), true);
-		assert.strictEqual(glob.parse('**/foo/bar/**')('bar/foo/bar', 'bar'), true);
-		assert.strictEqual(glob.parse('**/foo/bar/**')('bar/foo/bar/baz', 'baz'), true);
-		assert.strictEqual(glob.parse('**/foo/bar/**', { trimForExclusions: true })('bar/foo/bar', 'bar'), true);
-		assert.strictEqual(glob.parse('**/foo/bar/**', { trimForExclusions: true })('bar/foo/bar/baz', 'baz'), false);
-
-		assert.strictEqual(glob.parse('foo/bar')('foo/baz', 'baz'), false);
-		assert.strictEqual(glob.parse('foo/bar')('foo/bar', 'bar'), true);
-		assert.strictEqual(glob.parse('foo/bar')('bar/foo/bar', 'bar'), false);
-		assert.strictEqual(glob.parse('foo/bar/**')('foo/bar/baz', 'baz'), true);
-		assert.strictEqual(glob.parse('foo/bar/**', { trimForExclusions: true })('foo/bar', 'bar'), true);
-		assert.strictEqual(glob.parse('foo/bar/**', { trimForExclusions: true })('foo/bar/baz', 'baz'), false);
+		assert.strictEqual(glob.parse('**/foo/bar')(nativeSep('foo/baz'), 'baz'), false);
+		assert.strictEqual(glob.parse('**/foo/bar')(nativeSep('foo/bar'), 'bar'), true);
+		assert.strictEqual(glob.parse('**/foo/bar')(nativeSep('bar/foo/bar'), 'bar'), true);
+		assert.strictEqual(glob.parse('**/foo/bar/**')(nativeSep('bar/foo/bar'), 'bar'), true);
+		assert.strictEqual(glob.parse('**/foo/bar/**')(nativeSep('bar/foo/bar/baz'), 'baz'), true);
+		assert.strictEqual(glob.parse('**/foo/bar/**', { trimForExclusions: true })(nativeSep('bar/foo/bar'), 'bar'), true);
+		assert.strictEqual(glob.parse('**/foo/bar/**', { trimForExclusions: true })(nativeSep('bar/foo/bar/baz'), 'baz'), false);
+
+		assert.strictEqual(glob.parse('foo/bar')(nativeSep('foo/baz'), 'baz'), false);
+		assert.strictEqual(glob.parse('foo/bar')(nativeSep('foo/bar'), 'bar'), true);
+		assert.strictEqual(glob.parse('foo/bar')(nativeSep('bar/foo/bar'), 'bar'), false);
+		assert.strictEqual(glob.parse('foo/bar/**')(nativeSep('foo/bar/baz'), 'baz'), true);
+		assert.strictEqual(glob.parse('foo/bar/**', { trimForExclusions: true })(nativeSep('foo/bar'), 'bar'), true);
+		assert.strictEqual(glob.parse('foo/bar/**', { trimForExclusions: true })(nativeSep('foo/bar/baz'), 'baz'), false);
 	});
 
 	test('expression/pattern paths', function () {
@@ -820,10 +820,10 @@ suite('Glob', () => {
 		assert.deepStrictEqual(glob.getPathTerms(glob.parse('**/foo/bar/**')), []);
 		assert.deepStrictEqual(glob.getPathTerms(glob.parse('**/foo/bar/**', { trimForExclusions: true })), ['*/foo/bar']);
 
-		testOptimizationForPaths('**/*.foo/bar/**', [], [['baz/bar.foo/bar/baz', true]]);
-		testOptimizationForPaths('**/foo/bar/**', ['*/foo/bar'], [['bar/foo/bar', true], ['bar/foo/bar/baz', false]]);
+		testOptimizationForPaths('**/*.foo/bar/**', [], [[nativeSep('baz/bar.foo/bar/baz'), true]]);
+		testOptimizationForPaths('**/foo/bar/**', ['*/foo/bar'], [[nativeSep('bar/foo/bar'), true], [nativeSep('bar/foo/bar/baz'), false]]);
 		// Not supported
-		// testOptimizationForPaths('{**/baz/bar/**,**/foo/bar/**}', ['*/baz/bar', '*/foo/bar'], [['bar/baz/bar', true], ['bar/foo/bar', true]]);
+		// testOptimizationForPaths('{**/baz/bar/**,**/foo/bar/**}', ['*/baz/bar', '*/foo/bar'], [[nativeSep('bar/baz/bar'), true], [nativeSep('bar/foo/bar'), true]]);
 
 		testOptimizationForPaths({
 			'**/foo/bar/**': true,
@@ -831,10 +831,10 @@ suite('Glob', () => {
 			// '{**/bar/bar/**,**/baz/bar/**}': true,
 			'**/bulb/bar/**': false
 		}, ['*/foo/bar'], [
-				['bar/foo/bar', '**/foo/bar/**'],
+				[nativeSep('bar/foo/bar'), '**/foo/bar/**'],
 				// Not supported
-				// ['foo/bar/bar', '{**/bar/bar/**,**/baz/bar/**}'],
-				['/foo/bar/nope', null]
+				// [nativeSep('foo/bar/bar'), '{**/bar/bar/**,**/baz/bar/**}'],
+				[nativeSep('/foo/bar/nope'), null]
 			]);
 
 		const siblingsFn = () => ['baz', 'baz.zip', 'nope'];
@@ -842,10 +842,10 @@ suite('Glob', () => {
 			'**/foo/123/**': { when: '$(basename).zip' },
 			'**/bar/123/**': true
 		}, ['*/bar/123'], [
-				['bar/foo/123', null],
-				['bar/foo/123/baz', null],
-				['bar/foo/123/nope', null],
-				['foo/bar/123', '**/bar/123/**'],
+				[nativeSep('bar/foo/123'), null],
+				[nativeSep('bar/foo/123/baz'), null],
+				[nativeSep('bar/foo/123/nope'), null],
+				[nativeSep('foo/bar/123'), '**/bar/123/**'],
 			], [
 				null,
 				siblingsFn,
@@ -860,4 +860,8 @@ suite('Glob', () => {
 			assert.strictEqual(parsed(text, null, siblingsFns[i]), result);
 		});
 	}
+
+	function nativeSep(slashPath: string): string {
+		return slashPath.replace(/\//g, path.sep);
+	}
 });
\ No newline at end of file