Adjust test expectations

smowton · smowton · commit 140c3189e348 · 2024-02-29T14:59:46.000Z
diff --git a/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/ExtractorInformation.expected b/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/ExtractorInformation.expected
@@ -1,7 +1,12 @@
+| Number of calls with call target | 1 |
+| Number of calls with missing call target | 0 |
+| Number of expressions with known type | 0 |
+| Number of expressions with unknown type | 0 |
 | Number of files with extension jar | 1 |
 | Number of files with extension kt | 1 |
 | Number of lines of code | 2 |
 | Number of lines of code with extension kt | 2 |
+| Percentage of calls with call target | 100 |
 | Total number of lines | 3 |
 | Total number of lines with extension kt | 3 |
 | Uses Kotlin 2: false | 1 |
diff --git a/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin2/ExtractorInformation.expected b/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin2/ExtractorInformation.expected
@@ -1,7 +1,12 @@
+| Number of calls with call target | 1 |
+| Number of calls with missing call target | 0 |
+| Number of expressions with known type | 0 |
+| Number of expressions with unknown type | 0 |
 | Number of files with extension jar | 1 |
 | Number of files with extension kt | 1 |
 | Number of lines of code | 2 |
 | Number of lines of code with extension kt | 2 |
+| Percentage of calls with call target | 100 |
 | Total number of lines | 3 |
 | Total number of lines with extension kt | 3 |
 | Uses Kotlin 2: true | 1 |
diff --git a/java/ql/test/library-tests/errorexpr/Test.java b/java/ql/test/library-tests/errorexpr/Test.java
@@ -15,3 +15,4 @@ public int yieldWrapper(int x) {
 // Diagnostic Matches: Erroneous node in tree: (ERROR)
 // Diagnostic Matches: In file Test.java:8:15 no end location for JCMethodInvocation : yield(x)
 // Diagnostic Matches: 1 errors during annotation processing
+// Diagnostic Matches: Unknown or erroneous type for expression of kind ErrorExpr
diff --git a/java/ql/test/library-tests/errortype-with-params/Diags.expected b/java/ql/test/library-tests/errortype-with-params/Diags.expected
@@ -1 +1,2 @@
+| Test.java:1:30:1:48 | Unknown or erroneous type for expression of kind TypeAccess |
 | file://:0:0:0:0 | 1 errors during annotation processing |
diff --git a/java/ql/test/library-tests/errortype-with-params/ErrorTypes.expected b/java/ql/test/library-tests/errortype-with-params/ErrorTypes.expected
@@ -0,0 +1 @@
+| Test.java:1:30:1:48 | <TypeAccess of ErrorType> |
diff --git a/java/ql/test/library-tests/errortype-with-params/PrintAst.expected b/java/ql/test/library-tests/errortype-with-params/PrintAst.expected
@@ -2,5 +2,5 @@ Test.java:
 #    0| [CompilationUnit] Test
 #    1|   1: [Class] Test
 #-----|     -1: (Base Types)
-#    1|       0: [TypeAccess] <any>
+#    1|       0: [TypeAccess] <TypeAccess of ErrorType>
 #    1|         0: [TypeAccess] String
diff --git a/java/ql/test/library-tests/errortype-with-params/Test.java b/java/ql/test/library-tests/errortype-with-params/Test.java
@@ -1,3 +1,4 @@
 public class Test implements Unavailable<String> { }
 
 // Diagnostic Matches: 1 errors during annotation processing
+// Diagnostic Matches: Unknown or erroneous type for expression of kind TypeAccess
diff --git a/java/ql/test/library-tests/errortype/Diags.expected b/java/ql/test/library-tests/errortype/Diags.expected
@@ -1,3 +1,6 @@
 | Test.java:0:0:0:0 | 2 javac errors |
+| Test.java:6:5:6:15 | Unknown or erroneous type for expression of kind TypeAccess |
 | Test.java:6:23:6:39 | Unexpected symbol for constructor: new NoSuchClass() |
+| Test.java:6:23:6:39 | Unknown or erroneous type for expression of kind ClassInstanceCreation |
+| Test.java:6:27:6:37 | Unknown or erroneous type for expression of kind TypeAccess |
 | file://:0:0:0:0 | 2 errors during annotation processing |
diff --git a/java/ql/test/library-tests/errortype/ErrorTypes.expected b/java/ql/test/library-tests/errortype/ErrorTypes.expected
@@ -1 +1,4 @@
+| Test.java:6:5:6:15 | <TypeAccess of ErrorType> |
+| Test.java:6:23:6:39 | <ClassInstanceExpr that calls a missing constructor> |
+| Test.java:6:27:6:37 | <TypeAccess of ErrorType> |
 | Test.java:7:12:7:14 | nsc |
diff --git a/java/ql/test/library-tests/errortype/PrintAst.expected b/java/ql/test/library-tests/errortype/PrintAst.expected
@@ -7,9 +7,9 @@ Test.java:
 #    5|       3: [TypeAccess] NoSuchClass
 #    5|       5: [BlockStmt] { ... }
 #    6|         0: [LocalVariableDeclStmt] var ...;
-#    6|           0: [TypeAccess] NoSuchClass
+#    6|           0: [TypeAccess] <TypeAccess of ErrorType>
 #    6|           1: [LocalVariableDeclExpr] nsc
 #    6|             0: [ClassInstanceExpr] <ClassInstanceExpr that calls a missing constructor>
-#    6|               -3: [TypeAccess] NoSuchClass
+#    6|               -3: [TypeAccess] <TypeAccess of ErrorType>
 #    7|         1: [ReturnStmt] return ...
 #    7|           0: [VarAccess] nsc
diff --git a/java/ql/test/library-tests/errortype/Test.java b/java/ql/test/library-tests/errortype/Test.java
@@ -12,3 +12,5 @@ public NoSuchClass test() {
 // Diagnostic Matches: Unexpected symbol for constructor: new NoSuchClass()
 // Diagnostic Matches: 2 javac errors
 // Diagnostic Matches: 2 errors during annotation processing
+// Diagnostic Matches: Unknown or erroneous type for expression of kind TypeAccess
+// Diagnostic Matches: Unknown or erroneous type for expression of kind ClassInstanceCreation
diff --git a/java/ql/test/library-tests/unknown-method-reference-lhs/Diags.expected b/java/ql/test/library-tests/unknown-method-reference-lhs/Diags.expected
@@ -1,2 +1,4 @@
 | Test.java:0:0:0:0 | 1 javac errors |
 | Test.java:4:13:4:30 | Unable to extract method reference Unavailable.f()::g with no owner type |
+| Test.java:4:13:4:30 | Unknown or erroneous type for expression of kind MemberReference |
+| Test.java:4:13:4:30 | Unknown or erroneous type for expression of kind TypeAccess |
diff --git a/java/ql/test/library-tests/unknown-method-reference-lhs/Test.java b/java/ql/test/library-tests/unknown-method-reference-lhs/Test.java
@@ -8,3 +8,5 @@ public static void test() {
 
 // Diagnostic Matches: 1 javac errors
 // Diagnostic Matches: Unable to extract method reference Unavailable.f()::g with no owner type
+// Diagnostic Matches: Unknown or erroneous type for expression of kind MemberReference
+// Diagnostic Matches: Unknown or erroneous type for expression of kind TypeAccess

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+\| Test.java:1:30:1:48 \| Unknown or erroneous type for expression of kind TypeAccess \|`
`1`	`2`	`\| file://:0:0:0:0 \| 1 errors during annotation processing \|`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+\| Test.java:1:30:1:48 \| <TypeAccess of ErrorType> \|`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`public class Test implements Unavailable<String> { }`
`2`	`2`
`3`	`3`	`// Diagnostic Matches: 1 errors during annotation processing`
	`4`	`+// Diagnostic Matches: Unknown or erroneous type for expression of kind TypeAccess`