Always use source declarations (i.e, raw types) when naming types in tests

smowton · smowton · commit 617201930db6 · 2021-06-29T15:59:13.000+01:00
diff --git a/java/ql/src/utils/GenerateFlowTestCase.qll b/java/ql/src/utils/GenerateFlowTestCase.qll
@@ -293,7 +293,7 @@ string getShortNameIfPossible(Type t) {
   if t instanceof RefType
   then
     exists(RefType replaced, string nestedName |
-      replaced = replaceTypeVariable(t) and
+      replaced = replaceTypeVariable(t).getSourceDeclaration() and
       nestedName = replaced.nestedName().replaceAll("$", ".")
     |
       if isImportable(getRootSourceDeclaration(t))

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ string getShortNameIfPossible(Type t) {`
`293`	`293`	`if t instanceof RefType`
`294`	`294`	`then`
`295`	`295`	`exists(RefType replaced, string nestedName \|`
`296`		`- replaced = replaceTypeVariable(t) and`
	`296`	`+ replaced = replaceTypeVariable(t).getSourceDeclaration() and`
`297`	`297`	`nestedName = replaced.nestedName().replaceAll("$", ".")`
`298`	`298`	`\|`
`299`	`299`	`if isImportable(getRootSourceDeclaration(t))`