From 1033b8610aaad16994666e5ff89dac3549f82dbb Mon Sep 17 00:00:00 2001
From: Tom Hvitved <hvitved@github.com>
Date: Thu, 17 Dec 2020 10:23:27 +0100
Subject: [PATCH] CFG: Add more tests

---
 .../controlflow/graph/Cfg.expected            | 71 ++++++++++++++++++-
 .../library-tests/controlflow/graph/raise.rb  |  6 +-
 2 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/ql/test/library-tests/controlflow/graph/Cfg.expected b/ql/test/library-tests/controlflow/graph/Cfg.expected
index a2fd71aa2eb..ec9b794b989 100644
--- a/ql/test/library-tests/controlflow/graph/Cfg.expected
+++ b/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -162,6 +162,12 @@ raise.rb:
 #  150| enter m13
 #-----|  -> Ensure
 
+#  154| enter m14
+#-----|  -> element
+
+#  155| enter block
+#-----|  -> elem
+
 break_ensure.rb:
 #    1| Method
 #-----|  -> m2
@@ -3641,7 +3647,7 @@ raise.rb:
 #-----|  -> [ensure: raise] Return
 
 #  150| Method
-#-----|  -> exit top-level (normal)
+#-----|  -> m14
 
 #  150| m13
 #-----|  -> Method
@@ -3649,6 +3655,53 @@ raise.rb:
 #  151| Ensure
 #-----|  -> exit m13 (normal)
 
+#  154| Method
+#-----|  -> exit top-level (normal)
+
+#  154| m14
+#-----|  -> Method
+
+#  154| element
+#-----|  -> element
+
+#  155| Call
+#-----|  -> exit m14 (normal)
+
+#  155| element
+#-----|  -> each
+
+#  155| each
+#-----|  -> Block
+
+#  155| Block
+#-----|  -> Call
+
+#  155| elem
+#-----|  -> element
+
+#  155| IfModifier
+#-----|  -> exit block (normal)
+
+#  155| Call
+#-----| raise -> exit m14 (abnormal)
+#-----| raise -> exit block (abnormal)
+
+#  155| raise
+#-----|  -> String
+
+#  155| String
+#-----|  -> Call
+
+#  155| Call
+#-----| false -> IfModifier
+#-----| true -> raise
+
+#  155| element
+#-----|  -> nil?
+
+#  155| nil?
+#-----|  -> Call
+
 break_ensure.rb:
 #    1| exit top-level
 
@@ -3759,6 +3812,10 @@ raise.rb:
 
 #  150| exit m13
 
+#  154| exit m14
+
+#  155| exit block
+
 break_ensure.rb:
 #    1| exit top-level (normal)
 #-----|  -> exit top-level
@@ -3952,3 +4009,15 @@ raise.rb:
 
 #  150| exit m13 (normal)
 #-----|  -> exit m13
+
+#  154| exit m14 (abnormal)
+#-----|  -> exit m14
+
+#  154| exit m14 (normal)
+#-----|  -> exit m14
+
+#  155| exit block (abnormal)
+#-----|  -> exit block
+
+#  155| exit block (normal)
+#-----|  -> exit block
diff --git a/ql/test/library-tests/controlflow/graph/raise.rb b/ql/test/library-tests/controlflow/graph/raise.rb
index f75f4fa7e8e..f4e24402649 100644
--- a/ql/test/library-tests/controlflow/graph/raise.rb
+++ b/ql/test/library-tests/controlflow/graph/raise.rb
@@ -149,4 +149,8 @@ end
 
 def m13
 ensure
-end
\ No newline at end of file
+end
+
+def m14 element
+  element.each { |elem| raise "" if element.nil? }
+end