Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
fd12842e
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fd12842e
编写于
10月 12, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix marker model tests
上级
ee0a3697
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
56 deletion
+20
-56
src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts
.../parts/markers/test/electron-browser/markersModel.test.ts
+20
-56
未找到文件。
src/vs/workbench/parts/markers/test/electron-browser/markersModel.test.ts
浏览文件 @
fd12842e
...
@@ -7,55 +7,25 @@ import * as assert from 'assert';
...
@@ -7,55 +7,25 @@ import * as assert from 'assert';
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
IMarker
,
MarkerSeverity
,
IRelatedInformation
}
from
'
vs/platform/markers/common/markers
'
;
import
{
IMarker
,
MarkerSeverity
,
IRelatedInformation
}
from
'
vs/platform/markers/common/markers
'
;
import
{
MarkersModel
,
Marker
,
ResourceMarkers
,
RelatedInformation
}
from
'
vs/workbench/parts/markers/electron-browser/markersModel
'
;
import
{
MarkersModel
,
Marker
,
ResourceMarkers
,
RelatedInformation
}
from
'
vs/workbench/parts/markers/electron-browser/markersModel
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
groupBy
}
from
'
vs/base/common/collections
'
;
import
{
workbenchInstantiationService
}
from
'
vs/workbench/test/workbenchTestServices
'
;
class
TestMarkersModel
extends
MarkersModel
{
class
TestMarkersModel
extends
MarkersModel
{
get
filteredResources
():
ResourceMarkers
[]
{
constructor
(
markers
:
IMarker
[])
{
return
this
.
resourceMarkers
;
super
();
}
}
suite
(
'
MarkersModel Test
'
,
()
=>
{
let
instantiationService
:
IInstantiationService
;
setup
(()
=>
{
instantiationService
=
workbenchInstantiationService
();
});
test
(
'
getFilteredResource return markers grouped by resource
'
,
function
()
{
const
marker1
=
aMarker
(
'
res1
'
);
const
marker2
=
aMarker
(
'
res2
'
);
const
marker3
=
aMarker
(
'
res1
'
);
const
marker4
=
aMarker
(
'
res3
'
);
const
marker5
=
aMarker
(
'
res4
'
);
const
marker6
=
aMarker
(
'
res2
'
);
const
testObject
=
instantiationService
.
createInstance
(
TestMarkersModel
,
[
marker1
,
marker2
,
marker3
,
marker4
,
marker5
,
marker6
]);
const
actuals
=
testObject
.
filteredResources
;
const
byResource
=
groupBy
(
markers
,
r
=>
r
.
resource
.
toString
())
;
assert
.
equal
(
4
,
actuals
.
length
);
Object
.
keys
(
byResource
).
forEach
(
key
=>
{
const
markers
=
byResource
[
key
];
const
resource
=
markers
[
0
].
resource
;
assert
.
ok
(
compareResource
(
actuals
[
0
],
'
res1
'
));
this
.
setResourceMarkers
(
resource
,
markers
);
assert
.
equal
(
2
,
actuals
[
0
].
markers
.
length
);
});
assert
.
ok
(
hasMarker
(
actuals
[
0
].
markers
,
marker1
));
}
assert
.
ok
(
hasMarker
(
actuals
[
0
].
markers
,
marker3
));
}
assert
.
ok
(
compareResource
(
actuals
[
1
],
'
res2
'
));
assert
.
equal
(
2
,
actuals
[
1
].
markers
.
length
);
assert
.
ok
(
hasMarker
(
actuals
[
1
].
markers
,
marker2
));
assert
.
ok
(
hasMarker
(
actuals
[
1
].
markers
,
marker6
));
assert
.
ok
(
compareResource
(
actuals
[
2
],
'
res3
'
));
assert
.
equal
(
1
,
actuals
[
2
].
markers
.
length
);
assert
.
ok
(
hasMarker
(
actuals
[
2
].
markers
,
marker4
));
assert
.
ok
(
compareResource
(
actuals
[
3
],
'
res4
'
));
suite
(
'
MarkersModel Test
'
,
()
=>
{
assert
.
equal
(
1
,
actuals
[
3
].
markers
.
length
);
assert
.
ok
(
hasMarker
(
actuals
[
3
].
markers
,
marker5
));
});
test
(
'
sort palces resources with no errors at the end
'
,
function
()
{
test
(
'
sort palces resources with no errors at the end
'
,
function
()
{
const
marker1
=
aMarker
(
'
a/res1
'
,
MarkerSeverity
.
Warning
);
const
marker1
=
aMarker
(
'
a/res1
'
,
MarkerSeverity
.
Warning
);
...
@@ -64,7 +34,7 @@ suite('MarkersModel Test', () => {
...
@@ -64,7 +34,7 @@ suite('MarkersModel Test', () => {
const
marker4
=
aMarker
(
'
b/res3
'
);
const
marker4
=
aMarker
(
'
b/res3
'
);
const
marker5
=
aMarker
(
'
res4
'
);
const
marker5
=
aMarker
(
'
res4
'
);
const
marker6
=
aMarker
(
'
c/res2
'
,
MarkerSeverity
.
Info
);
const
marker6
=
aMarker
(
'
c/res2
'
,
MarkerSeverity
.
Info
);
const
testObject
=
instantiationService
.
createInstance
(
TestMarkersModel
,
[
marker1
,
marker2
,
marker3
,
marker4
,
marker5
,
marker6
]);
const
testObject
=
new
TestMarkersModel
(
[
marker1
,
marker2
,
marker3
,
marker4
,
marker5
,
marker6
]);
const
actuals
=
testObject
.
resourceMarkers
;
const
actuals
=
testObject
.
resourceMarkers
;
...
@@ -83,7 +53,7 @@ suite('MarkersModel Test', () => {
...
@@ -83,7 +53,7 @@ suite('MarkersModel Test', () => {
const
marker4
=
aMarker
(
'
b/res3
'
);
const
marker4
=
aMarker
(
'
b/res3
'
);
const
marker5
=
aMarker
(
'
res4
'
);
const
marker5
=
aMarker
(
'
res4
'
);
const
marker6
=
aMarker
(
'
c/res2
'
);
const
marker6
=
aMarker
(
'
c/res2
'
);
const
testObject
=
instantiationService
.
createInstance
(
TestMarkersModel
,
[
marker1
,
marker2
,
marker3
,
marker4
,
marker5
,
marker6
]);
const
testObject
=
new
TestMarkersModel
(
[
marker1
,
marker2
,
marker3
,
marker4
,
marker5
,
marker6
]);
const
actuals
=
testObject
.
resourceMarkers
;
const
actuals
=
testObject
.
resourceMarkers
;
...
@@ -111,7 +81,7 @@ suite('MarkersModel Test', () => {
...
@@ -111,7 +81,7 @@ suite('MarkersModel Test', () => {
const
marker13
=
aWarningWithRange
(
5
);
const
marker13
=
aWarningWithRange
(
5
);
const
marker14
=
anErrorWithRange
(
4
);
const
marker14
=
anErrorWithRange
(
4
);
const
marker15
=
anErrorWithRange
(
8
,
2
,
8
,
4
);
const
marker15
=
anErrorWithRange
(
8
,
2
,
8
,
4
);
const
testObject
=
instantiationService
.
createInstance
(
TestMarkersModel
,
[
marker1
,
marker2
,
marker3
,
marker4
,
marker5
,
marker6
,
marker7
,
marker8
,
marker9
,
marker10
,
marker11
,
marker12
,
marker13
,
marker14
,
marker15
]);
const
testObject
=
new
TestMarkersModel
(
[
marker1
,
marker2
,
marker3
,
marker4
,
marker5
,
marker6
,
marker7
,
marker8
,
marker9
,
marker10
,
marker11
,
marker12
,
marker13
,
marker14
,
marker15
]);
const
actuals
=
testObject
.
resourceMarkers
[
0
].
markers
;
const
actuals
=
testObject
.
resourceMarkers
[
0
].
markers
;
...
@@ -135,31 +105,25 @@ suite('MarkersModel Test', () => {
...
@@ -135,31 +105,25 @@ suite('MarkersModel Test', () => {
test
(
'
toString()
'
,
()
=>
{
test
(
'
toString()
'
,
()
=>
{
let
marker
=
aMarker
(
'
a/res1
'
);
let
marker
=
aMarker
(
'
a/res1
'
);
marker
.
code
=
'
1234
'
;
marker
.
code
=
'
1234
'
;
assert
.
equal
(
JSON
.
stringify
({
...
marker
,
resource
:
marker
.
resource
.
path
},
null
,
'
\t
'
),
instantiationService
.
createInstance
(
Marker
,
marker
,
null
).
toString
());
assert
.
equal
(
JSON
.
stringify
({
...
marker
,
resource
:
marker
.
resource
.
path
},
null
,
'
\t
'
),
new
Marker
(
marker
).
toString
());
marker
=
aMarker
(
'
a/res2
'
,
MarkerSeverity
.
Warning
);
marker
=
aMarker
(
'
a/res2
'
,
MarkerSeverity
.
Warning
);
assert
.
equal
(
JSON
.
stringify
({
...
marker
,
resource
:
marker
.
resource
.
path
},
null
,
'
\t
'
),
instantiationService
.
createInstance
(
Marker
,
marker
,
null
).
toString
());
assert
.
equal
(
JSON
.
stringify
({
...
marker
,
resource
:
marker
.
resource
.
path
},
null
,
'
\t
'
),
new
Marker
(
marker
).
toString
());
marker
=
aMarker
(
'
a/res2
'
,
MarkerSeverity
.
Info
,
1
,
2
,
1
,
8
,
'
Info
'
,
''
);
marker
=
aMarker
(
'
a/res2
'
,
MarkerSeverity
.
Info
,
1
,
2
,
1
,
8
,
'
Info
'
,
''
);
assert
.
equal
(
JSON
.
stringify
({
...
marker
,
resource
:
marker
.
resource
.
path
},
null
,
'
\t
'
),
instantiationService
.
createInstance
(
Marker
,
marker
,
null
).
toString
());
assert
.
equal
(
JSON
.
stringify
({
...
marker
,
resource
:
marker
.
resource
.
path
},
null
,
'
\t
'
),
new
Marker
(
marker
).
toString
());
marker
=
aMarker
(
'
a/res2
'
,
MarkerSeverity
.
Hint
,
1
,
2
,
1
,
8
,
'
Ignore message
'
,
'
Ignore
'
);
marker
=
aMarker
(
'
a/res2
'
,
MarkerSeverity
.
Hint
,
1
,
2
,
1
,
8
,
'
Ignore message
'
,
'
Ignore
'
);
assert
.
equal
(
JSON
.
stringify
({
...
marker
,
resource
:
marker
.
resource
.
path
},
null
,
'
\t
'
),
instantiationService
.
createInstance
(
Marker
,
marker
,
null
).
toString
());
assert
.
equal
(
JSON
.
stringify
({
...
marker
,
resource
:
marker
.
resource
.
path
},
null
,
'
\t
'
),
new
Marker
(
marker
).
toString
());
marker
=
aMarker
(
'
a/res2
'
,
MarkerSeverity
.
Warning
,
1
,
2
,
1
,
8
,
'
Warning message
'
,
''
,
[{
startLineNumber
:
2
,
startColumn
:
5
,
endLineNumber
:
2
,
endColumn
:
10
,
message
:
'
some info
'
,
resource
:
URI
.
file
(
'
a/res3
'
)
}]);
marker
=
aMarker
(
'
a/res2
'
,
MarkerSeverity
.
Warning
,
1
,
2
,
1
,
8
,
'
Warning message
'
,
''
,
[{
startLineNumber
:
2
,
startColumn
:
5
,
endLineNumber
:
2
,
endColumn
:
10
,
message
:
'
some info
'
,
resource
:
URI
.
file
(
'
a/res3
'
)
}]);
const
testObject
=
instantiationService
.
createInstance
(
Marker
,
marker
,
null
);
const
testObject
=
new
Marker
(
marker
,
null
);
// hack
// hack
(
testObject
as
any
).
relatedInformation
=
marker
.
relatedInformation
.
map
(
r
=>
new
RelatedInformation
(
r
));
(
testObject
as
any
).
relatedInformation
=
marker
.
relatedInformation
.
map
(
r
=>
new
RelatedInformation
(
r
));
assert
.
equal
(
JSON
.
stringify
({
...
marker
,
resource
:
marker
.
resource
.
path
,
relatedInformation
:
marker
.
relatedInformation
.
map
(
r
=>
({
...
r
,
resource
:
r
.
resource
.
path
}))
},
null
,
'
\t
'
),
testObject
.
toString
());
assert
.
equal
(
JSON
.
stringify
({
...
marker
,
resource
:
marker
.
resource
.
path
,
relatedInformation
:
marker
.
relatedInformation
.
map
(
r
=>
({
...
r
,
resource
:
r
.
resource
.
path
}))
},
null
,
'
\t
'
),
testObject
.
toString
());
});
});
function
hasMarker
(
markers
:
Marker
[],
marker
:
IMarker
):
boolean
{
return
markers
.
filter
((
m
):
boolean
=>
{
return
m
.
marker
===
marker
;
}).
length
===
1
;
}
function
compareResource
(
a
:
ResourceMarkers
,
b
:
string
):
boolean
{
function
compareResource
(
a
:
ResourceMarkers
,
b
:
string
):
boolean
{
return
a
.
resource
.
toString
()
===
URI
.
file
(
b
).
toString
();
return
a
.
resource
.
toString
()
===
URI
.
file
(
b
).
toString
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录