Add untitled backup tests to fileService

Tyriar · Tyriar · commit 0c48efcfdfe8 · 2016-10-19T15:17:23.000-07:00
diff --git a/src/vs/workbench/services/files/test/node/fileService.test.ts b/src/vs/workbench/services/files/test/node/fileService.test.ts
@@ -282,67 +282,101 @@ suite('FileService', () => {
 		const environment = TestEnvironmentService;
 		const fooResource = uri.file('/foo');
 		const barResource = uri.file('/bar');
+		const untitledResource = uri.from({ scheme: 'untitled' });
 
 		let _service: FileService;
 		let backup: TestBackupService;
 		let workspaceHash;
 		let workspaceBackupRoot;
-		let fooFileHash;
-		let barFileHash;
 		let fooBackupPath;
 		let barBackupPath;
+		let untitledBackupPath;
 
 		setup((done) => {
 			extfs.del(TestEnvironmentService.backupHome, os.tmpdir(), done);
 			backup = new TestBackupService();
 			_service = new FileService(testDir, { disableWatcher: true }, events, environment, null, backup);
 			workspaceHash = crypto.createHash('md5').update(testDir).digest('hex');
-			workspaceBackupRoot = path.join(environment.backupHome, workspaceHash, 'file');
-			fooFileHash = crypto.createHash('md5').update(fooResource.fsPath).digest('hex');
-			barFileHash = crypto.createHash('md5').update(barResource.fsPath).digest('hex');
-			fooBackupPath = path.join(workspaceBackupRoot, fooFileHash);
-			barBackupPath = path.join(workspaceBackupRoot, barFileHash);
+			workspaceBackupRoot = path.join(environment.backupHome, workspaceHash);
+			const fooFileHash = crypto.createHash('md5').update(fooResource.fsPath).digest('hex');
+			const barFileHash = crypto.createHash('md5').update(barResource.fsPath).digest('hex');
+			const untitledFileHash = crypto.createHash('md5').update(untitledResource.fsPath).digest('hex');
+			fooBackupPath = path.join(workspaceBackupRoot, 'file', fooFileHash);
+			barBackupPath = path.join(workspaceBackupRoot, 'file', barFileHash);
+			untitledBackupPath = path.join(workspaceBackupRoot, 'untitled', untitledFileHash);
 		});
 
 		teardown((done) => {
 			extfs.del(TestEnvironmentService.backupHome, os.tmpdir(), done);
 		});
 
-		test('backupFile', function (done: () => void) {
+		test('backupFile - text file', function (done: () => void) {
 			_service.backupFile(fooResource, 'test').then(() => {
-				assert.equal(fs.readdirSync(workspaceBackupRoot).length, 1);
+				assert.equal(fs.readdirSync(path.join(workspaceBackupRoot, 'file')).length, 1);
 				assert.equal(fs.existsSync(fooBackupPath), true);
 				assert.deepEqual(backup.registeredResources, [fooResource]);
 				assert.equal(fs.readFileSync(fooBackupPath), 'test');
 				done();
 			});
 		});
 
-		test('discardBackup', function (done: () => void) {
+		test('backupFile - untitled file', function (done: () => void) {
+			_service.backupFile(untitledResource, 'test').then(() => {
+				assert.equal(fs.readdirSync(path.join(workspaceBackupRoot, 'untitled')).length, 1);
+				assert.equal(fs.existsSync(untitledBackupPath), true);
+				// Untitled files are not registered to workspaces.json as they do not have paths
+				assert.equal(fs.readFileSync(untitledBackupPath), 'test');
+				done();
+			});
+		});
+
+		test('discardBackup - text file', function (done: () => void) {
 			_service.backupFile(fooResource, 'test').then(() => {
-				assert.equal(fs.readdirSync(workspaceBackupRoot).length, 1);
+				assert.equal(fs.readdirSync(path.join(workspaceBackupRoot, 'file')).length, 1);
 				_service.discardBackup(fooResource).then(() => {
 					assert.equal(fs.existsSync(fooBackupPath), false);
-					assert.equal(fs.readdirSync(workspaceBackupRoot).length, 0);
+					assert.equal(fs.readdirSync(path.join(workspaceBackupRoot, 'file')).length, 0);
+					done();
+				});
+			});
+		});
+
+		test('discardBackup - untitled file', function (done: () => void) {
+			_service.backupFile(untitledResource, 'test').then(() => {
+				assert.equal(fs.readdirSync(path.join(workspaceBackupRoot, 'untitled')).length, 1);
+				_service.discardBackup(untitledResource).then(() => {
+					assert.equal(fs.existsSync(untitledBackupPath), false);
+					assert.equal(fs.readdirSync(path.join(workspaceBackupRoot, 'untitled')).length, 0);
 					done();
 				});
 			});
 		});
 
-		test('discardBackups', function (done: () => void) {
+		test('discardBackups - text file', function (done: () => void) {
 			_service.backupFile(fooResource, 'test').then(() => {
-				assert.equal(fs.readdirSync(workspaceBackupRoot).length, 1);
+				assert.equal(fs.readdirSync(path.join(workspaceBackupRoot, 'file')).length, 1);
 				_service.backupFile(barResource, 'test').then(() => {
-					assert.equal(fs.readdirSync(workspaceBackupRoot).length, 2);
+					assert.equal(fs.readdirSync(path.join(workspaceBackupRoot, 'file')).length, 2);
 					_service.discardBackups().then(() => {
 						assert.equal(fs.existsSync(fooBackupPath), false);
 						assert.equal(fs.existsSync(barBackupPath), false);
-						assert.equal(fs.existsSync(workspaceBackupRoot), false);
+						assert.equal(fs.existsSync(path.join(workspaceBackupRoot, 'file')), false);
 						done();
 					});
 				});
 			});
 		});
+
+		test('discardBackups - untitled file', function (done: () => void) {
+			_service.backupFile(untitledResource, 'test').then(() => {
+				assert.equal(fs.readdirSync(path.join(workspaceBackupRoot, 'untitled')).length, 1);
+				_service.discardBackups().then(() => {
+					assert.equal(fs.existsSync(untitledBackupPath), false);
+					assert.equal(fs.existsSync(path.join(workspaceBackupRoot, 'untitled')), false);
+					done();
+				});
+			});
+		});
 	});
 
 	test('resolveFile', function (done: () => void) {
