C#: Use {get,has}FullyQualifiedName throughout

Author: hvitved

csharp/ql/examples/snippets/catch_exception.ql

@@ -10,5 +10,5 @@
 import csharp
 
 from CatchClause catch
-where catch.getCaughtExceptionType().hasQualifiedName("System.IO", "IOException")
+where catch.getCaughtExceptionType().hasFullyQualifiedName("System.IO", "IOException")
 select catch

csharp/ql/examples/snippets/constructor_call.ql

@@ -10,5 +10,5 @@
 import csharp
 
 from ObjectCreation new
-where new.getObjectType().hasQualifiedName("System", "Exception")
+where new.getObjectType().hasFullyQualifiedName("System", "Exception")
 select new

csharp/ql/examples/snippets/extend_class.ql

@@ -13,5 +13,5 @@
 import csharp
 
 from RefType type
-where type.getABaseType+().hasQualifiedName("System.Collections", "IEnumerator")
+where type.getABaseType+().hasFullyQualifiedName("System.Collections", "IEnumerator")
 select type

csharp/ql/examples/snippets/field_read.ql

@@ -11,6 +11,6 @@ import csharp
 from Field f, FieldRead read
 where
   f.hasName("VirtualAddress") and
-  f.getDeclaringType().hasQualifiedName("Mono.Cecil.PE", "Section") and
+  f.getDeclaringType().hasFullyQualifiedName("Mono.Cecil.PE", "Section") and
   f = read.getTarget()
 select read

csharp/ql/examples/snippets/method_call.ql

@@ -12,5 +12,5 @@ from MethodCall call, Method method
 where
   call.getTarget() = method and
   method.hasName("MethodName") and
-  method.getDeclaringType().hasQualifiedName("Company", "Class")
+  method.getDeclaringType().hasFullyQualifiedName("Company", "Class")
 select call

csharp/ql/examples/snippets/null_argument.ql

@@ -17,6 +17,6 @@ where
   add.hasName("Add") and
   add.getDeclaringType()
       .getUnboundDeclaration()
-      .hasQualifiedName("System.Collections.Generic", "ICollection<>") and
+      .hasFullyQualifiedName("System.Collections.Generic", "ICollection`1") and
   call.getAnArgument() instanceof NullLiteral
 select call

csharp/ql/examples/snippets/override_method.ql

@@ -11,6 +11,6 @@ import csharp
 from Method override, Method base
 where
   base.hasName("ToString") and
-  base.getDeclaringType().hasQualifiedName("System", "Object") and
+  base.getDeclaringType().hasFullyQualifiedName("System", "Object") and
   base.getAnOverrider() = override
 select override

csharp/ql/examples/snippets/throw_exception.ql

@@ -9,5 +9,6 @@
 import csharp
 
 from ThrowStmt throw
-where throw.getThrownExceptionType().getBaseClass*().hasQualifiedName("System.IO", "IOException")
+where
+  throw.getThrownExceptionType().getBaseClass*().hasFullyQualifiedName("System.IO", "IOException")
 select throw

csharp/ql/integration-tests/all-platforms/diag_recursive_generics/Types.ql

@@ -2,4 +2,4 @@ import csharp
 
 from Class c
 where c.fromSource()
-select c, c.getBaseClass().getQualifiedName()
+select c, c.getBaseClass().getFullyQualifiedName()

csharp/ql/lib/Linq/Helpers.qll

@@ -21,12 +21,14 @@ private int numStmts(ForeachStmt fes) {
 }
 
 /** Holds if the type's qualified name is "System.Linq.Enumerable" */
-predicate isEnumerableType(ValueOrRefType t) { t.hasQualifiedName("System.Linq", "Enumerable") }
+predicate isEnumerableType(ValueOrRefType t) {
+  t.hasFullyQualifiedName("System.Linq", "Enumerable")
+}
 
 /** Holds if the type's qualified name starts with "System.Collections.Generic.IEnumerable" */
 predicate isIEnumerableType(ValueOrRefType t) {
   exists(string type |
-    t.hasQualifiedName("System.Collections.Generic", type) and
+    t.hasFullyQualifiedName("System.Collections.Generic", type) and
     type.matches("IEnumerable%")
   )
 }
@@ -159,7 +161,7 @@ class AnyCall extends MethodCall {
     exists(Method m |
       m = this.getTarget().getUnboundDeclaration() and
       isEnumerableType(m.getDeclaringType()) and
-      m.hasName("Any<>")
+      m.hasName("Any`1")
     )
   }
 }
@@ -170,7 +172,7 @@ class CountCall extends MethodCall {
     exists(Method m |
       m = this.getTarget().getUnboundDeclaration() and
       isEnumerableType(m.getDeclaringType()) and
-      m.hasName("Count<>")
+      m.hasName("Count`1")
     )
   }
 }
@@ -186,7 +188,7 @@ class SelectCall extends ExtensionMethodCall {
     exists(Method m |
       m = this.getTarget().getUnboundDeclaration() and
       isEnumerableType(m.getDeclaringType()) and
-      m.hasName("Select<,>")
+      m.hasName("Select`2")
     )
   }