Skip to content

Commit 260f185

Browse files
michaelnebelmichaelnebel
committed
C#: Update integration test expected output.
1 parent 2a47a4f commit 260f185

16 files changed

Lines changed: 178 additions & 224 deletions

File tree

‎csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.expected‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
| All NuGet feeds reachable | 1.0 |
2-
| Failed project restore with missing package error | 0.0 |
3-
| Failed project restore with package source error | 0.0 |
4-
| Failed solution restore with missing package error | 0.0 |
5-
| Failed solution restore with package source error | 0.0 |
6-
| Inherited NuGet feed count | 1.0 |
7-
| NuGet feed responsiveness checked | 1.0 |
8-
| Project files on filesystem | 1.0 |
9-
| Reachable fallback NuGet feed count | 1.0 |
10-
| Resource extraction enabled | 1.0 |
11-
| Restored .NET framework variants | 1.0 |
12-
| Restored projects through solution files | 0.0 |
13-
| Solution files on filesystem | 0.0 |
14-
| Source files generated | 2.0 |
15-
| Source files on filesystem | 1.0 |
16-
| Successfully restored project files | 1.0 |
17-
| Successfully restored solution files | 0.0 |
18-
| Unresolved references | 0.0 |
19-
| UseWPF set | 0.0 |
20-
| UseWindowsForms set | 0.0 |
21-
| WebView extraction enabled | 1.0 |
1+
| All NuGet feeds reachable | 1 |
2+
| Failed project restore with missing package error | 0 |
3+
| Failed project restore with package source error | 0 |
4+
| Failed solution restore with missing package error | 0 |
5+
| Failed solution restore with package source error | 0 |
6+
| Inherited NuGet feed count | 1 |
7+
| NuGet feed responsiveness checked | 1 |
8+
| Project files on filesystem | 1 |
9+
| Reachable fallback NuGet feed count | 1 |
10+
| Resource extraction enabled | 1 |
11+
| Restored .NET framework variants | 1 |
12+
| Restored projects through solution files | 0 |
13+
| Solution files on filesystem | 0 |
14+
| Source files generated | 2 |
15+
| Source files on filesystem | 1 |
16+
| Successfully restored project files | 1 |
17+
| Successfully restored solution files | 0 |
18+
| Unresolved references | 0 |
19+
| UseWPF set | 0 |
20+
| UseWindowsForms set | 0 |
21+
| WebView extraction enabled | 1 |

‎csharp/ql/integration-tests/all-platforms/standalone_resx/CompilationInfo.ql‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
import csharp
22
import semmle.code.csharp.commons.Diagnostics
33

4-
query predicate compilationInfo(string key, float value) {
4+
query predicate compilationInfo(string key, string value) {
55
key != "Resolved references" and
66
key != "Resolved assembly conflicts" and
77
not key.matches("Compiler diagnostic count for%") and
8-
exists(Compilation c, string infoKey, string infoValue | infoValue = c.getInfo(infoKey) |
9-
key = infoKey and
10-
value = infoValue.toFloat()
11-
or
12-
not exists(infoValue.toFloat()) and
13-
key = infoKey + ": " + infoValue and
14-
value = 1
15-
)
8+
value = any(Compilation c).getInfo(key)
169
}

‎csharp/ql/integration-tests/all-platforms/standalone_slnx/CompilationInfo.expected‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
| All NuGet feeds reachable | 1.0 |
2-
| Failed project restore with missing package error | 0.0 |
3-
| Failed project restore with package source error | 0.0 |
4-
| Failed solution restore with missing package error | 0.0 |
5-
| Failed solution restore with package source error | 0.0 |
6-
| Inherited NuGet feed count | 1.0 |
7-
| NuGet feed responsiveness checked | 1.0 |
8-
| Project files on filesystem | 2.0 |
9-
| Reachable fallback NuGet feed count | 1.0 |
10-
| Resource extraction enabled | 0.0 |
11-
| Restored .NET framework variants | 1.0 |
12-
| Restored projects through solution files | 2.0 |
13-
| Solution files on filesystem | 1.0 |
14-
| Source files generated | 1.0 |
15-
| Source files on filesystem | 2.0 |
16-
| Successfully restored project files | 0.0 |
17-
| Successfully restored solution files | 1.0 |
18-
| Unresolved references | 0.0 |
19-
| UseWPF set | 0.0 |
20-
| UseWindowsForms set | 0.0 |
21-
| WebView extraction enabled | 1.0 |
1+
| All NuGet feeds reachable | 1 |
2+
| Failed project restore with missing package error | 0 |
3+
| Failed project restore with package source error | 0 |
4+
| Failed solution restore with missing package error | 0 |
5+
| Failed solution restore with package source error | 0 |
6+
| Inherited NuGet feed count | 1 |
7+
| NuGet feed responsiveness checked | 1 |
8+
| Project files on filesystem | 2 |
9+
| Reachable fallback NuGet feed count | 1 |
10+
| Resource extraction enabled | 0 |
11+
| Restored .NET framework variants | 1 |
12+
| Restored projects through solution files | 2 |
13+
| Solution files on filesystem | 1 |
14+
| Source files generated | 1 |
15+
| Source files on filesystem | 2 |
16+
| Successfully restored project files | 0 |
17+
| Successfully restored solution files | 1 |
18+
| Unresolved references | 0 |
19+
| UseWPF set | 0 |
20+
| UseWindowsForms set | 0 |
21+
| WebView extraction enabled | 1 |

‎csharp/ql/integration-tests/all-platforms/standalone_slnx/CompilationInfo.ql‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
import csharp
22
import semmle.code.csharp.commons.Diagnostics
33

4-
query predicate compilationInfo(string key, float value) {
4+
query predicate compilationInfo(string key, string value) {
55
key != "Resolved references" and
66
key != "Resolved assembly conflicts" and
77
not key.matches(["Compiler diagnostic count for%", "Extractor message count for group%"]) and
8-
exists(Compilation c, string infoKey, string infoValue | infoValue = c.getInfo(infoKey) |
9-
key = infoKey and
10-
value = infoValue.toFloat()
11-
or
12-
not exists(infoValue.toFloat()) and
13-
key = infoKey + ": " + infoValue and
14-
value = 1
15-
)
8+
value = any(Compilation c).getInfo(key)
169
}

‎csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.expected‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
| All NuGet feeds reachable | 1.0 |
2-
| Failed project restore with missing package error | 0.0 |
3-
| Failed project restore with package source error | 0.0 |
4-
| Failed solution restore with missing package error | 0.0 |
5-
| Failed solution restore with package source error | 0.0 |
6-
| Inherited NuGet feed count | 1.0 |
7-
| NuGet feed responsiveness checked | 1.0 |
8-
| Project files on filesystem | 1.0 |
9-
| Reachable fallback NuGet feed count | 1.0 |
10-
| Resource extraction enabled | 0.0 |
11-
| Restored .NET framework variants | 1.0 |
12-
| Restored projects through solution files | 0.0 |
13-
| Solution files on filesystem | 0.0 |
14-
| Source files generated | 1.0 |
15-
| Source files on filesystem | 3.0 |
16-
| Successfully restored project files | 1.0 |
17-
| Successfully restored solution files | 0.0 |
18-
| Unresolved references | 0.0 |
19-
| UseWPF set | 0.0 |
20-
| UseWindowsForms set | 1.0 |
21-
| WebView extraction enabled | 1.0 |
1+
| All NuGet feeds reachable | 1 |
2+
| Failed project restore with missing package error | 0 |
3+
| Failed project restore with package source error | 0 |
4+
| Failed solution restore with missing package error | 0 |
5+
| Failed solution restore with package source error | 0 |
6+
| Inherited NuGet feed count | 1 |
7+
| NuGet feed responsiveness checked | 1 |
8+
| Project files on filesystem | 1 |
9+
| Reachable fallback NuGet feed count | 1 |
10+
| Resource extraction enabled | 0 |
11+
| Restored .NET framework variants | 1 |
12+
| Restored projects through solution files | 0 |
13+
| Solution files on filesystem | 0 |
14+
| Source files generated | 1 |
15+
| Source files on filesystem | 3 |
16+
| Successfully restored project files | 1 |
17+
| Successfully restored solution files | 0 |
18+
| Unresolved references | 0 |
19+
| UseWPF set | 0 |
20+
| UseWindowsForms set | 1 |
21+
| WebView extraction enabled | 1 |

‎csharp/ql/integration-tests/all-platforms/standalone_winforms/CompilationInfo.ql‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
import csharp
22
import semmle.code.csharp.commons.Diagnostics
33

4-
query predicate compilationInfo(string key, float value) {
4+
query predicate compilationInfo(string key, string value) {
55
key != "Resolved references" and
66
key != "Resolved assembly conflicts" and
77
not key.matches(["Compiler diagnostic count for%", "Extractor message count for group%"]) and
8-
exists(Compilation c, string infoKey, string infoValue | infoValue = c.getInfo(infoKey) |
9-
key = infoKey and
10-
value = infoValue.toFloat()
11-
or
12-
not exists(infoValue.toFloat()) and
13-
key = infoKey + ": " + infoValue and
14-
value = 1
15-
)
8+
value = any(Compilation c).getInfo(key)
169
}

‎csharp/ql/integration-tests/posix/standalone_dependencies_nuget_clear/CompilationInfo.expected‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
| All NuGet feeds reachable | 1.0 |
2-
| Failed project restore with missing package error | 0.0 |
3-
| Failed project restore with package source error | 0.0 |
4-
| Failed solution restore with missing package error | 0.0 |
5-
| Failed solution restore with package source error | 0.0 |
6-
| Inherited NuGet feed count | 1.0 |
7-
| NuGet feed responsiveness checked | 1.0 |
8-
| Project files on filesystem | 1.0 |
9-
| Reachable fallback NuGet feed count | 1.0 |
10-
| Resolved assembly conflicts | 0.0 |
11-
| Resource extraction enabled | 0.0 |
12-
| Restored .NET framework variants | 1.0 |
13-
| Restored projects through solution files | 0.0 |
14-
| Solution files on filesystem | 0.0 |
15-
| Source files generated | 0.0 |
16-
| Source files on filesystem | 1.0 |
17-
| Successfully restored project files | 1.0 |
18-
| Successfully restored solution files | 0.0 |
19-
| Unresolved references | 0.0 |
20-
| UseWPF set | 0.0 |
21-
| UseWindowsForms set | 0.0 |
22-
| WebView extraction enabled | 1.0 |
1+
| All NuGet feeds reachable | 1 |
2+
| Failed project restore with missing package error | 0 |
3+
| Failed project restore with package source error | 0 |
4+
| Failed solution restore with missing package error | 0 |
5+
| Failed solution restore with package source error | 0 |
6+
| Inherited NuGet feed count | 1 |
7+
| NuGet feed responsiveness checked | 1 |
8+
| Project files on filesystem | 1 |
9+
| Reachable fallback NuGet feed count | 1 |
10+
| Resolved assembly conflicts | 0 |
11+
| Resource extraction enabled | 0 |
12+
| Restored .NET framework variants | 1 |
13+
| Restored projects through solution files | 0 |
14+
| Solution files on filesystem | 0 |
15+
| Source files generated | 0 |
16+
| Source files on filesystem | 1 |
17+
| Successfully restored project files | 1 |
18+
| Successfully restored solution files | 0 |
19+
| Unresolved references | 0 |
20+
| UseWPF set | 0 |
21+
| UseWindowsForms set | 0 |
22+
| WebView extraction enabled | 1 |

‎csharp/ql/integration-tests/posix/standalone_dependencies_nuget_clear/CompilationInfo.ql‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
import csharp
22
import semmle.code.csharp.commons.Diagnostics
33

4-
query predicate compilationInfo(string key, float value) {
4+
query predicate compilationInfo(string key, string value) {
55
key != "Resolved references" and
66
not key.matches("Compiler diagnostic count for%") and
7-
exists(Compilation c, string infoKey, string infoValue | infoValue = c.getInfo(infoKey) |
8-
key = infoKey and
9-
value = infoValue.toFloat()
10-
or
11-
not exists(infoValue.toFloat()) and
12-
key = infoKey + ": " + infoValue and
13-
value = 1
14-
)
7+
value = any(Compilation c).getInfo(key)
158
}

‎csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/CompilationInfo.expected‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
| All NuGet feeds reachable | 0.0 |
2-
| Failed project restore with missing package error | 1.0 |
3-
| Failed project restore with package source error | 0.0 |
4-
| Failed solution restore with missing package error | 0.0 |
5-
| Failed solution restore with package source error | 0.0 |
6-
| Fallback nuget restore | 1.0 |
7-
| Inherited NuGet feed count | 1.0 |
8-
| NuGet feed responsiveness checked | 1.0 |
9-
| Project files on filesystem | 1.0 |
10-
| Reachable fallback NuGet feed count | 1.0 |
11-
| Resolved assembly conflicts | 7.0 |
12-
| Resource extraction enabled | 0.0 |
13-
| Restored .NET framework variants | 0.0 |
14-
| Restored projects through solution files | 0.0 |
15-
| Solution files on filesystem | 1.0 |
16-
| Source files generated | 0.0 |
17-
| Source files on filesystem | 1.0 |
18-
| Successfully ran fallback nuget restore | 1.0 |
19-
| Successfully restored project files | 0.0 |
20-
| Successfully restored solution files | 1.0 |
21-
| Unresolved references | 0.0 |
22-
| UseWPF set | 0.0 |
23-
| UseWindowsForms set | 0.0 |
24-
| WebView extraction enabled | 1.0 |
1+
| All NuGet feeds reachable | 0 |
2+
| Failed project restore with missing package error | 1 |
3+
| Failed project restore with package source error | 0 |
4+
| Failed solution restore with missing package error | 0 |
5+
| Failed solution restore with package source error | 0 |
6+
| Fallback nuget restore | 1 |
7+
| Inherited NuGet feed count | 1 |
8+
| NuGet feed responsiveness checked | 1 |
9+
| Project files on filesystem | 1 |
10+
| Reachable fallback NuGet feed count | 1 |
11+
| Resolved assembly conflicts | 7 |
12+
| Resource extraction enabled | 0 |
13+
| Restored .NET framework variants | 0 |
14+
| Restored projects through solution files | 0 |
15+
| Solution files on filesystem | 1 |
16+
| Source files generated | 0 |
17+
| Source files on filesystem | 1 |
18+
| Successfully ran fallback nuget restore | 1 |
19+
| Successfully restored project files | 0 |
20+
| Successfully restored solution files | 1 |
21+
| Unreachable NuGet feeds | https://abc.abc/packages/ |
22+
| Unresolved references | 0 |
23+
| UseWPF set | 0 |
24+
| UseWindowsForms set | 0 |
25+
| WebView extraction enabled | 1 |

‎csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/CompilationInfo.ql‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
import csharp
22
import semmle.code.csharp.commons.Diagnostics
33

4-
query predicate compilationInfo(string key, float value) {
4+
query predicate compilationInfo(string key, string value) {
55
key != "Resolved references" and
66
not key.matches("Compiler diagnostic count for%") and
7-
exists(Compilation c, string infoKey, string infoValue | infoValue = c.getInfo(infoKey) |
8-
key = infoKey and
9-
value = infoValue.toFloat()
10-
or
11-
not exists(infoValue.toFloat()) and
12-
key = infoKey + ": " + infoValue and
13-
value = 1
14-
)
7+
value = any(Compilation c).getInfo(key)
158
}

0 commit comments

Comments
 (0)