Swift: update after generated parent-child changes

Author: redsun82

swift/ql/lib/codeql/swift/controlflow/internal/Scope.qll

@@ -1,5 +1,5 @@
 private import swift
-private import codeql.swift.generated.GetImmediateParent
+private import codeql.swift.generated.ParentChild
 private import codeql.swift.generated.Synth
 
 module CallableBase {

swift/ql/lib/codeql/swift/elements/AstNode.qll

@@ -1,6 +1,6 @@
 private import codeql.swift.generated.AstNode
 private import codeql.swift.elements.decl.AbstractFunctionDecl
-private import codeql.swift.generated.GetImmediateParent
+private import codeql.swift.generated.ParentChild
 
 private Element getEnclosingFunctionStep(Element e) {
   not e instanceof AbstractFunctionDecl and

swift/ql/test/library-tests/parent/no_double_parents.ql

@@ -1,9 +1,10 @@
 import swift
-import codeql.swift.generated.GetImmediateParent
+private import codeql.swift.generated.ParentChild
 
 from AstNode parent1, AstNode parent2, AstNode child
 where
   parent1 != parent2 and
-  child = getAnImmediateChild(parent1) and
-  child = getAnImmediateChild(parent2)
-select parent1.getPrimaryQlClasses(), parent2.getPrimaryQlClasses(), child.getPrimaryQlClasses()
+  child = getImmediateChildAndAccessor(parent1, _, _) and
+  child = getImmediateChildAndAccessor(parent2, _, _)
+select parent1, parent1.getPrimaryQlClasses(), parent2, parent2.getPrimaryQlClasses(), child,
+  child.getPrimaryQlClasses()

swift/ql/test/library-tests/parent/parent.ql

@@ -1,8 +1,9 @@
 import swift
-import codeql.swift.generated.GetImmediateParent
+import codeql.swift.generated.ParentChild
+import TestUtils
 
 from AstNode parent, AstNode child
 where
-  parent = getImmediateParent(child) and
-  parent.getLocation().getFile().getName().matches("%swift/ql/test%")
+  toBeTested(parent) and
+  parent = getImmediateParent(child)
 select parent, parent.getPrimaryQlClasses(), child, child.getPrimaryQlClasses()