Ruby: Add inline barrier guard test

Author: hmac

ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.expected

@@ -1,4 +1,5 @@
-WARNING: Type BarrierGuard has been deprecated and may be removed in future (barrier-guards.ql:9,3-15)
+WARNING: Type BarrierGuard has been deprecated and may be removed in future (barrier-guards.ql:10,3-15)
+failures
 oldStyleBarrierGuards
 | barrier-guards.rb:3:4:3:15 | ... == ... | barrier-guards.rb:4:5:4:7 | foo | barrier-guards.rb:3:4:3:6 | foo | true |
 | barrier-guards.rb:9:4:9:24 | call to include? | barrier-guards.rb:10:5:10:7 | foo | barrier-guards.rb:9:21:9:23 | foo | true |
@@ -82,7 +83,7 @@ controls
 | barrier-guards.rb:125:6:125:10 | "foo" | barrier-guards.rb:126:5:126:7 | foo | match |
 | barrier-guards.rb:125:6:125:10 | "foo" | barrier-guards.rb:128:5:128:7 | foo | no-match |
 | barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:133:5:133:7 | foo | match |
-| barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:134:1:135:7 | when ... | no-match |
+| barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:134:1:135:19 | when ... | no-match |
 | barrier-guards.rb:132:6:132:10 | "foo" | barrier-guards.rb:135:5:135:7 | foo | no-match |
 | barrier-guards.rb:134:6:134:10 | "bar" | barrier-guards.rb:135:5:135:7 | foo | match |
 | barrier-guards.rb:139:6:139:10 | "foo" | barrier-guards.rb:139:14:139:16 | bar | no-match |

ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.ql

@@ -4,6 +4,7 @@ import codeql.ruby.controlflow.CfgNodes
 import codeql.ruby.controlflow.ControlFlowGraph
 import codeql.ruby.controlflow.BasicBlocks
 import codeql.ruby.DataFlow
+import TestUtilities.InlineExpectationsTest
 
 query predicate oldStyleBarrierGuards(
   BarrierGuard g, DataFlow::Node guardedNode, ExprCfgNode expr, boolean branch
@@ -22,3 +23,19 @@ query predicate controls(CfgNode condition, BasicBlock bb, SuccessorTypes::Condi
     condition = cb.getLastNode()
   )
 }
+
+class BarrierGuardTest extends InlineExpectationsTest {
+  BarrierGuardTest() { this = "BarrierGuardTest" }
+
+  override string getARelevantTag() { result = "guarded" }
+
+  override predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "guarded" and
+    exists(DataFlow::Node n |
+      newStyleBarrierGuards(n) and
+      location = n.getLocation() and
+      element = n.toString() and
+      value = ""
+    )
+  }
+}

ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.rb

@@ -1,31 +1,31 @@
 foo = "foo"
 
 if foo == "foo"
-    foo
+    foo # $ guarded
 else
     foo
 end
 
 if ["foo"].include?(foo)
-    foo
+    foo # $ guarded
 else
     foo
 end
 
 if foo != "foo"
     foo
 else
-    foo
+    foo # $ guarded
 end
 
 unless foo == "foo"
     foo
 else
-    foo
+    foo # $ guarded
 end
 
 unless foo != "foo"
-    foo
+    foo # $ guarded
 else
     foo
 end
@@ -35,14 +35,14 @@
 FOO = ["foo"]
 
 if FOO.include?(foo)
-    foo
+    foo # $ guarded
 else
     foo
 end
 
 if foo == "foo"
     capture {
-        foo # guarded
+        foo # $ guarded
     }
 end
 
@@ -68,7 +68,7 @@
 bars = NotAnArray.new
 
 if foos.include?(foo)
-    foo
+    foo # $ guarded
 else
     foo
 end
@@ -80,15 +80,15 @@
 end
 
 if foos.index(foo) != nil
-    foo
+    foo # $ guarded
 else
     foo
 end
 
 if foos.index(foo) == nil
     foo
 else
-    foo
+    foo # $ guarded
 end
 
 bars = ["bar"]
@@ -123,45 +123,45 @@
 
 case foo
 when "foo"
-    foo
+    foo # $ guarded
 else
     foo
 end
 
 case foo
 when "foo"
-    foo
+    foo # $ guarded
 when "bar"
-    foo
+    foo # $ guarded
 end
 
 case foo
-when "foo", "bar" # not recognised
+when "foo", "bar" # $ MISSING: guarded
     foo
-when "baz", "quux" # not recognised
+when "baz", "quux" # $ MISSING: guarded
     foo
 else
     foo
 end
 
 case foo
 when *["foo", "bar"]
-    foo
+    foo # $ guarded
 end
 
 case foo
 when *%w[foo bar]
-    foo
+    foo # $ guarded
 end
 
 case foo
 when *FOO
-    foo
+    foo # $ guarded
 end
 
 case foo
 when *foos
-    foo
+    foo # $ guarded
 end
 
 case foo
@@ -188,24 +188,24 @@
     foo
 end
 
-if foo == "foo" or foo == "bar" # not recognised
-    foo
+if foo == "foo" or foo == "bar"
+    foo # $ MISSING: guarded
 end
 
 case
 when foo == "foo"
-    foo
+    foo # $ guarded
 end
 
 case
-when foo == "foo" then foo
+when foo == "foo" then foo # $ guarded
 when bar == "bar" then foo
 when foo == x then foo
 end
 
 case foo
 in "foo"
-    foo
+    foo # $ guarded
 in x
     foo
 end