Skip to content

Swift: Make file checking in tests more strict #19344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jketema merged 1 commit into from
Apr 22, 2025
Merged

Swift: Make file checking in tests more strict #19344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion swift/ql/test/TestUtils.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import codeql.swift.elements.expr.internal.DotSyntaxCallExpr

cached
predicate toBeTested(Element e) {
e instanceof File
e instanceof File and
(exists(e.(File).getRelativePath()) or e instanceof UnknownFile)
or
e instanceof ParameterizedProtocolType
or
Expand Down
2 changes: 1 addition & 1 deletion swift/ql/test/library-tests/elements/decl/enumdecl/enumdecl.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ string describe(Decl d) {
}

from Decl d
where d.getLocation().getFile().getName() != ""
where exists(d.getLocation().getFile().getRelativePath())
select d, strictconcat(describe(d), ", ")
2 changes: 1 addition & 1 deletion swift/ql/test/library-tests/elements/decl/function/function.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ string describe(Function f) {

from Function f
where
not f.getFile() instanceof UnknownFile and
exists(f.getFile().getRelativePath()) and
not f.getName().matches("%init%")
select f, concat(describe(f), ", ")
2 changes: 1 addition & 1 deletion swift/ql/test/library-tests/elements/type/nominaltype/nominaltype.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ string describe(Type t) {

from VarDecl v, Type t
where
v.getLocation().getFile().getBaseName() != "" and
exists(v.getLocation().getFile().getRelativePath()) and
not v.getName() = "self" and
t = v.getType()
select v, t.toString(), concat(describe(t), ", ")
2 changes: 1 addition & 1 deletion swift/ql/test/library-tests/elements/type/nominaltype/nominaltypedecl.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ string describe(TypeDecl td) {

from VarDecl v, TypeDecl td
where
v.getLocation().getFile().getBaseName() != "" and
exists(v.getLocation().getFile().getRelativePath()) and
not v.getName() = "self" and
(
td = v.getType().(NominalType).getDeclaration() or
Expand Down
2 changes: 1 addition & 1 deletion swift/ql/test/library-tests/elements/type/numerictype/numerictype.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ string describe(Type t) {

from VarDecl v, Type t
where
v.getLocation().getFile().getBaseName() != "" and
exists(v.getLocation().getFile().getRelativePath()) and
t = v.getType()
select v, t.toString(), concat(describe(t), ", ")
2 changes: 1 addition & 1 deletion swift/ql/test/library-tests/elements/type/pointertypes/pointertypes.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ string describe(Type t) {

from VarDecl v, Type t
where
v.getLocation().getFile().getBaseName() != "" and
exists(v.getLocation().getFile().getRelativePath()) and
t = v.getType()
select v, t.toString(), strictconcat(describe(t), ", ")
1 change: 1 addition & 0 deletions swift/ql/test/query-tests/Diagnostics/Info.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ import swift
string describe(File f) { (f.isSuccessfullyExtracted() and result = "isSuccessfullyExtracted") }

from File f
where exists(f.getRelativePath()) or f instanceof UnknownFile
select f, concat(f.getRelativePath(), ", "), concat(describe(f), ", ")
Loading