Merge pull request #19346 from jketema/swift-files-2

Swift: Make file checking in integration tests more strict

Author: jketema

swift/ql/integration-tests/autobuilder/xcode-fails-spm-works/Files.ql

@@ -1,4 +1,5 @@
 import swift
 
 from File f
+where exists(f.getRelativePath()) or f instanceof UnknownFile
 select f

swift/ql/integration-tests/osx/canonical-case/Files.ql

@@ -1,4 +1,5 @@
 import swift
 
 from File f
+where exists(f.getRelativePath()) or f instanceof UnknownFile
 select f

swift/ql/integration-tests/osx/hello-ios/Files.ql

@@ -1,4 +1,5 @@
 import swift
 
 from File f
+where exists(f.getRelativePath()) or f instanceof UnknownFile
 select f

swift/ql/integration-tests/osx/hello-xcode/Files.ql

@@ -1,4 +1,5 @@
 import swift
 
 from File f
+where exists(f.getRelativePath()) or f instanceof UnknownFile
 select f

swift/ql/integration-tests/posix/cross-references/Classes.ql

@@ -1,5 +1,7 @@
 import swift
 
 from ClassDecl d
-where d.getLocation().getFile().getBaseName() != "Package.swift"
+where
+  d.getLocation().getFile().getBaseName() != "Package.swift" and
+  exists(d.getLocation().getFile().getRelativePath())
 select d

swift/ql/integration-tests/posix/cross-references/Deinitializers.ql

@@ -1,5 +1,7 @@
 import swift
 
 from Deinitializer d
-where d.getLocation().getFile().getBaseName() != "Package.swift"
+where
+  d.getLocation().getFile().getBaseName() != "Package.swift" and
+  exists(d.getLocation().getFile().getRelativePath())
 select d

swift/ql/integration-tests/posix/cross-references/Enums.ql

@@ -1,5 +1,7 @@
 import swift
 
 from EnumDecl d
-where d.getLocation().getFile().getBaseName() != "Package.swift"
+where
+  d.getLocation().getFile().getBaseName() != "Package.swift" and
+  exists(d.getLocation().getFile().getRelativePath())
 select d

swift/ql/integration-tests/posix/cross-references/Functions.ql

@@ -1,5 +1,7 @@
 import codeql.swift.elements.decl.internal.AccessorOrNamedFunction
 
 from AccessorOrNamedFunction f
-where f.getLocation().getFile().getBaseName() != "Package.swift"
+where
+  f.getLocation().getFile().getBaseName() != "Package.swift" and
+  exists(f.getLocation().getFile().getRelativePath())
 select f

swift/ql/integration-tests/posix/cross-references/Initializers.ql

@@ -1,5 +1,7 @@
 import swift
 
 from Initializer d
-where d.getLocation().getFile().getBaseName() != "Package.swift"
+where
+  d.getLocation().getFile().getBaseName() != "Package.swift" and
+  exists(d.getLocation().getFile().getRelativePath())
 select d

swift/ql/integration-tests/posix/cross-references/Protocols.ql

@@ -1,5 +1,7 @@
 import swift
 
 from ProtocolDecl d
-where d.getLocation().getFile().getBaseName() != "Package.swift"
+where
+  d.getLocation().getFile().getBaseName() != "Package.swift" and
+  exists(d.getLocation().getFile().getRelativePath())
 select d