Add more tests for special chars

Author: felixfbecker

src/test/fs.test.ts

@@ -22,12 +22,13 @@ describe('fs.ts', () => {
 				temp.mkdir('local-fs', (err: Error, dirPath: string) => err ? reject(err) : resolve(dirPath));
 			});
 			baseUri = path2uri(new URL('file:///'), temporaryDir + path.sep);
-			await fs.mkdir(path.join(temporaryDir, 'f💩o'));
+			await fs.mkdir(path.join(temporaryDir, 'foo'));
 			await fs.mkdir(path.join(temporaryDir, '@types'));
 			await fs.mkdir(path.join(temporaryDir, '@types', 'diff'));
+			await fs.writeFile(path.join(temporaryDir, '💩'), 'hi');
 			await fs.writeFile(path.join(temporaryDir, 'tweedledee'), 'hi');
 			await fs.writeFile(path.join(temporaryDir, 'tweedledum'), 'bye');
-			await fs.writeFile(path.join(temporaryDir, 'f💩o', 'bar.ts'), 'baz');
+			await fs.writeFile(path.join(temporaryDir, 'foo', 'bar.ts'), 'baz');
 			await fs.writeFile(path.join(temporaryDir, '@types', 'diff', 'index.d.ts'), 'baz');
 			fileSystem = new LocalFileSystem(baseUri);
 		});
@@ -43,19 +44,20 @@ describe('fs.ts', () => {
 				assert.sameMembers(files, [
 					baseUri + 'tweedledee',
 					baseUri + 'tweedledum',
-					baseUri + 'f%F0%9F%92%A9o/bar.ts',
-					baseUri + '@types/diff/index.d.ts'
+					baseUri + '%F0%9F%92%A9',
+					baseUri + 'foo/bar.ts',
+					baseUri + '%40types/diff/index.d.ts'
 				]);
 			});
 			it('should return all files under specific root', async () => {
-				const files = iterate(await fileSystem.getWorkspaceFiles(new URL('f%F0%9F%92%A9o', baseUri.href))).map(uri => uri.href).toArray();
+				const files = iterate(await fileSystem.getWorkspaceFiles(new URL('foo', baseUri.href))).map(uri => uri.href).toArray();
 				assert.sameMembers(files, [
-					baseUri + 'f%F0%9F%92%A9o/bar.ts'
+					baseUri + 'foo/bar.ts'
 				]);
 			});
 		});
 		describe('getTextDocumentContent()', () => {
-			it('should read files denoted by absolute URI', async () => {
+			it('should return the content of a file by URI', async () => {
 				assert.equal(await fileSystem.getTextDocumentContent(new URL('tweedledee', baseUri.href)), 'hi');
 			});
 		});

src/test/util-test.ts

@@ -5,27 +5,42 @@ import { path2uri, symbolDescriptorMatch, uri2path } from '../util';
 describe('util', () => {
 	describe('path2uri()', () => {
 		it('should convert a Unix file path to a URI', () => {
-			const uri = path2uri(new URL('file://host/foo/bar'), '/baz/@qux');
-			assert.equal(uri.href, 'file://host/baz/%40qux');
+			const uri = path2uri(new URL('file:///foo/bar'), '/baz/qux');
+			assert.equal(uri.href, 'file:///baz/qux');
 		});
 		it('should convert a Windows file path to a URI', () => {
-			// Host is dropped because of https://github.com/jsdom/whatwg-url/issues/84
-			const uri = path2uri(new URL('file:///foo/bar'), 'C:\\baz\\@qux');
-			assert.equal(uri.href, 'file:///C:/baz/%40qux');
+			const uri = path2uri(new URL('file:///foo/bar'), 'C:\\baz\\qux');
+			assert.equal(uri.href, 'file:///C:/baz/qux');
+		});
+		it('should encode special characters', () => {
+			const uri = path2uri(new URL('file:///foo/bar'), '/💩');
+			assert.equal(uri.href, 'file:///%F0%9F%92%A9');
+		});
+		it('should encode unreserved special characters', () => {
+			const uri = path2uri(new URL('file:///foo/bar'), '/@baz');
+			assert.equal(uri.href, 'file:///%40baz');
 		});
 	});
 	describe('uri2path()', () => {
 		it('should convert a Unix file URI to a file path', () => {
-			const filePath = uri2path(new URL('file:///baz/%40qux'));
-			assert.equal(filePath, '/baz/@qux');
+			const filePath = uri2path(new URL('file:///baz/qux'));
+			assert.equal(filePath, '/baz/qux');
 		});
 		it('should convert a Windows file URI to a file path', () => {
-			const filePath = uri2path(new URL('file:///c:/baz/%40qux'));
-			assert.equal(filePath, 'c:\\baz\\@qux');
+			const filePath = uri2path(new URL('file:///c:/baz/qux'));
+			assert.equal(filePath, 'c:\\baz\\qux');
 		});
 		it('should convert a Windows file URI with uppercase drive letter to a file path', () => {
-			const filePath = uri2path(new URL('file:///C:/baz/%40qux'));
-			assert.equal(filePath, 'C:\\baz\\@qux');
+			const filePath = uri2path(new URL('file:///C:/baz/qux'));
+			assert.equal(filePath, 'C:\\baz\\qux');
+		});
+		it('should decode special characters', () => {
+			const filePath = uri2path(new URL('file:///%F0%9F%92%A9'));
+			assert.equal(filePath, '/💩');
+		});
+		it('should decode unreserved special characters', () => {
+			const filePath = uri2path(new URL('file:///%40foo'));
+			assert.equal(filePath, '/@foo');
 		});
 	});
 	describe('symbolDescriptorMatch', () => {