Fix test cases featuring primitive arrays

smowton · smowton · commit b38a23daeea3 · 2021-08-31T15:12:47.000+01:00
Previously we couldn't print the name of types like `byte[]` for example.
diff --git a/java/ql/src/utils/FlowTestCase.qll b/java/ql/src/utils/FlowTestCase.qll
@@ -44,7 +44,7 @@ private class CallableToTest extends Callable {
       summaryModel(namespace, type, subtypes, name, signature, ext, _, _, _) and
       this = interpretElement(namespace, type, subtypes, name, signature, ext) and
       this.isPublic() and
-      getRootType(this.getDeclaringType()).isPublic()
+      getRootType(this.getDeclaringType()).(RefType).isPublic()
     )
   }
 }
diff --git a/java/ql/src/utils/FlowTestCaseUtils.qll b/java/ql/src/utils/FlowTestCaseUtils.qll
@@ -12,7 +12,7 @@ private import FlowTestCase
  */
 Type getRootSourceDeclaration(Type t) {
   if t instanceof RefType
-  then result = getRootType(replaceTypeVariable(t)).getSourceDeclaration()
+  then result = getRootType(replaceTypeVariable(t)).(RefType).getSourceDeclaration()
   else result = t
 }
 
@@ -77,7 +77,7 @@ predicate mayBeAmbiguous(Callable c) {
 /**
  * Returns the outermost type enclosing type `t` (which may be `t` itself).
  */
-RefType getRootType(RefType t) {
+Type getRootType(Type t) {
   if t instanceof NestedType
   then result = getRootType(t.(NestedType).getEnclosingType())
   else
@@ -95,9 +95,9 @@ string getShortNameIfPossible(Type t) {
   if t instanceof Array
   then result = getShortNameIfPossible(t.(Array).getComponentType()) + "[]"
   else (
-    getRootSourceDeclaration(t) = any(TestCase tc).getADesiredImport() and
     if t instanceof RefType
     then
+      getRootSourceDeclaration(t) = any(TestCase tc).getADesiredImport() and
       exists(RefType replaced, string nestedName |
         replaced = replaceTypeVariable(t).getSourceDeclaration() and
         nestedName = replaced.nestedName().replaceAll("$", ".")

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ private class CallableToTest extends Callable {`
`44`	`44`	`summaryModel(namespace, type, subtypes, name, signature, ext, _, _, _) and`
`45`	`45`	`this = interpretElement(namespace, type, subtypes, name, signature, ext) and`
`46`	`46`	`this.isPublic() and`
`47`		`- getRootType(this.getDeclaringType()).isPublic()`
	`47`	`+ getRootType(this.getDeclaringType()).(RefType).isPublic()`
`48`	`48`	`)`
`49`	`49`	`}`
`50`	`50`	`}`