Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7bc00b2c
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7bc00b2c
编写于
12月 02, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
skip tests in windowa
上级
99e822ef
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
108 addition
and
104 deletion
+108
-104
src/vs/platform/userDataSync/test/common/keybindingsMerge.test.ts
...latform/userDataSync/test/common/keybindingsMerge.test.ts
+108
-104
未找到文件。
src/vs/platform/userDataSync/test/common/keybindingsMerge.test.ts
浏览文件 @
7bc00b2c
...
...
@@ -440,16 +440,18 @@ suite('KeybindingsMerge - No Conflicts', () => {
});
suite
(
'
KeybindingsMerge - Conflicts
'
,
()
=>
{
test
(
'
merge when local and remote with one entry but different value
'
,
async
()
=>
{
const
localContent
=
stringify
([{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
remoteContent
=
stringify
([{
key
:
'
alt+c
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
null
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
if
(
OS
!==
OperatingSystem
.
Windows
)
{
suite
(
'
KeybindingsMerge - Conflicts
'
,
()
=>
{
test
(
'
merge when local and remote with one entry but different value
'
,
async
()
=>
{
const
localContent
=
stringify
([{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
remoteContent
=
stringify
([{
key
:
'
alt+c
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
null
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
[
{
"key": "alt+d",
...
...
@@ -466,22 +468,22 @@ suite('KeybindingsMerge - Conflicts', () => {
}
]
>>>>>>> remote`
);
});
test
(
'
merge when local and remote with different keybinding
'
,
async
()
=>
{
const
localContent
=
stringify
([
{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
},
{
key
:
'
alt+a
'
,
command
:
'
-a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}
]);
const
remoteContent
=
stringify
([
{
key
:
'
alt+c
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
},
{
key
:
'
alt+a
'
,
command
:
'
-a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}
]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
null
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
});
test
(
'
merge when local and remote with different keybinding
'
,
async
()
=>
{
const
localContent
=
stringify
([
{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
},
{
key
:
'
alt+a
'
,
command
:
'
-a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}
]);
const
remoteContent
=
stringify
([
{
key
:
'
alt+c
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
},
{
key
:
'
alt+a
'
,
command
:
'
-a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}
]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
null
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
[
{
"key": "alt+d",
...
...
@@ -508,17 +510,17 @@ suite('KeybindingsMerge - Conflicts', () => {
}
]
>>>>>>> remote`
);
});
test
(
'
merge when the entry is removed in local but updated in remote
'
,
async
()
=>
{
const
baseContent
=
stringify
([{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
localContent
=
stringify
([]);
const
remoteContent
=
stringify
([{
key
:
'
alt+c
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
baseContent
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
});
test
(
'
merge when the entry is removed in local but updated in remote
'
,
async
()
=>
{
const
baseContent
=
stringify
([{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
localContent
=
stringify
([]);
const
remoteContent
=
stringify
([{
key
:
'
alt+c
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
baseContent
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
[]
=======
[
...
...
@@ -529,17 +531,17 @@ suite('KeybindingsMerge - Conflicts', () => {
}
]
>>>>>>> remote`
);
});
test
(
'
merge when the entry is removed in local but updated in remote and a new entry is added in local
'
,
async
()
=>
{
const
baseContent
=
stringify
([{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
localContent
=
stringify
([{
key
:
'
alt+b
'
,
command
:
'
b
'
}]);
const
remoteContent
=
stringify
([{
key
:
'
alt+c
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
baseContent
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
});
test
(
'
merge when the entry is removed in local but updated in remote and a new entry is added in local
'
,
async
()
=>
{
const
baseContent
=
stringify
([{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
localContent
=
stringify
([{
key
:
'
alt+b
'
,
command
:
'
b
'
}]);
const
remoteContent
=
stringify
([{
key
:
'
alt+c
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
baseContent
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
[
{
"key": "alt+b",
...
...
@@ -555,17 +557,17 @@ suite('KeybindingsMerge - Conflicts', () => {
}
]
>>>>>>> remote`
);
});
test
(
'
merge when the entry is removed in remote but updated in local
'
,
async
()
=>
{
const
baseContent
=
stringify
([{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
localContent
=
stringify
([{
key
:
'
alt+c
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
remoteContent
=
stringify
([]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
baseContent
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
});
test
(
'
merge when the entry is removed in remote but updated in local
'
,
async
()
=>
{
const
baseContent
=
stringify
([{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
localContent
=
stringify
([{
key
:
'
alt+c
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
remoteContent
=
stringify
([]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
baseContent
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
[
{
"key": "alt+c",
...
...
@@ -576,17 +578,17 @@ suite('KeybindingsMerge - Conflicts', () => {
=======
[]
>>>>>>> remote`
);
});
test
(
'
merge when the entry is removed in remote but updated in local and a new entry is added in remote
'
,
async
()
=>
{
const
baseContent
=
stringify
([{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
localContent
=
stringify
([{
key
:
'
alt+c
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
remoteContent
=
stringify
([{
key
:
'
alt+b
'
,
command
:
'
b
'
}]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
baseContent
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
});
test
(
'
merge when the entry is removed in remote but updated in local and a new entry is added in remote
'
,
async
()
=>
{
const
baseContent
=
stringify
([{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
localContent
=
stringify
([{
key
:
'
alt+c
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
}]);
const
remoteContent
=
stringify
([{
key
:
'
alt+b
'
,
command
:
'
b
'
}]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
baseContent
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
[
{
"key": "alt+c",
...
...
@@ -606,39 +608,39 @@ suite('KeybindingsMerge - Conflicts', () => {
}
]
>>>>>>> remote`
);
});
test
(
'
merge when local and remote has moved forwareded with conflicts
'
,
async
()
=>
{
const
baseContent
=
stringify
([
{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
},
{
key
:
'
alt+c
'
,
command
:
'
-a
'
},
{
key
:
'
cmd+e
'
,
command
:
'
d
'
},
{
key
:
'
alt+a
'
,
command
:
'
f
'
},
{
key
:
'
alt+d
'
,
command
:
'
-f
'
},
{
key
:
'
cmd+d
'
,
command
:
'
c
'
,
when
:
'
context1
'
},
{
key
:
'
cmd+c
'
,
command
:
'
-c
'
},
]);
const
localContent
=
stringify
([
{
key
:
'
alt+d
'
,
command
:
'
-f
'
},
{
key
:
'
cmd+e
'
,
command
:
'
d
'
},
{
key
:
'
cmd+c
'
,
command
:
'
-c
'
},
{
key
:
'
cmd+d
'
,
command
:
'
c
'
,
when
:
'
context1
'
},
{
key
:
'
alt+a
'
,
command
:
'
f
'
},
{
key
:
'
alt+e
'
,
command
:
'
e
'
},
]);
const
remoteContent
=
stringify
([
{
key
:
'
alt+a
'
,
command
:
'
f
'
},
{
key
:
'
cmd+c
'
,
command
:
'
-c
'
},
{
key
:
'
cmd+d
'
,
command
:
'
d
'
},
{
key
:
'
alt+d
'
,
command
:
'
-f
'
},
{
key
:
'
alt+c
'
,
command
:
'
c
'
,
when
:
'
context1
'
},
{
key
:
'
alt+g
'
,
command
:
'
g
'
,
when
:
'
context2
'
},
]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
baseContent
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
});
test
(
'
merge when local and remote has moved forwareded with conflicts
'
,
async
()
=>
{
const
baseContent
=
stringify
([
{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
},
{
key
:
'
alt+c
'
,
command
:
'
-a
'
},
{
key
:
'
cmd+e
'
,
command
:
'
d
'
},
{
key
:
'
alt+a
'
,
command
:
'
f
'
},
{
key
:
'
alt+d
'
,
command
:
'
-f
'
},
{
key
:
'
cmd+d
'
,
command
:
'
c
'
,
when
:
'
context1
'
},
{
key
:
'
cmd+c
'
,
command
:
'
-c
'
},
]);
const
localContent
=
stringify
([
{
key
:
'
alt+d
'
,
command
:
'
-f
'
},
{
key
:
'
cmd+e
'
,
command
:
'
d
'
},
{
key
:
'
cmd+c
'
,
command
:
'
-c
'
},
{
key
:
'
cmd+d
'
,
command
:
'
c
'
,
when
:
'
context1
'
},
{
key
:
'
alt+a
'
,
command
:
'
f
'
},
{
key
:
'
alt+e
'
,
command
:
'
e
'
},
]);
const
remoteContent
=
stringify
([
{
key
:
'
alt+a
'
,
command
:
'
f
'
},
{
key
:
'
cmd+c
'
,
command
:
'
-c
'
},
{
key
:
'
cmd+d
'
,
command
:
'
d
'
},
{
key
:
'
alt+d
'
,
command
:
'
-f
'
},
{
key
:
'
alt+c
'
,
command
:
'
c
'
,
when
:
'
context1
'
},
{
key
:
'
alt+g
'
,
command
:
'
g
'
,
when
:
'
context2
'
},
]);
const
actual
=
await
mergeKeybindings
(
localContent
,
remoteContent
,
baseContent
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
`<<<<<<< local
[
{
"key": "alt+d",
...
...
@@ -701,9 +703,11 @@ suite('KeybindingsMerge - Conflicts', () => {
}
]
>>>>>>> remote`
);
});
});
}
);
}
async
function
mergeKeybindings
(
localContent
:
string
,
remoteContent
:
string
,
baseContent
:
string
|
null
)
{
const
userDataSyncUtilService
=
new
MockUserDataSyncUtilService
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录