Merge branch 'main' into copilot/conversion-of-codeql-queries

Java: Update expected test results after extractor changes

java/ql/integration-tests/java/buildless-erroneous/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Because no usable build tool (Gradle, Maven, etc) was found, build scripts could not be queried for guidance about the appropriate JDK version for the code being extracted, or precise dependency information. The default JDK will be used, and external dependencies will be inferred from the Java package names used.",
   "severity": "unknown",

java/ql/integration-tests/java/buildless-gradle-boms/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",

java/ql/integration-tests/java/buildless-gradle-classifiers/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",

java/ql/integration-tests/java/buildless-gradle-timeout/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "A Gradle process was aborted because it didn't write to the console for 5 seconds. Consider either lengthening the timeout if appropriate by setting CODEQL_EXTRACTOR_JAVA_BUILDLESS_CHILD_PROCESS_IDLE_TIMEOUT to a higher value or zero for no timeout, or else investigate why Gradle timed out. Java analysis will continue, but the analysis may be of reduced quality.",
   "severity": "note",

java/ql/integration-tests/java/buildless-gradle/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",

java/ql/integration-tests/java/buildless-inherit-trust-store/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",

java/ql/integration-tests/java/buildless-maven-executable-war/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",

java/ql/integration-tests/java/buildless-maven-existing-settings-xml/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",

java/ql/integration-tests/java/buildless-maven-mirrorof/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",

java/ql/integration-tests/java/buildless-maven-multimodule/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",

java/ql/integration-tests/java/buildless-maven-timeout/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "A Maven process was aborted because it didn't write to the console for 5 seconds. Consider either lenghtening the timeout if appropriate by setting CODEQL_EXTRACTOR_JAVA_BUILDLESS_CHILD_PROCESS_IDLE_TIMEOUT to a higher value or zero for no timeout, or else investigate why Maven timed out. Java analysis will continue, but the analysis may be of reduced quality.",
   "severity": "note",

java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "At least one dependency JAR suggested by the build system could not be downloaded. This means the analysis will try to satisfy the dependency with its default choice for the required external package name, which may be the wrong version or the wrong package entirely. This may lead to partial analysis of code using this dependency. See the extraction log for full details. If the cause appears to be a temporary outage, consider retrying the analysis.",
   "severity": "note",

java/ql/integration-tests/java/buildless-maven-tolerate-unavailable-dependency/test.py

@@ -1,4 +1,4 @@
-def test(codeql, java):
+def test(codeql, java, check_diagnostics_java):
     codeql.database.create(
         build_mode="none",
     )

java/ql/integration-tests/java/buildless-maven/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",

java/ql/integration-tests/java/buildless-proxy-gradle/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",

java/ql/integration-tests/java/buildless-proxy-maven/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",

java/ql/integration-tests/java/buildless-sibling-projects/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Java analysis dropped the following dependencies because a sibling project depends on a higher version:\n\n* `junit/junit-4.11`",
   "severity": "unknown",

java/ql/integration-tests/java/buildless/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Because no usable build tool (Gradle, Maven, etc) was found, build scripts could not be queried for guidance about the appropriate JDK version for the code being extracted, or precise dependency information. The default JDK will be used, and external dependencies will be inferred from the Java package names used.",
   "severity": "unknown",

java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/diagnostics.expected

@@ -1,3 +1,21 @@
+{
+  "attributes": {
+    "java_vendor": "__REDACTED__",
+    "java_version": "11.0.31"
+  },
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Analyzed a Gradle project without the [Gradle wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html). This may use an incompatible version of Gradle.",
   "severity": "warning",

java/ql/integration-tests/java/gradle-sample-without-wrapper-or-gradle-buildless/test.py

@@ -4,7 +4,8 @@ import pathlib
 
 
 # The version of gradle used doesn't work on java 17
-def test(codeql, use_java_11, java, environment):
+def test(codeql, use_java_11, java, environment, check_diagnostics):
+    check_diagnostics.redact += ["attributes.java_vendor"]
     gradle_override_dir = pathlib.Path(tempfile.mkdtemp())
     if runs_on.windows:
         (gradle_override_dir / "gradle.bat").write_text("@echo off\nexit /b 2\n")

java/ql/integration-tests/java/maven-download-failure/diagnostics.expected

@@ -1,3 +1,18 @@
+{
+  "attributes": {},
+  "markdownMessage": "Internal telemetry for the Java extractor.\n\nNo action needed.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor/summary",
+    "name": "Java extractor telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
 {
   "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",

java/ql/integration-tests/java/maven-download-failure/test.py

@@ -2,7 +2,7 @@ import os
 import os.path
 import shutil
 
-def test(codeql, java, check_diagnostics):
+def test(codeql, java, check_diagnostics_java):
 
     # Avoid shutil resolving mvn to the wrapper script in the test dir:
     os.environ["NoDefaultCurrentDirectoryInExePath"] = "0"

misc/codegen/requirements_lock.txt

@@ -14,7 +14,7 @@ pluggy==1.5.0
     # via pytest
 pystache==0.6.8
     # via -r misc/codegen/requirements_in.txt
-pytest==9.0.3
+pytest==8.3.5
     # via -r misc/codegen/requirements_in.txt
 pyyaml==6.0.2
     # via -r misc/codegen/requirements_in.txt

python/ql/test/2/query-tests/Classes/inconsistent-mro/InconsistentMRO.qlref

@@ -1 +1,2 @@
-Classes/InconsistentMRO.ql
+query: Classes/InconsistentMRO.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Classes/inconsistent-mro/inconsistent_mro.py

@@ -6,7 +6,7 @@ class X(object):
 class Y(X):
     pass
 
-class Z(X, Y):
+class Z(X, Y): # $ Alert
     pass
     
 class O:

python/ql/test/2/query-tests/Classes/new-style/PropertyInOldStyleClass.qlref

@@ -1 +1,2 @@
-Classes/PropertyInOldStyleClass.ql
+query: Classes/PropertyInOldStyleClass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Classes/new-style/SlotsInOldStyleClass.qlref

@@ -1 +1,2 @@
-Classes/SlotsInOldStyleClass.ql
+query: Classes/SlotsInOldStyleClass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Classes/new-style/SuperInOldStyleClass.qlref

@@ -1 +1,2 @@
-Classes/SuperInOldStyleClass.ql
+query: Classes/SuperInOldStyleClass.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Classes/new-style/newstyle_test.py

@@ -1,7 +1,7 @@
 
 #Only works for Python2
 
-class OldStyle1:
+class OldStyle1: # $ Alert[py/slots-in-old-style-class]
 
     __slots__ = [ 'a', 'b' ]
 
@@ -12,7 +12,7 @@ class OldStyle1:
 class OldStyle2:
 
     def __init__(self, x):
-        super().__init__(x)
+        super().__init__(x) # $ Alert[py/super-in-old-style]
 
 class NewStyle1(object):
 

python/ql/test/2/query-tests/Classes/new-style/property_old_style.py

@@ -5,6 +5,6 @@ class OldStyle:
     def __init__(self, x):
         self._x = x
 
-    @property
+    @property # $ Alert[py/property-in-old-style-class]
     def piosc(self):
         return self._x

python/ql/test/2/query-tests/Classes/undefined-attribute/MaybeUndefinedClassAttribute.qlref

@@ -1 +1,2 @@
-Classes/MaybeUndefinedClassAttribute.ql
+query: Classes/MaybeUndefinedClassAttribute.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Classes/undefined-attribute/UndefinedClassAttribute.qlref

@@ -1 +1,2 @@
-Classes/UndefinedClassAttribute.ql
+query: Classes/UndefinedClassAttribute.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/general/CatchingBaseException.qlref

@@ -1 +1,2 @@
-Exceptions/CatchingBaseException.ql
+query: Exceptions/CatchingBaseException.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/general/EmptyExcept.qlref

@@ -1 +1,2 @@
-Exceptions/EmptyExcept.ql
+query: Exceptions/EmptyExcept.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/general/IllegalExceptionHandlerType.qlref

@@ -1 +1,2 @@
-Exceptions/IllegalExceptionHandlerType.ql
+query: Exceptions/IllegalExceptionHandlerType.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/general/IllegalRaise.qlref

@@ -1 +1,2 @@
-Exceptions/IllegalRaise.ql
+query: Exceptions/IllegalRaise.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/general/IncorrectExceptOrder.qlref

@@ -1 +1,2 @@
-Exceptions/IncorrectExceptOrder.ql
+query: Exceptions/IncorrectExceptOrder.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/general/exceptions_test.py

@@ -14,4 +14,4 @@ def raise_tuple(cond):
         raise (Exception, "bananas", 17)
     else:
         #This is an error
-        raise (17, "bananas", Exception)
+        raise (17, "bananas", Exception) # $ Alert[py/illegal-raise]

python/ql/test/2/query-tests/Exceptions/generators/UnguardedNextInGenerator.qlref

@@ -1 +1,2 @@
-Exceptions/UnguardedNextInGenerator.ql
+query: Exceptions/UnguardedNextInGenerator.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/generators/test.py

@@ -2,12 +2,12 @@
 
 def bad1(it):
     while True:
-        yield next(it)
+        yield next(it) # $ Alert
 
 def bad2(seq):
     it = iter(seq)
     #Not OK as seq  may be empty
-    raise KeyError(next(it))
+    raise KeyError(next(it)) # $ Alert
     yield 0
 
 def ok1(seq):

python/ql/test/2/query-tests/Exceptions/raising/RaisingTuple.qlref

@@ -1 +1,2 @@
-Exceptions/RaisingTuple.ql
+query: Exceptions/RaisingTuple.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Exceptions/raising/test.py

@@ -5,11 +5,11 @@ def ok():
 
 def bad1():
     ex = Exception, "message"
-    raise ex
+    raise ex # $ Alert
 
 def bad2():
-    raise (Exception, "message")
+    raise (Exception, "message") # $ Alert
 
 def bad3():
     ex = Exception, 
-    raise ex, "message"
+    raise ex, "message" # $ Alert

python/ql/test/2/query-tests/Expressions/TruncatedDivision.qlref

@@ -1 +1,2 @@
-Expressions/TruncatedDivision.ql
+query: Expressions/TruncatedDivision.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Expressions/TruncatedDivision_test.py

@@ -62,14 +62,14 @@ print(average([1.0, 2.0]))
 # This case is bad, and is a minimal obvious case that should be bad. It
 # SHOULD be found by the query.
 
-print(3 / 2)
+print(3 / 2) # $ Alert[py/truncated-division]
 
 
 
 # This case is bad. It uses indirect returns of integers through function calls
 # to produce the problem. I
 
-print(return_three() / return_two())
+print(return_three() / return_two()) # $ Alert[py/truncated-division]
 
 
 

python/ql/test/2/query-tests/Expressions/UseofApply.py

@@ -16,7 +16,7 @@ def useofapply():
 
   # This use of `apply` is a reference to the builtin function and so SHOULD be
   # caught by the query.
-  apply(foo, [1])
+  apply(foo, [1]) # $ Alert[py/use-of-apply]
 
 
 

python/ql/test/2/query-tests/Expressions/UseofApply.qlref

@@ -1 +1,2 @@
-Expressions/UseofApply.ql
+query: Expressions/UseofApply.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Expressions/UseofInput.qlref

@@ -1 +1,2 @@
-Expressions/UseofInput.ql
+query: Expressions/UseofInput.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Expressions/expressions_test.py

@@ -1,9 +1,9 @@
 def use_of_apply(func, args):
-    apply(func, args)
+    apply(func, args) # $ Alert[py/use-of-apply]
 
 
 def use_of_input():
-    return input() # NOT OK
+    return input() # $ Alert[py/use-of-input] # NOT OK
 
 
 def not_use_of_input():

python/ql/test/2/query-tests/Functions/DeprecatedSliceMethod.qlref

@@ -1 +1,2 @@
-Functions/DeprecatedSliceMethod.ql
+query: Functions/DeprecatedSliceMethod.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Imports/encoding_error/EncodingError.qlref

@@ -1 +1,2 @@
-Imports/EncodingError.ql
+query: Imports/EncodingError.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Imports/syntax_error/EncodingError.qlref

@@ -1 +1,2 @@
-Imports/EncodingError.ql
+query: Imports/EncodingError.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Imports/syntax_error/SyntaxError.qlref

@@ -1 +1,2 @@
-Imports/SyntaxError.ql
+query: Imports/SyntaxError.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Imports/syntax_error/bad_encoding.py

@@ -8,5 +8,5 @@
 # encoding:shift-jis
 
 def f():
-    print "Python <20>̊J<CC8A><4A><EFBFBD>́A1990 <20>N<EFBFBD><4E><EFBFBD>납<EFBFBD><EB82A9><EFBFBD>J<EFBFBD>n<EFBFBD><6E><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
+    print "Python <20>̊J<CC8A><4A><EFBFBD>́A1990 <20>N<EFBFBD><4E><EFBFBD>납<EFBFBD><EB82A9><EFBFBD>J<EFBFBD>n<EFBFBD><6E><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>" # $ Alert[py/encoding-error]
 """

python/ql/test/2/query-tests/Imports/syntax_error/nonsense.py

@@ -1,4 +1,4 @@
-`Twas brillig, and the slithy toves
+`Twas brillig, and the slithy toves # $ Alert[py/syntax-error]
   Did gyre and gimble in the wabe:
 All mimsy were the borogoves,
   And the mome raths outgrabe.

python/ql/test/2/query-tests/Lexical/OldOctalLiteral.qlref

@@ -1 +1,2 @@
-Lexical/OldOctalLiteral.ql
+query: Lexical/OldOctalLiteral.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Lexical/lexical_test.py

@@ -1,6 +1,6 @@
 
 #Bad Octal literal
-017
+017 # $ Alert
 #Good Octal literal
 0o17
 #Special case file permissions

python/ql/test/2/query-tests/Statements/ExecUsed.qlref

@@ -1 +1,2 @@
-Statements/ExecUsed.ql
+query: Statements/ExecUsed.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Statements/IterableStringOrSequence.qlref

@@ -1 +1,2 @@
-Statements/IterableStringOrSequence.ql
+query: Statements/IterableStringOrSequence.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Statements/TopLevelPrint.qlref

@@ -1 +1,2 @@
-Statements/TopLevelPrint.ql
+query: Statements/TopLevelPrint.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Statements/module.py

@@ -1,2 +1,2 @@
 #Top level prints in modules are bad
-print ("Side effect on import")
+print ("Side effect on import") # $ Alert[py/print-during-import]

python/ql/test/2/query-tests/Statements/statements_test.py

@@ -2,7 +2,7 @@
 
 
 def exec_used(val):
-    exec (val)
+    exec (val) # $ Alert[py/use-of-exec]
 
 #Top level print
 import module
@@ -18,7 +18,7 @@ def f(x):
         s = u"Hello World"
     else:
         s = [ u'Hello', u'World']
-    for thing in s:
+    for thing in s: # $ Alert[py/iteration-string-and-sequence]
         print (thing)
 
 import fake_six

python/ql/test/2/query-tests/Summary/LinesOfCode.qlref

@@ -1 +1 @@
-Summary/LinesOfCode.ql
+query: Summary/LinesOfCode.ql

python/ql/test/2/query-tests/Summary/LinesOfUserCode.qlref

@@ -1 +1 @@
-Summary/LinesOfUserCode.ql
+query: Summary/LinesOfUserCode.ql

python/ql/test/2/query-tests/Variables/LeakyComp/LeakyComp.qlref

@@ -1 +1,2 @@
-Variables/LeakingListComprehension.ql
+query: Variables/LeakingListComprehension.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Variables/LeakyComp/test.py

@@ -2,12 +2,12 @@ from __future__ import print_function
 
 def undefined_in_3():
     [x for x in range(3)]
-    print(x)
+    print(x) # $ Alert
 
 def different_in_3():
     y = 10
     [y for y in range(3)]
-    print(y)
+    print(y) # $ Alert
 
 def ok():
     [z for z in range(4)]

python/ql/test/2/query-tests/Variables/undefined/UndefinedExport.py

@@ -1,6 +1,6 @@
 
 
-__all__ = [ "x", "y", "z", "module" ]
+__all__ = [ "x", "y", "z", "module" ] # $ Alert[py/undefined-export]
 
 x = 1
 if 0:

python/ql/test/2/query-tests/Variables/undefined/UndefinedExport.qlref

@@ -1 +1,2 @@
-Variables/UndefinedExport.ql
+query: Variables/UndefinedExport.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Variables/undefined/UndefinedGlobal.qlref

@@ -1 +1,2 @@
-Variables/UndefinedGlobal.ql
+query: Variables/UndefinedGlobal.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Variables/undefined/UninitializedLocal.qlref

@@ -1 +1,2 @@
-Variables/UninitializedLocal.ql
+query: Variables/UninitializedLocal.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/2/query-tests/Variables/undefined/package/__init__.py

@@ -1 +1 @@
-__all__ = [ "module", "not_exists" ]
+__all__ = [ "module", "not_exists" ] # $ Alert[py/undefined-export]

python/ql/test/3/query-tests/Classes/equals-attr/DefineEqualsWhenAddingAttributes.qlref

@@ -1 +1,2 @@
-Classes/DefineEqualsWhenAddingAttributes.ql
+query: Classes/DefineEqualsWhenAddingAttributes.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Classes/equals-attr/test.py

@@ -9,7 +9,7 @@ class RedefineEquals:
     def __eq__(self, other):
         return other is "Tuesday"
 
-class C(RedefineEquals):
+class C(RedefineEquals): # $ Alert
 
     def __init__(self, args):
         self.a, self.b = args

python/ql/test/3/query-tests/Classes/inconsistent-mro/InconsistentMRO.qlref

@@ -1 +1,2 @@
-Classes/InconsistentMRO.ql
+query: Classes/InconsistentMRO.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Classes/inconsistent-mro/inconsistent_mro.py

@@ -6,12 +6,12 @@ class X(object):
 class Y(X):
     pass
 
-class Z(X, Y):
+class Z(X, Y): # $ Alert
     pass
     
 class O:
     pass
     
 #This is OK in Python 2
-class N(object, O):
+class N(object, O): # $ Alert
     pass

python/ql/test/3/query-tests/Classes/undefined-attribute/MaybeUndefinedClassAttribute.qlref

@@ -1 +1,2 @@
-Classes/MaybeUndefinedClassAttribute.ql
+query: Classes/MaybeUndefinedClassAttribute.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Classes/undefined-attribute/UndefinedClassAttribute.qlref

@@ -1 +1,2 @@
-Classes/UndefinedClassAttribute.ql
+query: Classes/UndefinedClassAttribute.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Expressions/Arguments/WrongNameForArgumentInCall.qlref

@@ -1 +1,2 @@
-Expressions/WrongNameForArgumentInCall.ql
+query: Expressions/WrongNameForArgumentInCall.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Expressions/Arguments/WrongNumberArgumentsInCall.qlref

@@ -1 +1,2 @@
-Expressions/WrongNumberArgumentsInCall.ql
+query: Expressions/WrongNumberArgumentsInCall.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Expressions/Arguments/wrong_arguments.py

@@ -9,8 +9,8 @@ f(1, 2, 3, kw1=1)
 f(1, 2, kw1=1, kw2=2)
 
 #Not OK
-f(1, 2, 3, kw1=1, kw3=3)
-f(1, 2, 3, kw3=3)
+f(1, 2, 3, kw1=1, kw3=3) # $ Alert[py/call/wrong-named-argument]
+f(1, 2, 3, kw3=3) # $ Alert[py/call/wrong-named-argument]
 
 
 #ODASA-5897
@@ -21,4 +21,4 @@ def ok():
     return analyze_member_access(msg, original=original, chk=chk)
 
 def bad():
-    return analyze_member_access(msg, original, chk=chk)
+    return analyze_member_access(msg, original, chk=chk) # $ Alert[py/call/wrong-arguments]

python/ql/test/3/query-tests/Expressions/Formatting/WrongNumberArgumentsForFormat.qlref

@@ -1 +1,2 @@
-Expressions/WrongNumberArgumentsForFormat.ql
+query: Expressions/WrongNumberArgumentsForFormat.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Expressions/TruncatedDivision/TruncatedDivision.qlref

@@ -1 +1,2 @@
-Expressions/TruncatedDivision.ql
+query: Expressions/TruncatedDivision.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Expressions/UseofApply/UseofApply.qlref

@@ -1 +1,2 @@
-Expressions/UseofApply.ql
+query: Expressions/UseofApply.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Imports/encoding_error/EncodingError.qlref

@@ -1 +1,2 @@
-Imports/EncodingError.ql
+query: Imports/EncodingError.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Imports/syntax_error/EncodingError.qlref

@@ -1 +1,2 @@
-Imports/EncodingError.ql
+query: Imports/EncodingError.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Imports/syntax_error/SyntaxError.qlref

@@ -1 +1,2 @@
-Imports/SyntaxError.ql
+query: Imports/SyntaxError.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Imports/syntax_error/bad_encoding.py

@@ -8,5 +8,5 @@
 # encoding:shift-jis
 
 def f():
-    print "Python <20>̊J<CC8A><4A><EFBFBD>́A1990 <20>N<EFBFBD><4E><EFBFBD>납<EFBFBD><EB82A9><EFBFBD>J<EFBFBD>n<EFBFBD><6E><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>"
+    print "Python <20>̊J<CC8A><4A><EFBFBD>́A1990 <20>N<EFBFBD><4E><EFBFBD>납<EFBFBD><EB82A9><EFBFBD>J<EFBFBD>n<EFBFBD><6E><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD>" # $ Alert[py/encoding-error]
 """

python/ql/test/3/query-tests/Imports/syntax_error/nonsense.py

@@ -1,4 +1,4 @@
- `Twas brillig, and the slithy toves
+ `Twas brillig, and the slithy toves # $ Alert[py/syntax-error]
   Did gyre and gimble in the wabe:
 All mimsy were the borogoves,
   And the mome raths outgrabe.

python/ql/test/3/query-tests/Statements/general/ExecUsed.qlref

@@ -1 +1,2 @@
-Statements/ExecUsed.ql
+query: Statements/ExecUsed.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Statements/general/TopLevelPrint.qlref

@@ -1 +1,2 @@
-Statements/TopLevelPrint.ql
+query: Statements/TopLevelPrint.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Statements/general/module.py

@@ -1,2 +1,2 @@
 #Top level prints in modules are bad
-print ("Side effect on import")
+print ("Side effect on import") # $ Alert[py/print-during-import]

python/ql/test/3/query-tests/Statements/general/statements_test.py

@@ -2,7 +2,7 @@
 
 
 def exec_used(val):
-    exec(val)
+    exec(val) # $ Alert[py/use-of-exec]
 
 #Top level print
 import module

python/ql/test/3/query-tests/Statements/iter/IterableStringOrSequence.qlref

@@ -1 +1,2 @@
-Statements/IterableStringOrSequence.ql
+query: Statements/IterableStringOrSequence.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Statements/iter/NonIteratorInForLoop.qlref

@@ -1 +1,2 @@
-Statements/NonIteratorInForLoop.ql
+query: Statements/NonIteratorInForLoop.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Statements/iter/async_iterator.py

@@ -23,5 +23,5 @@ async def good():
         yield x
 
 async def bad():
-    async for x in MissingAiter():
+    async for x in MissingAiter(): # $ Alert[py/non-iterable-in-for-loop]
         yield x

python/ql/test/3/query-tests/Statements/iter/statements_test.py

@@ -18,7 +18,7 @@ def f(x):
         s = u"Hello World"
     else:
         s = [ u'Hello', u'World']
-    for thing in s:
+    for thing in s: # $ Alert[py/iteration-string-and-sequence]
         print (thing)
 
 
@@ -31,7 +31,7 @@ class Color(Enum):
 def colors():
     for color in Color:
         print(color)
-    for color in 1:
+    for color in 1: # $ Alert[py/non-iterable-in-for-loop]
         print(color)
 
 colors()

python/ql/test/3/query-tests/Statements/unreachable/UnreachableCode.qlref

@@ -1 +1,2 @@
-Statements/UnreachableCode.ql
+query: Statements/UnreachableCode.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Statements/unreachable_suppressed/UnreachableCode.qlref

@@ -1 +1,2 @@
-Statements/UnreachableCode.ql
+query: Statements/UnreachableCode.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql

python/ql/test/3/query-tests/Summary/LinesOfCode.qlref

@@ -1 +1 @@
-Summary/LinesOfCode.ql
+query: Summary/LinesOfCode.ql

python/ql/test/3/query-tests/Summary/LinesOfUserCode.qlref

@@ -1 +1 @@
-Summary/LinesOfUserCode.ql
+query: Summary/LinesOfUserCode.ql

python/ql/test/3/query-tests/Variables/undefined/UndefinedExport.py

@@ -1,6 +1,6 @@
 
 
-__all__ = [ "x", "y", "z", "module", "w" ]
+__all__ = [ "x", "y", "z", "module", "w" ] # $ Alert[py/undefined-export]
 
 x = 1
 if 0: