From 4ad3a44aab30bd9c78fd7821fc5f7f2a463735a1 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Mon, 15 Jun 2026 11:15:16 +0100
Subject: [PATCH 1/2] QL: Convert qlref tests to inline expectations

---
 ql/ql/test/queries/bugs/OrderByConst/Foo.qll  |  2 +-
 .../bugs/OrderByConst/OrderByConst.qlref      |  3 ++-
 .../SumWithoutDomain/SumWithoutDomain.qlref   |  3 ++-
 .../queries/bugs/SumWithoutDomain/Test.qll    |  2 +-
 .../InlineOverlayCaller.qlref                 |  3 ++-
 .../overlay/InlineOverlayCaller/Test.qll      |  2 +-
 .../AbstractClassImport.qlref                 |  3 ++-
 .../AbstractClassImportTest1.qll              |  2 +-
 .../MissingNoInline/MissingNoInline.qlref     |  3 ++-
 .../performance/MissingNoInline/Test.qll      |  2 +-
 .../performance/VarUnusedInDisjunct/Test.qll  | 18 +++++++--------
 .../VarUnusedInDisjunct.qlref                 |  3 ++-
 .../AcronymsShouldBeCamelCase.qlref           |  3 ++-
 .../style/AcronymsShouldBeCamelCase/Test.qll  |  6 ++---
 .../style/CouldBeCast/CouldBeCast.qlref       |  3 ++-
 ql/ql/test/queries/style/CouldBeCast/Foo.qll  | 10 ++++-----
 .../DataFlowConfigModuleNaming.qlref          |  3 ++-
 .../style/DataFlowConfigModuleNaming/Test.qll |  4 ++--
 .../queries/style/DeadCode/DeadCode.qlref     |  3 ++-
 ql/ql/test/queries/style/DeadCode/Foo.qll     | 10 ++++-----
 .../FieldOnlyUsedInCharPred.qll               |  2 +-
 .../FieldOnlyUsedInCharPred.qlref             |  3 ++-
 ql/ql/test/queries/style/ImplicitThis/Bad.qll |  2 +-
 .../test/queries/style/ImplicitThis/Bad2.qll  |  2 +-
 .../style/ImplicitThis/ImplicitThis.qlref     |  3 ++-
 .../style/MissingParameterInQlDoc/Foo.qll     |  4 ++--
 .../MissingParameterInQlDoc.qlref             |  3 ++-
 .../MissingQualityMetadata.qlref              |  3 ++-
 .../BadQualityMaintainabilityWrongToplevel.ql |  2 +-
 .../testcases/BadQualityMultipleTopLevel.ql   |  2 +-
 .../testcases/BadQualityNoToplevel.ql         |  2 +-
 .../BadQualityReliabilityWrongToplevel.ql     |  2 +-
 .../MissingSecurityMetadata.qlref             |  3 ++-
 .../testcases/BadNoSecurity.ql                |  2 +-
 .../testcases/BadNoSeverity.ql                |  2 +-
 .../style/Misspelling/Misspelling.qlref       |  3 ++-
 ql/ql/test/queries/style/Misspelling/Test.qll | 12 +++++-----
 ql/ql/test/queries/style/NonDocBlock/Foo.qll  |  4 ++--
 .../style/NonDocBlock/NonDocBlock.qlref       |  3 ++-
 .../OmittableExists/OmittableExists.qlref     |  3 ++-
 .../queries/style/OmittableExists/Test.qll    |  2 +-
 .../style/QlRefInlineExpectations/Test3.qlref |  3 ++-
 .../test/queries/style/RedundantCast/Foo.qll  |  6 ++---
 .../style/RedundantCast/RedundantCast.qlref   |  3 ++-
 .../test/queries/style/RedundantImport/D.qll  |  2 +-
 .../RedundantImport/RedundantImport.qlref     |  3 ++-
 .../RedundantOverride/RedundantOverride.qll   | 22 +++++++++----------
 .../RedundantOverride/RedundantOverride.qlref |  3 ++-
 .../SwappedParameterNames.qlref               |  3 ++-
 .../style/SwappedParameterNames/Test.qll      |  2 +-
 .../style/UseInstanceofExtension/Foo.qll      |  8 +++----
 .../UseInstanceofExtension.qlref              |  3 ++-
 .../style/UseSetLiteral/UseSetLiteral.qlref   |  3 ++-
 .../test/queries/style/UseSetLiteral/test.qll | 16 +++++++-------
 .../ValidatePredicateGetReturns.qlref         |  3 ++-
 .../ValidatePredicateGetReturns/test.qll      | 12 +++++-----
 56 files changed, 135 insertions(+), 109 deletions(-)

diff --git a/ql/ql/test/queries/bugs/OrderByConst/Foo.qll b/ql/ql/test/queries/bugs/OrderByConst/Foo.qll
index 7229564660e..9f51572689c 100644
--- a/ql/ql/test/queries/bugs/OrderByConst/Foo.qll
+++ b/ql/ql/test/queries/bugs/OrderByConst/Foo.qll
@@ -1,5 +1,5 @@
 string foo() {
-  result = concat(string x | x = [0 .. 10].toString() | x order by x desc, ", ") // BAD
+  result = concat(string x | x = [0 .. 10].toString() | x order by x desc, ", ") // $ Alert // BAD
   or
   result = concat(string x | x = [0 .. 10].toString() | x, ", " order by x desc) // GOOD
 }
diff --git a/ql/ql/test/queries/bugs/OrderByConst/OrderByConst.qlref b/ql/ql/test/queries/bugs/OrderByConst/OrderByConst.qlref
index 809589a856f..9c2263fc14d 100644
--- a/ql/ql/test/queries/bugs/OrderByConst/OrderByConst.qlref
+++ b/ql/ql/test/queries/bugs/OrderByConst/OrderByConst.qlref
@@ -1 +1,2 @@
-queries/bugs/OrderByConst.ql
\ No newline at end of file
+query: queries/bugs/OrderByConst.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/bugs/SumWithoutDomain/SumWithoutDomain.qlref b/ql/ql/test/queries/bugs/SumWithoutDomain/SumWithoutDomain.qlref
index dc782dfbd0a..46f2785806e 100644
--- a/ql/ql/test/queries/bugs/SumWithoutDomain/SumWithoutDomain.qlref
+++ b/ql/ql/test/queries/bugs/SumWithoutDomain/SumWithoutDomain.qlref
@@ -1 +1,2 @@
-queries/bugs/SumWithoutDomain.ql
\ No newline at end of file
+query: queries/bugs/SumWithoutDomain.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/bugs/SumWithoutDomain/Test.qll b/ql/ql/test/queries/bugs/SumWithoutDomain/Test.qll
index 8190aed8101..9b15c38d9c6 100644
--- a/ql/ql/test/queries/bugs/SumWithoutDomain/Test.qll
+++ b/ql/ql/test/queries/bugs/SumWithoutDomain/Test.qll
@@ -1,6 +1,6 @@
 // Result is 3 and not 4
 int foo() {
-  result = sum([1, 1, 2]) // <- Alert here
+  result = sum([1, 1, 2]) // $ Alert // <- Alert here
 }
 
 // Ok - false negative
diff --git a/ql/ql/test/queries/overlay/InlineOverlayCaller/InlineOverlayCaller.qlref b/ql/ql/test/queries/overlay/InlineOverlayCaller/InlineOverlayCaller.qlref
index 0347e9eedc5..b3385b46971 100644
--- a/ql/ql/test/queries/overlay/InlineOverlayCaller/InlineOverlayCaller.qlref
+++ b/ql/ql/test/queries/overlay/InlineOverlayCaller/InlineOverlayCaller.qlref
@@ -1 +1,2 @@
-queries/overlay/InlineOverlayCaller.ql
+query: queries/overlay/InlineOverlayCaller.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/overlay/InlineOverlayCaller/Test.qll b/ql/ql/test/queries/overlay/InlineOverlayCaller/Test.qll
index e25577d91a1..a3e2f19447a 100644
--- a/ql/ql/test/queries/overlay/InlineOverlayCaller/Test.qll
+++ b/ql/ql/test/queries/overlay/InlineOverlayCaller/Test.qll
@@ -4,7 +4,7 @@ module;
 import ql
 
 pragma[inline]
-predicate foo(int x) { x = 42 }
+predicate foo(int x) { x = 42 } // $ Alert
 
 overlay[caller]
 pragma[inline]
diff --git a/ql/ql/test/queries/performance/AbstractClassImport/AbstractClassImport.qlref b/ql/ql/test/queries/performance/AbstractClassImport/AbstractClassImport.qlref
index 4d7907c36ef..4dc5cc5d490 100644
--- a/ql/ql/test/queries/performance/AbstractClassImport/AbstractClassImport.qlref
+++ b/ql/ql/test/queries/performance/AbstractClassImport/AbstractClassImport.qlref
@@ -1 +1,2 @@
-queries/performance/AbstractClassImport.ql
\ No newline at end of file
+query: queries/performance/AbstractClassImport.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/performance/AbstractClassImport/AbstractClassImportTest1.qll b/ql/ql/test/queries/performance/AbstractClassImport/AbstractClassImportTest1.qll
index ce7f7c4ea68..fe2519cc0d5 100644
--- a/ql/ql/test/queries/performance/AbstractClassImport/AbstractClassImportTest1.qll
+++ b/ql/ql/test/queries/performance/AbstractClassImport/AbstractClassImportTest1.qll
@@ -1,4 +1,4 @@
 import ql
 import AbstractClassImportTest2
 
-abstract class Base extends AstNode { }
+abstract class Base extends AstNode { } // $ Alert
diff --git a/ql/ql/test/queries/performance/MissingNoInline/MissingNoInline.qlref b/ql/ql/test/queries/performance/MissingNoInline/MissingNoInline.qlref
index aee3346d730..f1bc931e122 100644
--- a/ql/ql/test/queries/performance/MissingNoInline/MissingNoInline.qlref
+++ b/ql/ql/test/queries/performance/MissingNoInline/MissingNoInline.qlref
@@ -1 +1,2 @@
-queries/performance/MissingNoinline.ql
\ No newline at end of file
+query: queries/performance/MissingNoinline.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/performance/MissingNoInline/Test.qll b/ql/ql/test/queries/performance/MissingNoInline/Test.qll
index a55315be7e2..a92f7f38d0c 100644
--- a/ql/ql/test/queries/performance/MissingNoInline/Test.qll
+++ b/ql/ql/test/queries/performance/MissingNoInline/Test.qll
@@ -5,7 +5,7 @@ import ql
  *
  * This predicate exists to fix a join order.
  */
-predicate missingNoInline(AddExpr add, Expr e1, Expr e2) {
+predicate missingNoInline(AddExpr add, Expr e1, Expr e2) { // $ Alert
   // BAD
   add.getLeftOperand() = e1 and
   add.getRightOperand() = e2
diff --git a/ql/ql/test/queries/performance/VarUnusedInDisjunct/Test.qll b/ql/ql/test/queries/performance/VarUnusedInDisjunct/Test.qll
index 10e97e58209..b4b30f10028 100644
--- a/ql/ql/test/queries/performance/VarUnusedInDisjunct/Test.qll
+++ b/ql/ql/test/queries/performance/VarUnusedInDisjunct/Test.qll
@@ -13,21 +13,21 @@ class MyStr extends string {
 predicate bad1(Big b) {
   b.toString().matches("%foo")
   or
-  any()
+  any() // $ Alert
 }
 
 int bad2() {
   exists(Big big, Small small |
     result = big.toString().toInt()
     or
-    result = small.toString().toInt()
+    result = small.toString().toInt() // $ Alert
   )
 }
 
 float bad3(Big t) {
   result = [1 .. 10].toString().toFloat() or
   result = [11 .. 20].toString().toFloat() or
-  result = t.toString().toFloat() or
+  result = t.toString().toFloat() or // $ Alert
   result = [21 .. 30].toString().toFloat()
 }
 
@@ -50,7 +50,7 @@ predicate bad4(Big fromType, Big toType) {
   or
   fromType.toString().matches("%foo")
   or
-  helper(toType, fromType)
+  helper(toType, fromType) // $ Alert
 }
 
 predicate good2(Big t) {
@@ -71,7 +71,7 @@ predicate mixed1(Big good, Small small) {
       small.toString().matches("%foo") and
       // the use of good is fine, the comparison further up binds it.
       // the same is not true for bad.
-      (bad.toString().matches("%foo") or good.toString().regexpMatch("foo.*")) and
+      (bad.toString().matches("%foo") or good.toString().regexpMatch("foo.*")) and // $ Alert
       small.toString().regexpMatch(".*foo")
     )
 }
@@ -112,7 +112,7 @@ predicate good5(Big bb, Big v, boolean certain) {
     )
 }
 
-predicate bad5(Big bb) { if none() then bb.toString().matches("%foo") else any() }
+predicate bad5(Big bb) { if none() then bb.toString().matches("%foo") else any() } // $ Alert
 
 pragma[inline]
 predicate good5(Big a, Big b) {
@@ -126,12 +126,12 @@ predicate bad6(Big a) {
   (
     a.toString().matches("%foo") // bad
     or
-    any()
+    any() // $ Alert
   ) and
   (
     a.toString().matches("%foo") // also bad
     or
-    any()
+    any() // $ Alert
   )
 }
 
@@ -163,7 +163,7 @@ class HasField extends Big {
   HasField() {
     field = this
     or
-    this.toString().matches("%foo") // <- field only defined here.
+    this.toString().matches("%foo") // $ Alert // <- field only defined here.
   }
 
   Big getField() { result = field }
diff --git a/ql/ql/test/queries/performance/VarUnusedInDisjunct/VarUnusedInDisjunct.qlref b/ql/ql/test/queries/performance/VarUnusedInDisjunct/VarUnusedInDisjunct.qlref
index 28f0c0d938a..0413e31942f 100644
--- a/ql/ql/test/queries/performance/VarUnusedInDisjunct/VarUnusedInDisjunct.qlref
+++ b/ql/ql/test/queries/performance/VarUnusedInDisjunct/VarUnusedInDisjunct.qlref
@@ -1 +1,2 @@
-queries/performance/VarUnusedInDisjunct.ql
\ No newline at end of file
+query: queries/performance/VarUnusedInDisjunct.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/AcronymsShouldBeCamelCase/AcronymsShouldBeCamelCase.qlref b/ql/ql/test/queries/style/AcronymsShouldBeCamelCase/AcronymsShouldBeCamelCase.qlref
index 0f57f1fa66c..3e287c27a39 100644
--- a/ql/ql/test/queries/style/AcronymsShouldBeCamelCase/AcronymsShouldBeCamelCase.qlref
+++ b/ql/ql/test/queries/style/AcronymsShouldBeCamelCase/AcronymsShouldBeCamelCase.qlref
@@ -1 +1,2 @@
-queries/style/AcronymsShouldBeCamelCase.ql
\ No newline at end of file
+query: queries/style/AcronymsShouldBeCamelCase.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/AcronymsShouldBeCamelCase/Test.qll b/ql/ql/test/queries/style/AcronymsShouldBeCamelCase/Test.qll
index 1ff0d4c0d52..06742e06948 100644
--- a/ql/ql/test/queries/style/AcronymsShouldBeCamelCase/Test.qll
+++ b/ql/ql/test/queries/style/AcronymsShouldBeCamelCase/Test.qll
@@ -1,13 +1,13 @@
 // BAD
-predicate isXML() { any() }
+predicate isXML() { any() } // $ Alert
 
 // GOOD [ AES is exceptional ]
 predicate isAES() { any() }
 
 // BAD
-newtype TXMLElements =
+newtype TXMLElements = // $ Alert
   TXmlElement() or // GOOD
-  TXMLElement() // BAD
+  TXMLElement() // $ Alert // BAD
 
 // GOOD
 newtype TIRFunction = MkIRFunction()
diff --git a/ql/ql/test/queries/style/CouldBeCast/CouldBeCast.qlref b/ql/ql/test/queries/style/CouldBeCast/CouldBeCast.qlref
index 78879bb0ab0..36a6244669b 100644
--- a/ql/ql/test/queries/style/CouldBeCast/CouldBeCast.qlref
+++ b/ql/ql/test/queries/style/CouldBeCast/CouldBeCast.qlref
@@ -1 +1,2 @@
-queries/style/CouldBeCast.ql
\ No newline at end of file
+query: queries/style/CouldBeCast.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/CouldBeCast/Foo.qll b/ql/ql/test/queries/style/CouldBeCast/Foo.qll
index 5f6771f0043..6c3da185fe6 100644
--- a/ql/ql/test/queries/style/CouldBeCast/Foo.qll
+++ b/ql/ql/test/queries/style/CouldBeCast/Foo.qll
@@ -1,20 +1,20 @@
 bindingset[i]
 predicate foo(int i) {
-  exists(Even j | j = i) // NOT OK
+  exists(Even j | j = i) // $ Alert // NOT OK
   or
   exists(Even j | j = i | j % 4 = 0) // OK
   or
-  any(Even j | j = i) = 2 // NOT OK
+  any(Even j | j = i) = 2 // $ Alert // NOT OK
   or
-  any(Even j | j = i | j) = 2 // NOT OK
+  any(Even j | j = i | j) = 2 // $ Alert // NOT OK
   or
   any(Even j | j = i | j * 2) = 4 // OK
   or
   any(Even j | j = i and j % 4 = 0 | j) = 4 // OK
   or
-  any(int j | j = i) = 2 // NOT OK
+  any(int j | j = i) = 2 // $ Alert // NOT OK
   or
-  exists(int j | j = i) // NOT OK
+  exists(int j | j = i) // $ Alert // NOT OK
 }
 
 class Even extends int {
diff --git a/ql/ql/test/queries/style/DataFlowConfigModuleNaming/DataFlowConfigModuleNaming.qlref b/ql/ql/test/queries/style/DataFlowConfigModuleNaming/DataFlowConfigModuleNaming.qlref
index 62375818f5e..2025f1cdb90 100644
--- a/ql/ql/test/queries/style/DataFlowConfigModuleNaming/DataFlowConfigModuleNaming.qlref
+++ b/ql/ql/test/queries/style/DataFlowConfigModuleNaming/DataFlowConfigModuleNaming.qlref
@@ -1 +1,2 @@
-queries/style/DataFlowConfigModuleNaming.ql
\ No newline at end of file
+query: queries/style/DataFlowConfigModuleNaming.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/DataFlowConfigModuleNaming/Test.qll b/ql/ql/test/queries/style/DataFlowConfigModuleNaming/Test.qll
index a06118a7fe0..6da96a4b572 100644
--- a/ql/ql/test/queries/style/DataFlowConfigModuleNaming/Test.qll
+++ b/ql/ql/test/queries/style/DataFlowConfigModuleNaming/Test.qll
@@ -8,14 +8,14 @@ module EmptyConfig implements DataFlow::ConfigSig {
 }
 
 // BAD - does not end with "Config"
-module EmptyConfiguration implements DataFlow::ConfigSig {
+module EmptyConfiguration implements DataFlow::ConfigSig { // $ Alert
   predicate isSource(DataFlow::Node src) { none() }
 
   predicate isSink(DataFlow::Node sink) { none() }
 }
 
 // BAD - does not end with "Config"
-module EmptyFlow implements DataFlow::ConfigSig {
+module EmptyFlow implements DataFlow::ConfigSig { // $ Alert
   predicate isSource(DataFlow::Node src) { none() }
 
   predicate isSink(DataFlow::Node sink) { none() }
diff --git a/ql/ql/test/queries/style/DeadCode/DeadCode.qlref b/ql/ql/test/queries/style/DeadCode/DeadCode.qlref
index ac615af4961..704cc5c1365 100644
--- a/ql/ql/test/queries/style/DeadCode/DeadCode.qlref
+++ b/ql/ql/test/queries/style/DeadCode/DeadCode.qlref
@@ -1 +1,2 @@
-queries/style/DeadCode.ql
\ No newline at end of file
+query: queries/style/DeadCode.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/DeadCode/Foo.qll b/ql/ql/test/queries/style/DeadCode/Foo.qll
index a5b5b08e2a4..32fab335b78 100644
--- a/ql/ql/test/queries/style/DeadCode/Foo.qll
+++ b/ql/ql/test/queries/style/DeadCode/Foo.qll
@@ -1,11 +1,11 @@
 import ql
 
 private module Mixed {
-  private predicate dead1() { none() }
+  private predicate dead1() { none() } // $ Alert
 
   predicate alive1() { none() }
 
-  predicate dead2() { none() }
+  predicate dead2() { none() } // $ Alert
 }
 
 predicate usesAlive() { Mixed::alive1() }
@@ -43,7 +43,7 @@ private module Input1 implements InputSig {
   predicate foo() { any() }
 }
 
-private module Input2 implements InputSig {
+private module Input2 implements InputSig { // $ Alert
   predicate foo() { any() }
 }
 
@@ -53,7 +53,7 @@ private module Input3 implements InputSig {
 
 module M1 = ParameterizedModule<Input1>;
 
-private module M2 = ParameterizedModule<Input2>;
+private module M2 = ParameterizedModule<Input2>; // $ Alert
 
 import ParameterizedModule<Input3>
 
@@ -65,7 +65,7 @@ private class CImpl1 extends AstNode { }
 
 final class CPublic1 = CImpl1;
 
-private class CImpl2 extends AstNode { }
+private class CImpl2 extends AstNode { } // $ Alert
 
 overlay[discard_entity]
 private predicate discard(@foo x) { any() }
diff --git a/ql/ql/test/queries/style/FieldOnlyUsedInCharPred/FieldOnlyUsedInCharPred.qll b/ql/ql/test/queries/style/FieldOnlyUsedInCharPred/FieldOnlyUsedInCharPred.qll
index edfc8b4576e..4f1d5da7196 100644
--- a/ql/ql/test/queries/style/FieldOnlyUsedInCharPred/FieldOnlyUsedInCharPred.qll
+++ b/ql/ql/test/queries/style/FieldOnlyUsedInCharPred/FieldOnlyUsedInCharPred.qll
@@ -1,5 +1,5 @@
 class C1 extends int {
-  int field; // BAD
+  int field; // $ Alert // BAD
 
   C1() {
     this = field and
diff --git a/ql/ql/test/queries/style/FieldOnlyUsedInCharPred/FieldOnlyUsedInCharPred.qlref b/ql/ql/test/queries/style/FieldOnlyUsedInCharPred/FieldOnlyUsedInCharPred.qlref
index 0e77c6ae6fe..cf83276fb00 100644
--- a/ql/ql/test/queries/style/FieldOnlyUsedInCharPred/FieldOnlyUsedInCharPred.qlref
+++ b/ql/ql/test/queries/style/FieldOnlyUsedInCharPred/FieldOnlyUsedInCharPred.qlref
@@ -1 +1,2 @@
-queries/style/FieldOnlyUsedInCharPred.ql
+query: queries/style/FieldOnlyUsedInCharPred.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/ImplicitThis/Bad.qll b/ql/ql/test/queries/style/ImplicitThis/Bad.qll
index 97b51284acc..c1834c8bb6b 100644
--- a/ql/ql/test/queries/style/ImplicitThis/Bad.qll
+++ b/ql/ql/test/queries/style/ImplicitThis/Bad.qll
@@ -7,5 +7,5 @@ class Foo extends string {
 
   string getBarWithThis() { result = this.getBar() }
 
-  string getBarWithoutThis() { result = getBar() }
+  string getBarWithoutThis() { result = getBar() } // $ Alert
 }
diff --git a/ql/ql/test/queries/style/ImplicitThis/Bad2.qll b/ql/ql/test/queries/style/ImplicitThis/Bad2.qll
index 27d7485ca4f..540c02f0921 100644
--- a/ql/ql/test/queries/style/ImplicitThis/Bad2.qll
+++ b/ql/ql/test/queries/style/ImplicitThis/Bad2.qll
@@ -5,5 +5,5 @@ class Foo extends string {
 
   string getBar() { result = "bar" }
 
-  string getBarWithoutThis() { result = getBar() }
+  string getBarWithoutThis() { result = getBar() } // $ Alert
 }
diff --git a/ql/ql/test/queries/style/ImplicitThis/ImplicitThis.qlref b/ql/ql/test/queries/style/ImplicitThis/ImplicitThis.qlref
index 0bdcd3b4b5b..f751b15e814 100644
--- a/ql/ql/test/queries/style/ImplicitThis/ImplicitThis.qlref
+++ b/ql/ql/test/queries/style/ImplicitThis/ImplicitThis.qlref
@@ -1 +1,2 @@
-queries/style/ImplicitThis.ql
+query: queries/style/ImplicitThis.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/MissingParameterInQlDoc/Foo.qll b/ql/ql/test/queries/style/MissingParameterInQlDoc/Foo.qll
index 13509dbe521..ffd21d59a5c 100644
--- a/ql/ql/test/queries/style/MissingParameterInQlDoc/Foo.qll
+++ b/ql/ql/test/queries/style/MissingParameterInQlDoc/Foo.qll
@@ -2,7 +2,7 @@
 predicate test1(int param1, int param2, int param3) { none() } // OK
 
 /** `param1`, `par2` */
-predicate test2(int param1, int param2) { none() } // NOT OK - `par2` is not a parameter, and `param2` has no documentation
+predicate test2(int param1, int param2) { none() } // $ Alert // NOT OK - `par2` is not a parameter, and `param2` has no documentation
 
 /** `param1`, `par2 + par3` */
 predicate test3(int param1, int par2, int par3) { none() } // OK
@@ -11,4 +11,4 @@ predicate test3(int param1, int par2, int par3) { none() } // OK
 predicate test4(int param1, int param2) { none() } // OK - the QLDoc mentions none of the parameters, that's OK
 
 /** the param1 parameter is mentioned in a non-code block, but the `par2` parameter is misspelled */
-predicate test5(int param1, int param2) { none() } // NOT OK - the `param1` parameter is "documented" in clear text, but `par2` is misspelled
+predicate test5(int param1, int param2) { none() } // $ Alert // NOT OK - the `param1` parameter is "documented" in clear text, but `par2` is misspelled
diff --git a/ql/ql/test/queries/style/MissingParameterInQlDoc/MissingParameterInQlDoc.qlref b/ql/ql/test/queries/style/MissingParameterInQlDoc/MissingParameterInQlDoc.qlref
index 0539e4f5de2..a7d2f3d0a1d 100644
--- a/ql/ql/test/queries/style/MissingParameterInQlDoc/MissingParameterInQlDoc.qlref
+++ b/ql/ql/test/queries/style/MissingParameterInQlDoc/MissingParameterInQlDoc.qlref
@@ -1 +1,2 @@
-queries/style/MissingParameterInQlDoc.ql
\ No newline at end of file
+query: queries/style/MissingParameterInQlDoc.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/MissingQualityMetadata/MissingQualityMetadata.qlref b/ql/ql/test/queries/style/MissingQualityMetadata/MissingQualityMetadata.qlref
index 6d7eb26bede..48abe277264 100644
--- a/ql/ql/test/queries/style/MissingQualityMetadata/MissingQualityMetadata.qlref
+++ b/ql/ql/test/queries/style/MissingQualityMetadata/MissingQualityMetadata.qlref
@@ -1 +1,2 @@
-queries/style/MissingQualityMetadata.ql
+query: queries/style/MissingQualityMetadata.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityMaintainabilityWrongToplevel.ql b/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityMaintainabilityWrongToplevel.ql
index 3dd18771f95..0b1290de98b 100644
--- a/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityMaintainabilityWrongToplevel.ql
+++ b/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityMaintainabilityWrongToplevel.ql
@@ -8,7 +8,7 @@
  * @tags quality
  *       maintainability
  *       error-handling
- */
+ */ // $ Alert
 
 import ql
 
diff --git a/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityMultipleTopLevel.ql b/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityMultipleTopLevel.ql
index a9a7b48b76c..4624b6d1076 100644
--- a/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityMultipleTopLevel.ql
+++ b/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityMultipleTopLevel.ql
@@ -8,7 +8,7 @@
  * @tags quality
  *       maintainability
  *       reliability
- */
+ */ // $ Alert
 
 import ql
 
diff --git a/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityNoToplevel.ql b/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityNoToplevel.ql
index ad2ab5c1fb5..8c8bda6294e 100644
--- a/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityNoToplevel.ql
+++ b/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityNoToplevel.ql
@@ -7,7 +7,7 @@
  * @id ql/quality-query-test
  * @tags quality
  *       someothertag
- */
+ */ // $ Alert
 
 import ql
 
diff --git a/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityReliabilityWrongToplevel.ql b/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityReliabilityWrongToplevel.ql
index 53e84fb8a19..1a33baf6c51 100644
--- a/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityReliabilityWrongToplevel.ql
+++ b/ql/ql/test/queries/style/MissingQualityMetadata/testcases/BadQualityReliabilityWrongToplevel.ql
@@ -8,7 +8,7 @@
  * @tags quality
  *       reliability
  *       readability
- */
+ */ // $ Alert
 
 import ql
 
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/MissingSecurityMetadata.qlref b/ql/ql/test/queries/style/MissingSecurityMetadata/MissingSecurityMetadata.qlref
index c697bcee82e..bd4295a6862 100644
--- a/ql/ql/test/queries/style/MissingSecurityMetadata/MissingSecurityMetadata.qlref
+++ b/ql/ql/test/queries/style/MissingSecurityMetadata/MissingSecurityMetadata.qlref
@@ -1 +1,2 @@
-queries/style/MissingSecurityMetadata.ql
\ No newline at end of file
+query: queries/style/MissingSecurityMetadata.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSecurity.ql b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSecurity.ql
index d0562879831..a403812021e 100644
--- a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSecurity.ql
+++ b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSecurity.ql
@@ -7,7 +7,7 @@
  * @precision very-high
  * @id ql/some-query
  * @tags quality
- */
+ */ // $ Alert
 
 import ql
 
diff --git a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSeverity.ql b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSeverity.ql
index f04fe81599a..47a12a1858a 100644
--- a/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSeverity.ql
+++ b/ql/ql/test/queries/style/MissingSecurityMetadata/testcases/BadNoSeverity.ql
@@ -7,7 +7,7 @@
  * @id ql/some-query
  * @tags quality
  *       security
- */
+ */ // $ Alert
 
 import ql
 
diff --git a/ql/ql/test/queries/style/Misspelling/Misspelling.qlref b/ql/ql/test/queries/style/Misspelling/Misspelling.qlref
index afbcaf951f3..ed9785fee3a 100644
--- a/ql/ql/test/queries/style/Misspelling/Misspelling.qlref
+++ b/ql/ql/test/queries/style/Misspelling/Misspelling.qlref
@@ -1 +1,2 @@
-queries/style/Misspelling.ql
\ No newline at end of file
+query: queries/style/Misspelling.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/Misspelling/Test.qll b/ql/ql/test/queries/style/Misspelling/Test.qll
index b6619145f8d..1da75babe07 100644
--- a/ql/ql/test/queries/style/Misspelling/Test.qll
+++ b/ql/ql/test/queries/style/Misspelling/Test.qll
@@ -1,13 +1,13 @@
 /**
  * A string that's deliberately mispelled (and so is that last word).
- */
-class PublicallyAccessible extends string {
-  int numOccurences; // should be 'occurrences'
+ */ // $ Alert
+class PublicallyAccessible extends string { // $ Alert
+  int numOccurences; // $ Alert // should be 'occurrences'
 
   PublicallyAccessible() { this = "publically" and numOccurences = 123 }
 
   // should be argument
-  predicate hasAgrument() { none() }
+  predicate hasAgrument() { none() } // $ Alert
 
   int getNum() { result = numOccurences }
 }
@@ -15,8 +15,8 @@ class PublicallyAccessible extends string {
 /**
  * A class whose name contains a British-English spelling.
  * And here's the word 'colour'.
- */
-class AnalysedInt extends int {
+ */ // $ Alert
+class AnalysedInt extends int { // $ Alert
   AnalysedInt() { this = 7 }
 
   // 'analyses' should not be flagged
diff --git a/ql/ql/test/queries/style/NonDocBlock/Foo.qll b/ql/ql/test/queries/style/NonDocBlock/Foo.qll
index 99f957fa770..22fc0e3761a 100644
--- a/ql/ql/test/queries/style/NonDocBlock/Foo.qll
+++ b/ql/ql/test/queries/style/NonDocBlock/Foo.qll
@@ -1,13 +1,13 @@
 /*
  * This should be QLDoc.
- */
+ */ // $ Alert
 
 /**
  * this is fine
  */
 predicate foo() { any() }
 
-/* Note: this is bad. */
+/* Note: this is bad. */ // $ Alert
 class Foo extends string {
   Foo() { this = "FOo" }
 }
diff --git a/ql/ql/test/queries/style/NonDocBlock/NonDocBlock.qlref b/ql/ql/test/queries/style/NonDocBlock/NonDocBlock.qlref
index b6dbdf50604..57118bb0ff7 100644
--- a/ql/ql/test/queries/style/NonDocBlock/NonDocBlock.qlref
+++ b/ql/ql/test/queries/style/NonDocBlock/NonDocBlock.qlref
@@ -1 +1,2 @@
-queries/style/NonDocBlock.ql
\ No newline at end of file
+query: queries/style/NonDocBlock.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/OmittableExists/OmittableExists.qlref b/ql/ql/test/queries/style/OmittableExists/OmittableExists.qlref
index af9ad5ec40b..c606ef98425 100644
--- a/ql/ql/test/queries/style/OmittableExists/OmittableExists.qlref
+++ b/ql/ql/test/queries/style/OmittableExists/OmittableExists.qlref
@@ -1 +1,2 @@
-queries/style/OmittableExists.ql
\ No newline at end of file
+query: queries/style/OmittableExists.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/OmittableExists/Test.qll b/ql/ql/test/queries/style/OmittableExists/Test.qll
index 517758a9dab..0312c86ec6e 100644
--- a/ql/ql/test/queries/style/OmittableExists/Test.qll
+++ b/ql/ql/test/queries/style/OmittableExists/Test.qll
@@ -17,7 +17,7 @@ class Location extends @location_default {
 }
 
 predicate test() {
-  exists(int i | aPredicate(i)) // BAD
+  exists(int i | aPredicate(i)) // $ Alert // BAD
   or
   exists(int i | aPredicate(i) or anotherPredicate(i)) // BAD [NOT DETECTED]
   or
diff --git a/ql/ql/test/queries/style/QlRefInlineExpectations/Test3.qlref b/ql/ql/test/queries/style/QlRefInlineExpectations/Test3.qlref
index 5582a96837a..f840a91b59e 100644
--- a/ql/ql/test/queries/style/QlRefInlineExpectations/Test3.qlref
+++ b/ql/ql/test/queries/style/QlRefInlineExpectations/Test3.qlref
@@ -1 +1,2 @@
-query: ProblemQuery.ql
\ No newline at end of file
+query: ProblemQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/RedundantCast/Foo.qll b/ql/ql/test/queries/style/RedundantCast/Foo.qll
index d993f654bc4..4410d344c9f 100644
--- a/ql/ql/test/queries/style/RedundantCast/Foo.qll
+++ b/ql/ql/test/queries/style/RedundantCast/Foo.qll
@@ -2,10 +2,10 @@ class Foo extends string {
   Foo() { this = "Foo" }
 }
 
-predicate test(Foo f) { f.(Foo).toString() = "X" }
+predicate test(Foo f) { f.(Foo).toString() = "X" } // $ Alert
 
-predicate test2(Foo a, Foo b) { a.(Foo) = b }
+predicate test2(Foo a, Foo b) { a.(Foo) = b } // $ Alert
 
 predicate called(Foo a) { a.toString() = "X" }
 
-predicate test3(string s) { called(s.(Foo)) }
+predicate test3(string s) { called(s.(Foo)) } // $ Alert
diff --git a/ql/ql/test/queries/style/RedundantCast/RedundantCast.qlref b/ql/ql/test/queries/style/RedundantCast/RedundantCast.qlref
index 659062d3ae5..77bbbe67466 100644
--- a/ql/ql/test/queries/style/RedundantCast/RedundantCast.qlref
+++ b/ql/ql/test/queries/style/RedundantCast/RedundantCast.qlref
@@ -1 +1,2 @@
-queries/style/RedundantCast.ql
+query: queries/style/RedundantCast.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/RedundantImport/D.qll b/ql/ql/test/queries/style/RedundantImport/D.qll
index 1badf0ebbc5..ba5df313cdb 100644
--- a/ql/ql/test/queries/style/RedundantImport/D.qll
+++ b/ql/ql/test/queries/style/RedundantImport/D.qll
@@ -1,2 +1,2 @@
-import folder.A
+import folder.A // $ Alert
 import folder.B
diff --git a/ql/ql/test/queries/style/RedundantImport/RedundantImport.qlref b/ql/ql/test/queries/style/RedundantImport/RedundantImport.qlref
index a2ff992e5cd..acacf6163e5 100644
--- a/ql/ql/test/queries/style/RedundantImport/RedundantImport.qlref
+++ b/ql/ql/test/queries/style/RedundantImport/RedundantImport.qlref
@@ -1 +1,2 @@
-queries/style/RedundantImport.ql
\ No newline at end of file
+query: queries/style/RedundantImport.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/RedundantOverride/RedundantOverride.qll b/ql/ql/test/queries/style/RedundantOverride/RedundantOverride.qll
index 35df3b3194c..01d4e128615 100644
--- a/ql/ql/test/queries/style/RedundantOverride/RedundantOverride.qll
+++ b/ql/ql/test/queries/style/RedundantOverride/RedundantOverride.qll
@@ -6,7 +6,7 @@ module Test1 {
   }
 
   class Bar extends Foo {
-    override Foo pred() { result = Foo.super.pred() } // BAD
+    override Foo pred() { result = Foo.super.pred() } // $ Alert // BAD
   }
 }
 
@@ -18,7 +18,7 @@ module Test2 {
   }
 
   class Bar extends Foo {
-    override Foo pred() { result = super.pred() } // BAD
+    override Foo pred() { result = super.pred() } // $ Alert // BAD
   }
 }
 
@@ -107,7 +107,7 @@ module Test8 {
   }
 
   class Bar extends Foo {
-    override predicate pred(Foo f) { super.pred(f) } // BAD
+    override predicate pred(Foo f) { super.pred(f) } // $ Alert // BAD
   }
 }
 
@@ -121,15 +121,15 @@ module Test9 {
   class Bar extends Foo {
     Bar() { this = 1 }
 
-    override Foo pred() { Foo.super.pred() = result } // BAD
+    override Foo pred() { Foo.super.pred() = result } // $ Alert // BAD
   }
 
   class Baz1 extends Foo, Bar {
-    override Foo pred() { Foo.super.pred() = result } // BAD
+    override Foo pred() { Foo.super.pred() = result } // $ Alert // BAD
   }
 
   class Baz2 extends Foo, Baz1 {
-    override Foo pred() { Baz1.super.pred() = result } // BAD
+    override Foo pred() { Baz1.super.pred() = result } // $ Alert // BAD
   }
 }
 
@@ -147,7 +147,7 @@ module Test10 {
   }
 
   class Baz1 extends Foo, Bar {
-    override Foo pred() { result = Foo.super.pred() } // BAD
+    override Foo pred() { result = Foo.super.pred() } // $ Alert // BAD
   }
 }
 
@@ -161,19 +161,19 @@ module Test11 {
   class Bar1 extends Foo {
     Bar1() { this = [1 .. 3] }
 
-    override Foo pred() { Foo.super.pred() = result } // BAD
+    override Foo pred() { Foo.super.pred() = result } // $ Alert // BAD
   }
 
   class Bar2 extends Foo, Bar1 {
-    override Foo pred() { Foo.super.pred() = result } // BAD
+    override Foo pred() { Foo.super.pred() = result } // $ Alert // BAD
   }
 
   class Bar3 extends Foo, Bar2 {
-    override Foo pred() { Bar2.super.pred() = result } // BAD
+    override Foo pred() { Bar2.super.pred() = result } // $ Alert // BAD
   }
 
   class Bar4 extends Bar2, Bar3 {
-    override Foo pred() { result = Bar2.super.pred() } // BAD
+    override Foo pred() { result = Bar2.super.pred() } // $ Alert // BAD
   }
 
   class Bar5 extends Foo {
diff --git a/ql/ql/test/queries/style/RedundantOverride/RedundantOverride.qlref b/ql/ql/test/queries/style/RedundantOverride/RedundantOverride.qlref
index aca59af1cce..ac16aebc2e7 100644
--- a/ql/ql/test/queries/style/RedundantOverride/RedundantOverride.qlref
+++ b/ql/ql/test/queries/style/RedundantOverride/RedundantOverride.qlref
@@ -1 +1,2 @@
-queries/style/RedundantOverride.ql
+query: queries/style/RedundantOverride.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/SwappedParameterNames/SwappedParameterNames.qlref b/ql/ql/test/queries/style/SwappedParameterNames/SwappedParameterNames.qlref
index cab8c347410..78ad77024ca 100644
--- a/ql/ql/test/queries/style/SwappedParameterNames/SwappedParameterNames.qlref
+++ b/ql/ql/test/queries/style/SwappedParameterNames/SwappedParameterNames.qlref
@@ -1 +1,2 @@
-queries/style/SwappedParameterNames.ql
\ No newline at end of file
+query: queries/style/SwappedParameterNames.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/SwappedParameterNames/Test.qll b/ql/ql/test/queries/style/SwappedParameterNames/Test.qll
index 5c8083d3098..0ee3760c7cb 100644
--- a/ql/ql/test/queries/style/SwappedParameterNames/Test.qll
+++ b/ql/ql/test/queries/style/SwappedParameterNames/Test.qll
@@ -9,5 +9,5 @@ class Correct extends Sup {
 }
 
 class Wrong extends Sup {
-  override predicate step(Expr succ, Expr pred) { none() } // <- swapped parameter names
+  override predicate step(Expr succ, Expr pred) { none() } // $ Alert // <- swapped parameter names
 }
diff --git a/ql/ql/test/queries/style/UseInstanceofExtension/Foo.qll b/ql/ql/test/queries/style/UseInstanceofExtension/Foo.qll
index b58cb3f93e3..b6479e6fc3a 100644
--- a/ql/ql/test/queries/style/UseInstanceofExtension/Foo.qll
+++ b/ql/ql/test/queries/style/UseInstanceofExtension/Foo.qll
@@ -4,7 +4,7 @@ class Range extends string {
   string getAChild() { result = "test" }
 }
 
-class Inst extends string {
+class Inst extends string { // $ Alert
   Range range;
 
   Inst() { this = range }
@@ -12,13 +12,13 @@ class Inst extends string {
   string getAChild() { result = range.getAChild() }
 }
 
-class Inst2 extends string {
+class Inst2 extends string { // $ Alert
   Inst2() { this instanceof Range }
 
   string getAChild() { result = this.(Range).getAChild() }
 }
 
-class Inst3 extends string {
+class Inst3 extends string { // $ Alert
   Range range;
 
   Inst3() { this = range }
@@ -26,6 +26,6 @@ class Inst3 extends string {
   Range getRange() { result = range }
 }
 
-class Inst4 extends string {
+class Inst4 extends string { // $ Alert
   Inst4() { this instanceof Range }
 }
diff --git a/ql/ql/test/queries/style/UseInstanceofExtension/UseInstanceofExtension.qlref b/ql/ql/test/queries/style/UseInstanceofExtension/UseInstanceofExtension.qlref
index 4b8a6515787..d895947b87b 100644
--- a/ql/ql/test/queries/style/UseInstanceofExtension/UseInstanceofExtension.qlref
+++ b/ql/ql/test/queries/style/UseInstanceofExtension/UseInstanceofExtension.qlref
@@ -1 +1,2 @@
-queries/style/UseInstanceofExtension.ql
\ No newline at end of file
+query: queries/style/UseInstanceofExtension.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/UseSetLiteral/UseSetLiteral.qlref b/ql/ql/test/queries/style/UseSetLiteral/UseSetLiteral.qlref
index d4047ebc29f..545dc8d4842 100644
--- a/ql/ql/test/queries/style/UseSetLiteral/UseSetLiteral.qlref
+++ b/ql/ql/test/queries/style/UseSetLiteral/UseSetLiteral.qlref
@@ -1 +1,2 @@
-queries/style/UseSetLiteral.ql
\ No newline at end of file
+query: queries/style/UseSetLiteral.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/UseSetLiteral/test.qll b/ql/ql/test/queries/style/UseSetLiteral/test.qll
index fcc581c3e8c..0fd1dab6ddd 100644
--- a/ql/ql/test/queries/style/UseSetLiteral/test.qll
+++ b/ql/ql/test/queries/style/UseSetLiteral/test.qll
@@ -4,7 +4,7 @@ predicate test1(int a) {
   a = 1 or // BAD
   a = 2 or
   a = 3 or
-  a = 4
+  a = 4 // $ Alert
 }
 
 predicate test2(int a) {
@@ -30,7 +30,7 @@ predicate test5() {
   test1(1) or // BAD
   test1(2) or
   test1(3) or
-  test1(4)
+  test1(4) // $ Alert
 }
 
 predicate test6() {
@@ -44,7 +44,7 @@ int test7() {
   1 = result or // BAD
   2 = result or
   3 = result or
-  4 = result
+  4 = result // $ Alert
 }
 
 predicate test8() {
@@ -62,19 +62,19 @@ class MyTest8Class extends int {
       this = 1 or // BAD
       this = 2 or
       this = 3 or
-      this = 4
+      this = 4 // $ Alert
     ) and
     (
       s = "1" or // BAD
       s = "2" or
       s = "3" or
-      s = "4"
+      s = "4" // $ Alert
     ) and
     exists(float f |
       f = 1.0 or // BAD
       f = 1.5 or
       f = 2.0 or
-      f = 2.5
+      f = 2.5 // $ Alert
     )
   }
 
@@ -89,7 +89,7 @@ predicate test9(MyTest8Class c) {
   c.is(1) or // BAD
   c.is(2) or
   c.is(3) or
-  c.is(4)
+  c.is(4) // $ Alert
 }
 
 predicate test10(MyTest8Class c) {
@@ -133,5 +133,5 @@ predicate test14(int a) {
     (a = 2 or a = 3)
     or
     a = 4
-  )
+  ) // $ Alert
 }
diff --git a/ql/ql/test/queries/style/ValidatePredicateGetReturns/ValidatePredicateGetReturns.qlref b/ql/ql/test/queries/style/ValidatePredicateGetReturns/ValidatePredicateGetReturns.qlref
index e116f69d6b2..7a89245d787 100644
--- a/ql/ql/test/queries/style/ValidatePredicateGetReturns/ValidatePredicateGetReturns.qlref
+++ b/ql/ql/test/queries/style/ValidatePredicateGetReturns/ValidatePredicateGetReturns.qlref
@@ -1 +1,2 @@
-queries/style/ValidatePredicateGetReturns.ql
+query: queries/style/ValidatePredicateGetReturns.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/ql/ql/test/queries/style/ValidatePredicateGetReturns/test.qll b/ql/ql/test/queries/style/ValidatePredicateGetReturns/test.qll
index 2cc4dec64d2..e9c34eb94a6 100644
--- a/ql/ql/test/queries/style/ValidatePredicateGetReturns/test.qll
+++ b/ql/ql/test/queries/style/ValidatePredicateGetReturns/test.qll
@@ -1,7 +1,7 @@
 import ql
 
 // NOT OK -- Predicate starts with "get" but does not return a value
-predicate getValue() { none() }
+predicate getValue() { none() } // $ Alert
 
 // OK -- starts with get and returns a value
 string getData() { result = "data" }
@@ -22,13 +22,13 @@ predicate getvalue() { none() }
 predicate retrieveValue() { none() }
 
 // NOT OK -- starts with get and does not return value
-predicate getImplementation2() { none() }
+predicate getImplementation2() { none() } // $ Alert
 
 // NOT OK -- is an alias for a predicate which does not have a return value
-predicate getAlias2 = getImplementation2/0;
+predicate getAlias2 = getImplementation2/0; // $ Alert
 
 // NOT OK -- starts with as and does not return value
-predicate asValue() { none() }
+predicate asValue() { none() } // $ Alert
 
 // OK -- starts with as but followed by a lowercase letter, probably should be ignored
 predicate assessment() { none() }
@@ -45,7 +45,7 @@ HiddenType getInjectableCompositeActionNode() {
 predicate implementation4() { none() }
 
 // NOT OK -- is an alias
-predicate getAlias4 = implementation4/0;
+predicate getAlias4 = implementation4/0; // $ Alert
 
 // OK -- is an alias
 predicate alias5 = implementation4/0;
@@ -58,7 +58,7 @@ predicate edge(int x, int y) { none() }
 int getDistance(int x) = shortestDistances(root/0, edge/2)(_, x, result)
 
 // NOT OK -- Higher-order predicate that does not return a value even though has 'get' in the name
-predicate getDistance2(int x, int y) = shortestDistances(root/0, edge/2)(_, x, y)
+predicate getDistance2(int x, int y) = shortestDistances(root/0, edge/2)(_, x, y) // $ Alert
 
 // OK
 predicate unresolvedAlias = unresolved/0;

From 78d95719a567f33235b2d71a0077efd979e957c2 Mon Sep 17 00:00:00 2001
From: Owen Mansel-Chan <owen-mc@github.com>
Date: Mon, 15 Jun 2026 11:49:03 +0100
Subject: [PATCH 2/2] Do not convert test that is example of not using inline
 expectations

---
 .../QlRefInlineExpectations/QlRefInlineExpectations.expected    | 2 +-
 ql/ql/test/queries/style/QlRefInlineExpectations/Test3.qlref    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ql/ql/test/queries/style/QlRefInlineExpectations/QlRefInlineExpectations.expected b/ql/ql/test/queries/style/QlRefInlineExpectations/QlRefInlineExpectations.expected
index 9605589e514..4725f6b634b 100644
--- a/ql/ql/test/queries/style/QlRefInlineExpectations/QlRefInlineExpectations.expected
+++ b/ql/ql/test/queries/style/QlRefInlineExpectations/QlRefInlineExpectations.expected
@@ -1 +1 @@
-| Test3.qlref:1:1:1:22 | query:  ... uery.ql | Query test does not use inline test expectations. |
+| Test3.qlref:1:1:1:23 | query:  ... uery.ql | Query test does not use inline test expectations. |
diff --git a/ql/ql/test/queries/style/QlRefInlineExpectations/Test3.qlref b/ql/ql/test/queries/style/QlRefInlineExpectations/Test3.qlref
index f840a91b59e..d6af10c0fe6 100644
--- a/ql/ql/test/queries/style/QlRefInlineExpectations/Test3.qlref
+++ b/ql/ql/test/queries/style/QlRefInlineExpectations/Test3.qlref
@@ -1,2 +1 @@
 query: ProblemQuery.ql
-postprocess: utils/test/InlineExpectationsTestQuery.ql