Skip to content

Commit d8686e0

Browse files
committed
Update test expectations
1 parent 45ce988 commit d8686e0

File tree

6 files changed

+72
-72
lines changed

6 files changed

+72
-72
lines changed

java/ql/integration-tests/all-platforms/java/buildless-erroneous/diagnostics.expected

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"source": {
55
"extractorName": "java",
66
"id": "java/autobuilder/buildless/no-build-tool-advice",
7-
"name": "Java buildless mode found no usable build tool"
7+
"name": "Java analysis found no usable build tool"
88
},
99
"visibility": {
1010
"cliSummaryTable": true,
@@ -13,12 +13,12 @@
1313
}
1414
}
1515
{
16-
"markdownMessage": "Java buildless extraction has completed.",
16+
"markdownMessage": "Java analysis used the system default JDK.",
1717
"severity": "unknown",
1818
"source": {
1919
"extractorName": "java",
20-
"id": "java/autobuilder/buildless/complete",
21-
"name": "Java buildless extraction completed"
20+
"id": "java/autobuilder/buildless/jdk-system-default",
21+
"name": "Java analysis used the system default JDK"
2222
},
2323
"visibility": {
2424
"cliSummaryTable": true,
@@ -27,12 +27,12 @@
2727
}
2828
}
2929
{
30-
"markdownMessage": "Java buildless mode used the system default JDK.",
30+
"markdownMessage": "Java analysis with build-mode 'none' completed.",
3131
"severity": "unknown",
3232
"source": {
3333
"extractorName": "java",
34-
"id": "java/autobuilder/buildless/jdk-system-default",
35-
"name": "Java buildless mode used the system default JDK"
34+
"id": "java/autobuilder/buildless/complete",
35+
"name": "Java analysis with build-mode 'none' completed"
3636
},
3737
"visibility": {
3838
"cliSummaryTable": true,
@@ -41,12 +41,12 @@
4141
}
4242
}
4343
{
44-
"markdownMessage": "Java was extracted in buildless mode. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
44+
"markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
4545
"severity": "note",
4646
"source": {
4747
"extractorName": "java",
4848
"id": "java/autobuilder/buildless/mode-active",
49-
"name": "Java was extracted in buildless mode"
49+
"name": "Java was extracted with build-mode set to 'none'"
5050
},
5151
"visibility": {
5252
"cliSummaryTable": true,

java/ql/integration-tests/all-platforms/java/buildless-gradle/diagnostics.expected

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"markdownMessage": "Java buildless extraction has completed.",
2+
"markdownMessage": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies.",
33
"severity": "unknown",
44
"source": {
55
"extractorName": "java",
6-
"id": "java/autobuilder/buildless/complete",
7-
"name": "Java buildless extraction completed"
6+
"id": "java/autobuilder/buildless/using-build-tool-advice",
7+
"name": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies"
88
},
99
"visibility": {
1010
"cliSummaryTable": true,
@@ -13,12 +13,12 @@
1313
}
1414
}
1515
{
16-
"markdownMessage": "Java buildless mode used build tool Gradle to pick a JDK version and/or to recommend external dependencies.",
16+
"markdownMessage": "Java analysis used the system default JDK.",
1717
"severity": "unknown",
1818
"source": {
1919
"extractorName": "java",
20-
"id": "java/autobuilder/buildless/using-build-tool-advice",
21-
"name": "Java buildless mode used build tool Gradle to pick a JDK version and/or to recommend external dependencies"
20+
"id": "java/autobuilder/buildless/jdk-system-default",
21+
"name": "Java analysis used the system default JDK"
2222
},
2323
"visibility": {
2424
"cliSummaryTable": true,
@@ -27,12 +27,12 @@
2727
}
2828
}
2929
{
30-
"markdownMessage": "Java buildless mode used the system default JDK.",
30+
"markdownMessage": "Java analysis with build-mode 'none' completed.",
3131
"severity": "unknown",
3232
"source": {
3333
"extractorName": "java",
34-
"id": "java/autobuilder/buildless/jdk-system-default",
35-
"name": "Java buildless mode used the system default JDK"
34+
"id": "java/autobuilder/buildless/complete",
35+
"name": "Java analysis with build-mode 'none' completed"
3636
},
3737
"visibility": {
3838
"cliSummaryTable": true,
@@ -41,12 +41,12 @@
4141
}
4242
}
4343
{
44-
"markdownMessage": "Java was extracted in buildless mode. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
44+
"markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
4545
"severity": "note",
4646
"source": {
4747
"extractorName": "java",
4848
"id": "java/autobuilder/buildless/mode-active",
49-
"name": "Java was extracted in buildless mode"
49+
"name": "Java was extracted with build-mode set to 'none'"
5050
},
5151
"visibility": {
5252
"cliSummaryTable": true,
@@ -60,7 +60,7 @@
6060
"source": {
6161
"extractorName": "java",
6262
"id": "java/autobuilder/buildless/depgraph-provided-by-gradle",
63-
"name": "Java buildless mode extracted precise dependency graph information from tool Gradle"
63+
"name": "Java analysis extracted precise dependency graph information from tool Gradle"
6464
},
6565
"visibility": {
6666
"cliSummaryTable": true,

java/ql/integration-tests/all-platforms/java/buildless-maven-multimodule/diagnostics.expected

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"markdownMessage": "Java buildless extraction has completed.",
2+
"markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
33
"severity": "unknown",
44
"source": {
55
"extractorName": "java",
6-
"id": "java/autobuilder/buildless/complete",
7-
"name": "Java buildless extraction completed"
6+
"id": "java/autobuilder/buildless/using-build-tool-advice",
7+
"name": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies"
88
},
99
"visibility": {
1010
"cliSummaryTable": true,
@@ -13,12 +13,12 @@
1313
}
1414
}
1515
{
16-
"markdownMessage": "Java buildless mode used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
16+
"markdownMessage": "Java analysis used the system default JDK.",
1717
"severity": "unknown",
1818
"source": {
1919
"extractorName": "java",
20-
"id": "java/autobuilder/buildless/using-build-tool-advice",
21-
"name": "Java buildless mode used build tool Maven to pick a JDK version and/or to recommend external dependencies"
20+
"id": "java/autobuilder/buildless/jdk-system-default",
21+
"name": "Java analysis used the system default JDK"
2222
},
2323
"visibility": {
2424
"cliSummaryTable": true,
@@ -27,12 +27,12 @@
2727
}
2828
}
2929
{
30-
"markdownMessage": "Java buildless mode used the system default JDK.",
30+
"markdownMessage": "Java analysis with build-mode 'none' completed.",
3131
"severity": "unknown",
3232
"source": {
3333
"extractorName": "java",
34-
"id": "java/autobuilder/buildless/jdk-system-default",
35-
"name": "Java buildless mode used the system default JDK"
34+
"id": "java/autobuilder/buildless/complete",
35+
"name": "Java analysis with build-mode 'none' completed"
3636
},
3737
"visibility": {
3838
"cliSummaryTable": true,
@@ -41,12 +41,12 @@
4141
}
4242
}
4343
{
44-
"markdownMessage": "Java was extracted in buildless mode. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
44+
"markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
4545
"severity": "note",
4646
"source": {
4747
"extractorName": "java",
4848
"id": "java/autobuilder/buildless/mode-active",
49-
"name": "Java was extracted in buildless mode"
49+
"name": "Java was extracted with build-mode set to 'none'"
5050
},
5151
"visibility": {
5252
"cliSummaryTable": true,
@@ -60,7 +60,7 @@
6060
"source": {
6161
"extractorName": "java",
6262
"id": "java/autobuilder/buildless/depgraph-provided-by-maven",
63-
"name": "Java buildless mode extracted precise dependency graph information from tool Maven"
63+
"name": "Java analysis extracted precise dependency graph information from tool Maven"
6464
},
6565
"visibility": {
6666
"cliSummaryTable": true,

java/ql/integration-tests/all-platforms/java/buildless-maven/diagnostics.expected

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"markdownMessage": "Java buildless extraction has completed.",
2+
"markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
33
"severity": "unknown",
44
"source": {
55
"extractorName": "java",
6-
"id": "java/autobuilder/buildless/complete",
7-
"name": "Java buildless extraction completed"
6+
"id": "java/autobuilder/buildless/using-build-tool-advice",
7+
"name": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies"
88
},
99
"visibility": {
1010
"cliSummaryTable": true,
@@ -13,12 +13,12 @@
1313
}
1414
}
1515
{
16-
"markdownMessage": "Java buildless mode used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
16+
"markdownMessage": "Java analysis used the system default JDK.",
1717
"severity": "unknown",
1818
"source": {
1919
"extractorName": "java",
20-
"id": "java/autobuilder/buildless/using-build-tool-advice",
21-
"name": "Java buildless mode used build tool Maven to pick a JDK version and/or to recommend external dependencies"
20+
"id": "java/autobuilder/buildless/jdk-system-default",
21+
"name": "Java analysis used the system default JDK"
2222
},
2323
"visibility": {
2424
"cliSummaryTable": true,
@@ -27,12 +27,12 @@
2727
}
2828
}
2929
{
30-
"markdownMessage": "Java buildless mode used the system default JDK.",
30+
"markdownMessage": "Java analysis with build-mode 'none' completed.",
3131
"severity": "unknown",
3232
"source": {
3333
"extractorName": "java",
34-
"id": "java/autobuilder/buildless/jdk-system-default",
35-
"name": "Java buildless mode used the system default JDK"
34+
"id": "java/autobuilder/buildless/complete",
35+
"name": "Java analysis with build-mode 'none' completed"
3636
},
3737
"visibility": {
3838
"cliSummaryTable": true,
@@ -41,12 +41,12 @@
4141
}
4242
}
4343
{
44-
"markdownMessage": "Java was extracted in buildless mode. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
44+
"markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
4545
"severity": "note",
4646
"source": {
4747
"extractorName": "java",
4848
"id": "java/autobuilder/buildless/mode-active",
49-
"name": "Java was extracted in buildless mode"
49+
"name": "Java was extracted with build-mode set to 'none'"
5050
},
5151
"visibility": {
5252
"cliSummaryTable": true,
@@ -60,7 +60,7 @@
6060
"source": {
6161
"extractorName": "java",
6262
"id": "java/autobuilder/buildless/depgraph-provided-by-maven",
63-
"name": "Java buildless mode extracted precise dependency graph information from tool Maven"
63+
"name": "Java analysis extracted precise dependency graph information from tool Maven"
6464
},
6565
"visibility": {
6666
"cliSummaryTable": true,

java/ql/integration-tests/all-platforms/java/buildless-sibling-projects/diagnostics.expected

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"markdownMessage": "Java buildless extraction has completed.",
2+
"markdownMessage": "Java analysis dropped the following dependencies because a sibling project depends on a higher version:\n\n* `junit/junit-4.11`",
33
"severity": "unknown",
44
"source": {
55
"extractorName": "java",
6-
"id": "java/autobuilder/buildless/complete",
7-
"name": "Java buildless extraction completed"
6+
"id": "java/autobuilder/buildless/dependencies-disagree",
7+
"name": "Java analysis found sibling projects that disagree about some of their direct dependency versions"
88
},
99
"visibility": {
1010
"cliSummaryTable": true,
@@ -13,12 +13,12 @@
1313
}
1414
}
1515
{
16-
"markdownMessage": "Java buildless mode dropped the following dependencies because a sibling project depends on a higher version:\n\n* `junit/junit-4.11`",
16+
"markdownMessage": "Java analysis used JDK version 11.0.0 as recommended by build tool Gradle",
1717
"severity": "unknown",
1818
"source": {
1919
"extractorName": "java",
20-
"id": "java/autobuilder/buildless/dependencies-disagree",
21-
"name": "Java buildless mode found sibling projects that disagree about some of their direct dependency versions"
20+
"id": "java/autobuilder/buildless/jdk-selected",
21+
"name": "Java analysis used JDK version 11.0.0 as recommended by build tool Gradle"
2222
},
2323
"visibility": {
2424
"cliSummaryTable": true,
@@ -27,12 +27,12 @@
2727
}
2828
}
2929
{
30-
"markdownMessage": "Java buildless mode used JDK version 11.0.0 as recommended by build tool Gradle",
30+
"markdownMessage": "Java analysis used the highest recommended Java version out of:\n\n* Gradle at `<test-root-directory>/./gradle-sample` recommends version 8.0.0\n* Gradle at `<test-root-directory>/./gradle-sample2` recommends version 11.0.0",
3131
"severity": "unknown",
3232
"source": {
3333
"extractorName": "java",
34-
"id": "java/autobuilder/buildless/jdk-selected",
35-
"name": "Java buildless mode used JDK version 11.0.0 as recommended by build tool Gradle"
34+
"id": "java/autobuilder/buildless/jdk-version-disagree",
35+
"name": "Java analysis found sibling projects that disagree about the needed Java version. The highest recommended version will be used"
3636
},
3737
"visibility": {
3838
"cliSummaryTable": true,
@@ -41,12 +41,12 @@
4141
}
4242
}
4343
{
44-
"markdownMessage": "Java buildless mode used the highest recommended Java version out of:\n\n* Gradle at `<test-root-directory>/./gradle-sample` recommends version 8.0.0\n* Gradle at `<test-root-directory>/./gradle-sample2` recommends version 11.0.0",
44+
"markdownMessage": "Java analysis will combine recommended JDK versions and/or external dependency information from:\n\n* Gradle at `<test-root-directory>/./gradle-sample`\n* Gradle at `<test-root-directory>/./gradle-sample2`\n* Maven at `<test-root-directory>/./maven-project-1`\n* Maven at `<test-root-directory>/./maven-project-2`",
4545
"severity": "unknown",
4646
"source": {
4747
"extractorName": "java",
48-
"id": "java/autobuilder/buildless/jdk-version-disagree",
49-
"name": "Java buildless mode found sibling projects that disagree about the needed Java version. The highest recommended version will be used"
48+
"id": "java/autobuilder/buildless/using-build-tool-advice-multiple",
49+
"name": "Java analysis found several sibling projects and will combine their recommended JDK versions and/or external dependency information"
5050
},
5151
"visibility": {
5252
"cliSummaryTable": true,
@@ -55,12 +55,12 @@
5555
}
5656
}
5757
{
58-
"markdownMessage": "Java buildless mode will combine recommended JDK versions and/or external dependency information from:\n\n* Gradle at `<test-root-directory>/./gradle-sample`\n* Gradle at `<test-root-directory>/./gradle-sample2`\n* Maven at `<test-root-directory>/./maven-project-1`\n* Maven at `<test-root-directory>/./maven-project-2`",
58+
"markdownMessage": "Java analysis with build-mode 'none' completed.",
5959
"severity": "unknown",
6060
"source": {
6161
"extractorName": "java",
62-
"id": "java/autobuilder/buildless/using-build-tool-advice-multiple",
63-
"name": "Java buildless mode found several sibling projects and will combine their recommended JDK versions and/or external dependency information"
62+
"id": "java/autobuilder/buildless/complete",
63+
"name": "Java analysis with build-mode 'none' completed"
6464
},
6565
"visibility": {
6666
"cliSummaryTable": true,
@@ -69,12 +69,12 @@
6969
}
7070
}
7171
{
72-
"markdownMessage": "Java was extracted in buildless mode. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
72+
"markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
7373
"severity": "note",
7474
"source": {
7575
"extractorName": "java",
7676
"id": "java/autobuilder/buildless/mode-active",
77-
"name": "Java was extracted in buildless mode"
77+
"name": "Java was extracted with build-mode set to 'none'"
7878
},
7979
"visibility": {
8080
"cliSummaryTable": true,
@@ -88,7 +88,7 @@
8888
"source": {
8989
"extractorName": "java",
9090
"id": "java/autobuilder/buildless/depgraph-provided-by-multiple",
91-
"name": "Java buildless mode extracted precise dependency graph information from multiple build tools"
91+
"name": "Java analysis extracted precise dependency graph information from multiple build tools"
9292
},
9393
"visibility": {
9494
"cliSummaryTable": true,

0 commit comments

Comments
 (0)