Revert "fix windows tests #58985"

This reverts commit 55d96d9.
microsoft · Oct 23, 2018 · 68229da · 68229da
1 parent a1f24ce
commit 68229da
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/src/vs/base/test/common/resources.test.ts b/src/vs/base/test/common/resources.test.ts
@@ -42,11 +42,11 @@ suite('Resources', () => {
 
 	test('dirname', () => {
 		if (isWindows) {
-			assert.equal(dirname(URI.file('c:\\some\\file\\test.txt')).toString(), 'file:///c:/some/file');
-			assert.equal(dirname(URI.file('c:\\some\\file')).toString(), 'file:///c:/some');
-			assert.equal(dirname(URI.file('c:\\some\\file\\')).toString(), 'file:///c:/some');
-			assert.equal(dirname(URI.file('c:\\some')).toString(), 'file:///c:/');
-			assert.equal(dirname(URI.file('C:\\some')).toString(), 'file:///c:/');
+			assert.equal(dirname(URI.file('c:\\some\\file\\test.txt')).toString(), 'file:///c%3A/some/file');
+			assert.equal(dirname(URI.file('c:\\some\\file')).toString(), 'file:///c%3A/some');
+			assert.equal(dirname(URI.file('c:\\some\\file\\')).toString(), 'file:///c%3A/some');
+			assert.equal(dirname(URI.file('c:\\some')).toString(), 'file:///c%3A/');
+			assert.equal(dirname(URI.file('C:\\some')).toString(), 'file:///c%3A/');
 		} else {
 			assert.equal(dirname(URI.file('/some/file/test.txt')).toString(), 'file:///some/file');
 			assert.equal(dirname(URI.file('/some/file/')).toString(), 'file:///some');
@@ -83,15 +83,15 @@ suite('Resources', () => {
 
 	test('joinPath', () => {
 		if (isWindows) {
-			assert.equal(joinPath(URI.file('c:\\foo\\bar'), '/file.js').toString(), 'file:///c:/foo/bar/file.js');
-			assert.equal(joinPath(URI.file('c:\\foo\\bar\\'), 'file.js').toString(), 'file:///c:/foo/bar/file.js');
-			assert.equal(joinPath(URI.file('c:\\foo\\bar\\'), '/file.js').toString(), 'file:///c:/foo/bar/file.js');
-			assert.equal(joinPath(URI.file('c:\\'), '/file.js').toString(), 'file:///c:/file.js');
-			assert.equal(joinPath(URI.file('c:\\'), 'bar/file.js').toString(), 'file:///c:/bar/file.js');
-			assert.equal(joinPath(URI.file('c:\\foo'), './file.js').toString(), 'file:///c:/foo/file.js');
-			assert.equal(joinPath(URI.file('c:\\foo'), '/./file.js').toString(), 'file:///c:/foo/file.js');
-			assert.equal(joinPath(URI.file('C:\\foo'), '../file.js').toString(), 'file:///c:/file.js');
-			assert.equal(joinPath(URI.file('C:\\foo\\.'), '../file.js').toString(), 'file:///c:/file.js');
+			assert.equal(joinPath(URI.file('c:\\foo\\bar'), '/file.js').toString(), 'file:///c%3A/foo/bar/file.js');
+			assert.equal(joinPath(URI.file('c:\\foo\\bar\\'), 'file.js').toString(), 'file:///c%3A/foo/bar/file.js');
+			assert.equal(joinPath(URI.file('c:\\foo\\bar\\'), '/file.js').toString(), 'file:///c%3A/foo/bar/file.js');
+			assert.equal(joinPath(URI.file('c:\\'), '/file.js').toString(), 'file:///c%3A/file.js');
+			assert.equal(joinPath(URI.file('c:\\'), 'bar/file.js').toString(), 'file:///c%3A/bar/file.js');
+			assert.equal(joinPath(URI.file('c:\\foo'), './file.js').toString(), 'file:///c%3A/foo/file.js');
+			assert.equal(joinPath(URI.file('c:\\foo'), '/./file.js').toString(), 'file:///c%3A/foo/file.js');
+			assert.equal(joinPath(URI.file('C:\\foo'), '../file.js').toString(), 'file:///c%3A/file.js');
+			assert.equal(joinPath(URI.file('C:\\foo\\.'), '../file.js').toString(), 'file:///c%3A/file.js');
 		} else {
 			assert.equal(joinPath(URI.file('/foo/bar'), '/file.js').toString(), 'file:///foo/bar/file.js');
 			assert.equal(joinPath(URI.file('/foo/bar'), 'file.js').toString(), 'file:///foo/bar/file.js');
@@ -116,15 +116,15 @@ suite('Resources', () => {
 
 	test('normalizePath', () => {
 		if (isWindows) {
-			assert.equal(normalizePath(URI.file('c:\\foo\\.\\bar')).toString(), 'file:///c:/foo/bar');
-			assert.equal(normalizePath(URI.file('c:\\foo\\.')).toString(), 'file:///c:/foo');
-			assert.equal(normalizePath(URI.file('c:\\foo\\.\\')).toString(), 'file:///c:/foo/');
-			assert.equal(normalizePath(URI.file('c:\\foo\\..')).toString(), 'file:///c:/');
-			assert.equal(normalizePath(URI.file('c:\\foo\\..\\bar')).toString(), 'file:///c:/bar');
-			assert.equal(normalizePath(URI.file('c:\\foo\\..\\..\\bar')).toString(), 'file:///c:/bar');
-			assert.equal(normalizePath(URI.file('c:\\foo\\foo\\..\\..\\bar')).toString(), 'file:///c:/bar');
-			assert.equal(normalizePath(URI.file('C:\\foo\\foo\\.\\..\\..\\bar')).toString(), 'file:///c:/bar');
-			assert.equal(normalizePath(URI.file('C:\\foo\\foo\\.\\..\\some\\..\\bar')).toString(), 'file:///c:/foo/bar');
+			assert.equal(normalizePath(URI.file('c:\\foo\\.\\bar')).toString(), 'file:///c%3A/foo/bar');
+			assert.equal(normalizePath(URI.file('c:\\foo\\.')).toString(), 'file:///c%3A/foo');
+			assert.equal(normalizePath(URI.file('c:\\foo\\.\\')).toString(), 'file:///c%3A/foo/');
+			assert.equal(normalizePath(URI.file('c:\\foo\\..')).toString(), 'file:///c%3A/');
+			assert.equal(normalizePath(URI.file('c:\\foo\\..\\bar')).toString(), 'file:///c%3A/bar');
+			assert.equal(normalizePath(URI.file('c:\\foo\\..\\..\\bar')).toString(), 'file:///c%3A/bar');
+			assert.equal(normalizePath(URI.file('c:\\foo\\foo\\..\\..\\bar')).toString(), 'file:///c%3A/bar');
+			assert.equal(normalizePath(URI.file('C:\\foo\\foo\\.\\..\\..\\bar')).toString(), 'file:///c%3A/bar');
+			assert.equal(normalizePath(URI.file('C:\\foo\\foo\\.\\..\\some\\..\\bar')).toString(), 'file:///c%3A/foo/bar');
 		} else {
 			assert.equal(normalizePath(URI.file('/foo/./bar')).toString(), 'file:///foo/bar');
 			assert.equal(normalizePath(URI.file('/foo/.')).toString(), 'file:///foo');