C#: Update CIL consistency test

hvitved · hvitved · commit 6c5b30d2a4ee · 2020-09-11T11:49:07.000+02:00
diff --git a/csharp/ql/test/library-tests/cil/consistency/Handles.ql b/csharp/ql/test/library-tests/cil/consistency/Handles.ql
@@ -17,10 +17,18 @@ query predicate tooManyHandles(string s) {
   )
 }
 
+private class UniqueMetadataEntity extends MetadataEntity {
+  UniqueMetadataEntity() {
+    // Tuple types such as `(,)` and `ValueTuple`2` share the same handle
+    not this instanceof TupleType and
+    not this.getQualifiedName().matches("System.ValueTuple%")
+  }
+}
+
 query predicate tooManyMatchingHandles(string s) {
-  exists(MetadataEntity e, Assembly a, int handle |
+  exists(UniqueMetadataEntity e, Assembly a, int handle |
     metadata_handle(e, a, handle) and
-    strictcount(MetadataEntity e2 | metadata_handle(e2, a, handle)) > 2 and
+    strictcount(UniqueMetadataEntity e2 | metadata_handle(e2, a, handle)) > 2 and
     s = e.getQualifiedName()
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,18 @@ query predicate tooManyHandles(string s) {`
`17`	`17`	`)`
`18`	`18`	`}`
`19`	`19`
	`20`	`+private class UniqueMetadataEntity extends MetadataEntity {`
	`21`	`+ UniqueMetadataEntity() {`
	`22`	+ // Tuple types such as `(,)` and `ValueTuple`2` share the same handle
	`23`	`+ not this instanceof TupleType and`
	`24`	`+ not this.getQualifiedName().matches("System.ValueTuple%")`
	`25`	`+ }`
	`26`	`+}`
	`27`	`+`
`20`	`28`	`query predicate tooManyMatchingHandles(string s) {`
`21`		`- exists(MetadataEntity e, Assembly a, int handle \|`
	`29`	`+ exists(UniqueMetadataEntity e, Assembly a, int handle \|`
`22`	`30`	`metadata_handle(e, a, handle) and`
`23`		`- strictcount(MetadataEntity e2 \| metadata_handle(e2, a, handle)) > 2 and`
	`31`	`+ strictcount(UniqueMetadataEntity e2 \| metadata_handle(e2, a, handle)) > 2 and`
`24`	`32`	`s = e.getQualifiedName()`
`25`	`33`	`)`
`26`	`34`	`}`