Kotlin: Add an integration test for extractor information

igfoo · igfoo · commit deaf912cb87d · 2023-08-22T16:39:18.000+01:00
diff --git a/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/ExtractorInformation.expected b/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/ExtractorInformation.expected
@@ -0,0 +1,7 @@
+| Number of files with extension jar | 1 |
+| Number of files with extension kt | 1 |
+| Number of lines of code | 2 |
+| Number of lines of code with extension kt | 2 |
+| Total number of lines | 3 |
+| Total number of lines with extension kt | 3 |
+| Uses Kotlin 2: false | 1 |
diff --git a/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/ExtractorInformation.ext.yml b/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/ExtractorInformation.ext.yml
@@ -0,0 +1,13 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-queries
+      extensible: extractorInformationSkipKey
+    data:
+      # These will have unstable values, as they are dependent on the
+      # JDK that the test is run with, so filter them out:
+      - ["Number of files"]
+      - ["Number of files with extension class"]
+      # These depend on the Kotlin version you have installed
+      - ["Kotlin Compiler Version: %"]
+      - ["Kotlin Extractor Name: %"]
+
diff --git a/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/ExtractorInformation.qlref b/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/ExtractorInformation.qlref
@@ -0,0 +1 @@
+Telemetry/ExtractorInformation.ql
diff --git a/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/SomeClass.kt b/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/SomeClass.kt
@@ -0,0 +1,2 @@
+class SomeClass {
+}
diff --git a/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/test.py b/java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/test.py
@@ -0,0 +1,3 @@
+from create_database_utils import *
+
+run_codeql_database_create(["kotlinc SomeClass.kt"], lang="java")
diff --git a/java/ql/src/Telemetry/ExtractorInformation.ql b/java/ql/src/Telemetry/ExtractorInformation.ql
@@ -87,7 +87,7 @@ predicate extractorTotalDiagnostics(string key, int value) {
 
 from string key, int value
 where
-  not extractorInformationSkipKey(key) and
+  not exists(string pattern | extractorInformationSkipKey(pattern) and key.matches(pattern)) and
   (
     compilationInfo(key, value) or
     fileCount(key, value) or

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from create_database_utils import *`
	`2`	`+`
	`3`	`+run_codeql_database_create(["kotlinc SomeClass.kt"], lang="java")`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ predicate extractorTotalDiagnostics(string key, int value) {`
`87`	`87`
`88`	`88`	`from string key, int value`
`89`	`89`	`where`
`90`		`- not extractorInformationSkipKey(key) and`
	`90`	`+ not exists(string pattern \| extractorInformationSkipKey(pattern) and key.matches(pattern)) and`
`91`	`91`	`(`
`92`	`92`	`compilationInfo(key, value) or`
`93`	`93`	`fileCount(key, value) or`