Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,13 @@ void test() {
result
.logOutput()
.stream()
.filter(l -> l.message().matches("TypeScript(\\(\\d\\.\\d\\.\\d\\))? configuration file.*"))
.filter(l ->
l
.message()
.matches(
"Creating TypeScript(\\(\\d\\.\\d\\.\\d\\))? program with configuration file.*"
)
)
).hasSize(2);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,16 @@ void multiple_targets() {
.extracting(Log::message)
.filteredOn(m -> m.startsWith("Found 1 tsconfig.json file(s)"))
.hasSize(1);
assertThat(result.logOutput())
.extracting(Log::message)
.filteredOn(m ->
m.equals(
"Found 1 file(s) not part of any tsconfig.json: they will be analyzed without type information"
assertThat(
result
.logOutput()
.stream()
.filter(l ->
l
.message()
.matches("Creating TypeScript(\\(\\d\\.\\d\\.\\d\\))? program from entry point.*")
)
)
.hasSize(1);
).hasSize(1);

var issues = result
.scannerOutputReader()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ void should_use_multiple_custom_tsconfigs() throws Exception {
result.getLogsLines(l ->
l.contains(
"Found 2 tsconfig.json file(s): " +
tsconfigs
.stream()
.map(tsconfig -> tsconfig.toString().replace("\\", "/"))
.toList()
tsconfigs
.stream()
.map(tsconfig -> tsconfig.toString().replace("\\", "/"))
.toList()
)
)
).hasSize(1);
Expand Down Expand Up @@ -247,14 +247,7 @@ void should_exclude_from_extended_tsconfig() throws Exception {

assertThat(
result.getLogsLines(l ->
l.contains(
"INFO: Found 1 file(s) not part of any tsconfig.json: they will be analyzed without type information"
)
)
).hasSize(1);
assertThat(
result.getLogsLines(l ->
l.contains("File not part of any tsconfig.json: dir/file.excluded.ts")
l.matches(".*Creating TypeScript(\\(\\d\\.\\d\\.\\d\\))? program from entry point.*")
)
).hasSize(1);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"TypeScript:scripts/mocha-parallel.js": [
359
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"TypeScript:lib/tsc.js": [
47353,
48006,
48316
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"TypeScript:Jakefile.js": [
821
]
}
16 changes: 16 additions & 0 deletions its/ruling/src/test/expected/jsts/TypeScript/javascript-S3403.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"TypeScript:lib/tsc.js": [
935,
4077,
6973,
36581,
36592,
38926,
48587,
48593
],
"TypeScript:lib/typingsInstaller.js": [
945,
4087
]
}
19 changes: 19 additions & 0 deletions its/ruling/src/test/expected/jsts/TypeScript/javascript-S3800.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"TypeScript:lib/tsc.js": [
21324,
21647,
24458,
27089,
28494,
29121,
29465,
30166,
30329,
30454,
30469,
36112,
38034,
43431,
44314
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"TypeScript:Jakefile.js": [
381,
703
]
}
261 changes: 261 additions & 0 deletions its/ruling/src/test/expected/jsts/TypeScript/javascript-S6582.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,261 @@
{
"TypeScript:Jakefile.js": [
44
],
"TypeScript:lib/tsc.js": [
116,
120,
756,
762,
1090,
1399,
1473,
1475,
1575,
1676,
1779,
2414,
4953,
4990,
5183,
5192,
5320,
5552,
5565,
5568,
5666,
5670,
5680,
5684,
6061,
6145,
6231,
6239,
6240,
6284,
6309,
6310,
6318,
6370,
6373,
6990,
7014,
7203,
7263,
7507,
7538,
8554,
8579,
8583,
8595,
8599,
9623,
10679,
10680,
10713,
10723,
10733,
10734,
10746,
10756,
10770,
10784,
10825,
10830,
11629,
11630,
11679,
12451,
16399,
17497,
17499,
17540,
17545,
17575,
18214,
18674,
18985,
18988,
19003,
19014,
19036,
19068,
19134,
19134,
20086,
20114,
20191,
20230,
20231,
20400,
20592,
20640,
20654,
20660,
21331,
21400,
21419,
21483,
21528,
21730,
22009,
22054,
22069,
22252,
22558,
22559,
22717,
22749,
22857,
22926,
22934,
22939,
23401,
23428,
23444,
23634,
23725,
24100,
24130,
24408,
24734,
25444,
25497,
25614,
25641,
25832,
26041,
26044,
26523,
26586,
26597,
26805,
26907,
27085,
27145,
30033,
30419,
30446,
30461,
30470,
30476,
30619,
31095,
31835,
32026,
32055,
32160,
32240,
32691,
32857,
32931,
33009,
33134,
33302,
33317,
34009,
35193,
35352,
35598,
35725,
37131,
37484,
37491,
37494,
37661,
37690,
37953,
38260,
38292,
38298,
38656,
38667,
38759,
38789,
38959,
40910,
41064,
41152,
41686,
41698,
43633,
43934,
44204,
44570,
44761,
45278,
46088,
46102,
46262,
46337,
47543,
47604,
48421,
48424,
48530,
48552,
48912,
48913,
48938,
48939,
48940,
49058,
49059,
49105,
49116,
49558,
50184,
50201,
50344,
50787,
51494,
52617,
52665,
53018,
53584,
54009,
54088,
54254,
55192,
55384,
55501,
55657,
55838,
56213,
56269,
56269
],
"TypeScript:lib/typingsInstaller.js": [
126,
130,
766,
772,
1100,
1409,
1483,
1485,
1585,
1686,
1789,
2424,
5529,
5721,
5838,
5994,
6175,
6260,
6576,
6604,
6681,
6720,
6721,
6890,
7082,
7130,
7144,
7150,
7215,
7705,
7705
]
}
Loading