Swift: add cross-referencing test

AlexDenisov · AlexDenisov · commit 6d67ea267cb6 · 2022-06-15T08:44:38.000+02:00
diff --git a/swift/integration-tests/.gitignore b/swift/integration-tests/.gitignore
@@ -1,7 +1,7 @@
 .DS_Store
-/.build
-/Packages
-/*.xcodeproj
+.build
+Packages
+*.xcodeproj
 xcuserdata/
 DerivedData/
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/swift/integration-tests/cross-references/Classes.expected b/swift/integration-tests/cross-references/Classes.expected
@@ -0,0 +1 @@
+| Sources/cross-references/lib.swift:3:1:6:1 | C |
diff --git a/swift/integration-tests/cross-references/Classes.ql b/swift/integration-tests/cross-references/Classes.ql
@@ -0,0 +1,5 @@
+import swift
+
+from ClassDecl d
+where d.getLocation().getFile().getBaseName() != "Package.swift"
+select d
diff --git a/swift/integration-tests/cross-references/Constructors.expected b/swift/integration-tests/cross-references/Constructors.expected
@@ -0,0 +1,3 @@
+| Sources/cross-references/lib.swift:4:5:4:13 | init |
+| Sources/cross-references/lib.swift:14:8:14:8 | init |
+| Sources/cross-references/main.swift:11:8:11:8 | init |
diff --git a/swift/integration-tests/cross-references/Constructors.ql b/swift/integration-tests/cross-references/Constructors.ql
@@ -0,0 +1,5 @@
+import swift
+
+from ConstructorDecl d
+where d.getLocation().getFile().getBaseName() != "Package.swift"
+select d
diff --git a/swift/integration-tests/cross-references/Destructors.expected b/swift/integration-tests/cross-references/Destructors.expected
@@ -0,0 +1 @@
+| Sources/cross-references/lib.swift:5:5:5:13 | deinit |
diff --git a/swift/integration-tests/cross-references/Destructors.ql b/swift/integration-tests/cross-references/Destructors.ql
@@ -0,0 +1,5 @@
+import swift
+
+from DestructorDecl d
+where d.getLocation().getFile().getBaseName() != "Package.swift"
+select d
diff --git a/swift/integration-tests/cross-references/Enums.expected b/swift/integration-tests/cross-references/Enums.expected
@@ -0,0 +1 @@
+| Sources/cross-references/lib.swift:8:1:8:17 | E |
diff --git a/swift/integration-tests/cross-references/Enums.ql b/swift/integration-tests/cross-references/Enums.ql
@@ -0,0 +1,5 @@
+import swift
+
+from EnumDecl d
+where d.getLocation().getFile().getBaseName() != "Package.swift"
+select d
diff --git a/swift/integration-tests/cross-references/Functions.expected b/swift/integration-tests/cross-references/Functions.expected
@@ -0,0 +1,4 @@
+| Sources/cross-references/lib.swift:1:1:1:11 | f |
+| Sources/cross-references/lib.swift:17:8:19:1 | ~ |
+| Sources/cross-references/lib.swift:22:9:24:1 | ~ |
+| Sources/cross-references/lib.swift:27:1:29:1 | ~ |
diff --git a/swift/integration-tests/cross-references/Functions.ql b/swift/integration-tests/cross-references/Functions.ql
@@ -0,0 +1,5 @@
+import swift
+
+from FuncDecl f
+where f.getLocation().getFile().getBaseName() != "Package.swift"
+select f
diff --git a/swift/integration-tests/cross-references/Operators.expected b/swift/integration-tests/cross-references/Operators.expected
@@ -0,0 +1,3 @@
+| Sources/cross-references/lib.swift:16:8:16:17 | ~ |
+| Sources/cross-references/lib.swift:21:9:21:18 | ~ |
+| Sources/cross-references/lib.swift:26:7:26:16 | ~ |
diff --git a/swift/integration-tests/cross-references/Operators.ql b/swift/integration-tests/cross-references/Operators.ql
@@ -0,0 +1,5 @@
+import swift
+
+from OperatorDecl d
+where d.getLocation().getFile().getBaseName() != "Package.swift"
+select d
diff --git a/swift/integration-tests/cross-references/Package.swift b/swift/integration-tests/cross-references/Package.swift
@@ -0,0 +1,21 @@
+// swift-tools-version:5.5
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "cross-references",
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .executable(
+            name: "cross-references",
+            targets: ["cross-references"]),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .executableTarget(
+            name: "cross-references",
+            dependencies: []),
+    ]
+)
diff --git a/swift/integration-tests/cross-references/Protocols.expected b/swift/integration-tests/cross-references/Protocols.expected
@@ -0,0 +1 @@
+| Sources/cross-references/lib.swift:12:1:12:13 | P |
diff --git a/swift/integration-tests/cross-references/Protocols.ql b/swift/integration-tests/cross-references/Protocols.ql
@@ -0,0 +1,5 @@
+import swift
+
+from ProtocolDecl d
+where d.getLocation().getFile().getBaseName() != "Package.swift"
+select d
diff --git a/swift/integration-tests/cross-references/Sources/cross-references/lib.swift b/swift/integration-tests/cross-references/Sources/cross-references/lib.swift
@@ -0,0 +1,30 @@
+func f() {}
+
+class C {
+    init() {}
+    deinit {}
+}
+
+enum E { case e }
+
+let X = 42
+
+protocol P {}
+
+struct S : P {}
+
+prefix operator ~
+prefix func ~ (v: Int) -> Int {
+  return v
+}
+
+postfix operator ~
+postfix func ~(v: Int) -> Int {
+  return v
+}
+
+infix operator ~
+func ~(lhs: Int, rhs: Int) -> Int {
+    return lhs
+}
+
diff --git a/swift/integration-tests/cross-references/Sources/cross-references/main.swift b/swift/integration-tests/cross-references/Sources/cross-references/main.swift
@@ -0,0 +1,18 @@
+f()
+
+C()
+
+E.e
+
+X
+
+S()
+
+struct s : P {}
+
+~42
+
+42~
+
+15 ~ 42
+
diff --git a/swift/integration-tests/cross-references/Structs.expected b/swift/integration-tests/cross-references/Structs.expected
@@ -0,0 +1,2 @@
+| Sources/cross-references/lib.swift:14:1:14:15 | S |
+| Sources/cross-references/main.swift:11:1:11:15 | s |
diff --git a/swift/integration-tests/cross-references/Structs.ql b/swift/integration-tests/cross-references/Structs.ql
@@ -0,0 +1,5 @@
+import swift
+
+from StructDecl d
+where d.getLocation().getFile().getBaseName() != "Package.swift"
+select d
diff --git a/swift/integration-tests/cross-references/VarDecls.expected b/swift/integration-tests/cross-references/VarDecls.expected
@@ -0,0 +1,6 @@
+| Sources/cross-references/lib.swift:10:5:10:5 | X |
+| Sources/cross-references/lib.swift:10:5:10:5 | X |
+| Sources/cross-references/lib.swift:17:16:17:19 | v |
+| Sources/cross-references/lib.swift:22:16:22:19 | v |
+| Sources/cross-references/lib.swift:27:8:27:13 | lhs |
+| Sources/cross-references/lib.swift:27:18:27:23 | rhs |
diff --git a/swift/integration-tests/cross-references/VarDecls.ql b/swift/integration-tests/cross-references/VarDecls.ql
@@ -0,0 +1,5 @@
+import swift
+
+from VarDecl d
+where d.getLocation().getFile().getBaseName() != "Package.swift"
+select d
diff --git a/swift/integration-tests/cross-references/test.py b/swift/integration-tests/cross-references/test.py
@@ -0,0 +1,7 @@
+from create_database_utils import *
+
+run_codeql_database_create([
+ 'swift package clean',
+ 'swift build'
+], lang='swift')
+
diff --git a/swift/integration-tests/hello-world/test.expected b/swift/integration-tests/hello-world/test.expected
@@ -1 +1,2 @@
 | Sources/hello-world/hello_world.swift:0:0:0:0 | Sources/hello-world/hello_world.swift |
+| file://:0:0:0:0 |  |

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+\| Sources/cross-references/lib.swift:3:1:6:1 \| C \|`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+\| Sources/cross-references/lib.swift:4:5:4:13 \| init \|`
	`2`	`+\| Sources/cross-references/lib.swift:14:8:14:8 \| init \|`
	`3`	`+\| Sources/cross-references/main.swift:11:8:11:8 \| init \|`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+\| Sources/cross-references/lib.swift:5:5:5:13 \| deinit \|`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+\| Sources/cross-references/lib.swift:8:1:8:17 \| E \|`