From e8eb78ee67b4d80b0fa853a2ebc4fa75a84ddfb3 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Mon, 28 Nov 2016 18:13:31 -0800
Subject: [PATCH] Fix tests, work on fsPaths

---
 .../services/backup/node/backupFileService.ts |  2 +-
 .../backup/test/backupFileService.test.ts     | 30 +++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/services/backup/node/backupFileService.ts b/src/vs/workbench/services/backup/node/backupFileService.ts
index 26936a965e7..81804fe0887 100644
--- a/src/vs/workbench/services/backup/node/backupFileService.ts
+++ b/src/vs/workbench/services/backup/node/backupFileService.ts
@@ -67,7 +67,7 @@ export class BackupFilesModel implements IBackupFilesModel {
 	}
 
 	public getTextFiles(): string[] {
-		return Object.keys(this.cache).filter(k => path.basename(path.dirname(k)) === 'file');
+		return Object.keys(this.cache).filter(k => path.basename(path.dirname(k)) === 'file').map(k => k.replace('file://', ''));
 	}
 
 	public remove(resource: Uri): void {
diff --git a/src/vs/workbench/services/backup/test/backupFileService.test.ts b/src/vs/workbench/services/backup/test/backupFileService.test.ts
index 7f3d75e3839..67f69774c08 100644
--- a/src/vs/workbench/services/backup/test/backupFileService.test.ts
+++ b/src/vs/workbench/services/backup/test/backupFileService.test.ts
@@ -108,7 +108,7 @@ suite('BackupFileService', () => {
 		service.backupResource(fooFile, 'test').then(() => {
 			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
 			assert.equal(fs.existsSync(fooBackupPath), true);
-			assert.equal(fs.readFileSync(fooBackupPath), 'test');
+			assert.equal(fs.readFileSync(fooBackupPath), `${fooFile.fsPath}\ntest`);
 			done();
 		});
 	});
@@ -170,10 +170,24 @@ suite('BackupFileService', () => {
 		});
 	});
 
-	test('getWorkspaceTextFileBackups', done => {
-		service.backupResource(fooFile, `${fooFile.fsPath}\ntest`).then(() => {
+	test('getWorkspaceTextFileBackups - text file', done => {
+		service.backupResource(fooFile, `test`).then(() => {
 			service.getWorkspaceTextFileBackups().then(textFiles => {
-				assert.deepEqual(textFiles, [fooFile.toString()]);
+				assert.deepEqual(textFiles, [fooFile.fsPath]);
+				service.backupResource(barFile, `test`).then(() => {
+					service.getWorkspaceTextFileBackups().then(textFiles => {
+						assert.deepEqual(textFiles, [fooFile.fsPath, barFile.fsPath]);
+						done();
+					});
+				});
+			});
+		});
+	});
+
+	test('getWorkspaceTextFileBackups - untitled file', done => {
+		service.backupResource(untitledFile, `test`).then(() => {
+			service.getWorkspaceTextFileBackups().then(textFiles => {
+				assert.deepEqual(textFiles, []);
 				done();
 			});
 		});
@@ -245,12 +259,10 @@ suite('BackupFileService', () => {
 
 		assert.deepEqual(model.getTextFiles(), []);
 
-		const resource1 = Uri.file('/root/file/foo.html');
-		const resource2 = Uri.file('/root/file/bar.html');
-		model.add(resource1);
-		model.add(resource2);
+		model.add(Uri.file('/root/file/foo.html'));
+		model.add(Uri.file('/root/file/bar.html'));
 		model.add(Uri.file('/root/untitled/bar.html'));
 
-		assert.deepEqual(model.getTextFiles(), [resource1.toString(), resource2.toString()]);
+		assert.deepEqual(model.getTextFiles(), ['/root/file/foo.html', '/root/file/bar.html']);
 	});
 });
\ No newline at end of file