microsoft#98389 fix tests

sandy081 · sandy081 · commit d9f49fabd474 · 2020-05-22T20:07:18.000+02:00
diff --git a/src/vs/platform/userDataSync/common/abstractSynchronizer.ts b/src/vs/platform/userDataSync/common/abstractSynchronizer.ts
@@ -41,16 +41,16 @@ export interface ISyncData {
 
 function isSyncData(thing: any): thing is ISyncData {
 	if (thing
-		&& (thing.version && typeof thing.version === 'number')
-		&& (thing.content && typeof thing.content === 'string')) {
+		&& (thing.version !== undefined && typeof thing.version === 'number')
+		&& (thing.content !== undefined && typeof thing.content === 'string')) {
 
 		// backward compatibility
 		if (Object.keys(thing).length === 2) {
 			return true;
 		}
 
 		if (Object.keys(thing).length === 3
-			&& (thing.machineId && typeof thing.machineId === 'string')) {
+			&& (thing.machineId !== undefined && typeof thing.machineId === 'string')) {
 			return true;
 		}
 	}
@@ -356,9 +356,13 @@ export abstract class AbstractSynchroniser extends Disposable {
 	}
 
 	protected parseSyncData(content: string): ISyncData {
-		const syncData: ISyncData = JSON.parse(content);
-		if (isSyncData(syncData)) {
-			return syncData;
+		try {
+			const syncData: ISyncData = JSON.parse(content);
+			if (isSyncData(syncData)) {
+				return syncData;
+			}
+		} catch (error) {
+			this.logService.error(error);
 		}
 		throw new UserDataSyncError(localize('incompatible sync data', "Cannot parse sync data as it is not compatible with current version."), UserDataSyncErrorCode.Incompatible, this.resource);
 	}
diff --git a/src/vs/platform/userDataSync/test/common/synchronizer.test.ts b/src/vs/platform/userDataSync/test/common/synchronizer.test.ts
@@ -42,8 +42,8 @@ class TestSynchroniser extends AbstractSynchroniser {
 	protected async performReplace(syncData: ISyncData, remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null): Promise<void> { }
 
 	async apply(ref: string): Promise<void> {
-		ref = await this.userDataSyncStoreService.write(this.resource, '', ref);
-		await this.updateLastSyncUserData({ ref, syncData: { content: '', version: this.version } });
+		const remoteUserData = await this.updateRemoteUserData('', ref);
+		await this.updateLastSyncUserData(remoteUserData);
 	}
 
 	async stop(): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -41,16 +41,16 @@ export interface ISyncData {`
`41`	`41`
`42`	`42`	`function isSyncData(thing: any): thing is ISyncData {`
`43`	`43`	`if (thing`
`44`		`- && (thing.version && typeof thing.version === 'number')`
`45`		`- && (thing.content && typeof thing.content === 'string')) {`
	`44`	`+ && (thing.version !== undefined && typeof thing.version === 'number')`
	`45`	`+ && (thing.content !== undefined && typeof thing.content === 'string')) {`
`46`	`46`
`47`	`47`	`// backward compatibility`
`48`	`48`	`if (Object.keys(thing).length === 2) {`
`49`	`49`	`return true;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if (Object.keys(thing).length === 3`
`53`		`- && (thing.machineId && typeof thing.machineId === 'string')) {`
	`53`	`+ && (thing.machineId !== undefined && typeof thing.machineId === 'string')) {`
`54`	`54`	`return true;`
`55`	`55`	`}`
`56`	`56`	`}`
`@@ -356,9 +356,13 @@ export abstract class AbstractSynchroniser extends Disposable {`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`protected parseSyncData(content: string): ISyncData {`
`359`		`- const syncData: ISyncData = JSON.parse(content);`
`360`		`- if (isSyncData(syncData)) {`
`361`		`- return syncData;`
	`359`	`+ try {`
	`360`	`+ const syncData: ISyncData = JSON.parse(content);`
	`361`	`+ if (isSyncData(syncData)) {`
	`362`	`+ return syncData;`
	`363`	`+ }`
	`364`	`+ } catch (error) {`
	`365`	`+ this.logService.error(error);`
`362`	`366`	`}`
`363`	`367`	`throw new UserDataSyncError(localize('incompatible sync data', "Cannot parse sync data as it is not compatible with current version."), UserDataSyncErrorCode.Incompatible, this.resource);`
`364`	`368`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ class TestSynchroniser extends AbstractSynchroniser {`
`42`	`42`	`protected async performReplace(syncData: ISyncData, remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData \| null): Promise<void> { }`
`43`	`43`
`44`	`44`	`async apply(ref: string): Promise<void> {`
`45`		`- ref = await this.userDataSyncStoreService.write(this.resource, '', ref);`
`46`		`- await this.updateLastSyncUserData({ ref, syncData: { content: '', version: this.version } });`
	`45`	`+ const remoteUserData = await this.updateRemoteUserData('', ref);`
	`46`	`+ await this.updateLastSyncUserData(remoteUserData);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`async stop(): Promise<void> {`