Swift: Add a test for Type.getABaseOrAliasedType.

Author: geoffw0

swift/ql/test/library-tests/elements/type/nominaltype/nominaltype.expected

@@ -1,13 +1,13 @@
 | nominaltype.swift:35:6:35:6 | a | A | A |  |
-| nominaltype.swift:36:6:36:6 | a_alias | A_alias | A | getAliasedType:A |
-| nominaltype.swift:37:6:37:6 | a_optional_alias | A_optional_alias | A? | getAliasedType:A? |
-| nominaltype.swift:38:6:38:6 | b1 | B1 | B1 | getABaseType:A |
-| nominaltype.swift:39:6:39:6 | b2 | B2 | B2 | getABaseType:A_alias |
-| nominaltype.swift:40:6:40:6 | b1_alias | B1_alias | B1 | getAliasedType:B1 |
-| nominaltype.swift:41:6:41:6 | b2_alias | B2_alias | B2 | getAliasedType:B2 |
+| nominaltype.swift:36:6:36:6 | a_alias | A_alias | A | getABaseOrAliasedType:A, getAliasedType:A |
+| nominaltype.swift:37:6:37:6 | a_optional_alias | A_optional_alias | Optional<A> | getABaseOrAliasedType:Optional<A>, getAliasedType:Optional<A> |
+| nominaltype.swift:38:6:38:6 | b1 | B1 | B1 | getABaseOrAliasedType:A, getABaseType:A |
+| nominaltype.swift:39:6:39:6 | b2 | B2 | B2 | getABaseOrAliasedType:A_alias, getABaseType:A_alias |
+| nominaltype.swift:40:6:40:6 | b1_alias | B1_alias | B1 | getABaseOrAliasedType:B1, getAliasedType:B1 |
+| nominaltype.swift:41:6:41:6 | b2_alias | B2_alias | B2 | getABaseOrAliasedType:B2, getAliasedType:B2 |
 | nominaltype.swift:42:6:42:6 | p | P | P |  |
 | nominaltype.swift:43:6:43:6 | p_alias | P_alias | P_alias |  |
-| nominaltype.swift:44:6:44:6 | c1 | C1 | C1 | getABaseType:P |
-| nominaltype.swift:45:6:45:6 | c2 | C2 | C2 | getABaseType:P_alias |
-| nominaltype.swift:46:6:46:6 | c1_alias | C1_alias | C1 | getAliasedType:C1 |
-| nominaltype.swift:47:6:47:6 | c2_alias | C2_alias | C2 | getAliasedType:C2 |
+| nominaltype.swift:44:6:44:6 | c1 | C1 | C1 | getABaseOrAliasedType:P, getABaseType:P |
+| nominaltype.swift:45:6:45:6 | c2 | C2 | C2 | getABaseOrAliasedType:P_alias, getABaseType:P_alias |
+| nominaltype.swift:46:6:46:6 | c1_alias | C1_alias | C1 | getABaseOrAliasedType:C1, getAliasedType:C1 |
+| nominaltype.swift:47:6:47:6 | c2_alias | C2_alias | C2 | getABaseOrAliasedType:C2, getAliasedType:C2 |

swift/ql/test/library-tests/elements/type/nominaltype/nominaltype.ql

@@ -4,6 +4,8 @@ string describe(Type t) {
   result = "getAliasedType:" + t.(TypeAliasType).getAliasedType()
   or
   result = "getABaseType:" + t.(NominalType).getABaseType()
+  or
+  result = "getABaseOrAliasedType:" + t.getABaseOrAliasedType()
 }
 
 from VarDecl v, Type t

swift/ql/test/library-tests/elements/type/nominaltype/nominaltypedecl.expected

@@ -1,6 +1,6 @@
 | nominaltype.swift:35:6:35:6 | a | A |  |
 | nominaltype.swift:36:6:36:6 | a_alias | A_alias | getAliasedType:A |
-| nominaltype.swift:37:6:37:6 | a_optional_alias | A_optional_alias | getAliasedType:A? |
+| nominaltype.swift:37:6:37:6 | a_optional_alias | A_optional_alias | getAliasedType:Optional<A> |
 | nominaltype.swift:38:6:38:6 | b1 | B1 | getABaseType:A |
 | nominaltype.swift:39:6:39:6 | b2 | B2 | getABaseType:A_alias |
 | nominaltype.swift:40:6:40:6 | b1_alias | B1_alias | getAliasedType:B1 |