1242 - simpler implementation for 'scenario'

Also now has the side effect that scenarios can have any number of 'run'
or check or any future blocks, in any order.

1 files changed, 50 insertions, 2 deletions

diff --git a/cpp/051scenario_test.mu b/cpp/051scenario_test.mu
index d401c62b..5064f8a5 100644
--- a/cpp/051scenario_test.mu
+++ b/cpp/051scenario_test.mu
@@ -4,7 +4,28 @@ scenario first_scenario_in_mu [
   run [
     1:integer <- add 2:literal, 2:literal
   ]
-  memory should contain [
+  memory-should-contain [
+    1 <- 4
+  ]
+]
+
+scenario scenario_with_comment_in_mu [
+  run [
+    # comment
+    1:integer <- add 2:literal, 2:literal
+  ]
+  memory-should-contain [
+    1 <- 4
+  ]
+]
+
+scenario scenario_with_multiple_comments_in_mu [
+  run [
+    # comment1
+    # comment2
+    1:integer <- add 2:literal, 2:literal
+  ]
+  memory-should-contain [
     1 <- 4
   ]
 ]
@@ -16,7 +37,34 @@ scenario check_string_in_memory [
     3:character <- copy 98:literal  # 'b'
     4:character <- copy 99:literal  # 'c'
   ]
-  memory should contain [
+  memory-should-contain [
     1:string <- [abc]
   ]
 ]
+
+scenario check_trace [
+  run [
+    1:integer <- add 2:literal, 2:literal
+  ]
+  trace-should-contain [
+    mem: storing 4 in location 1
+  ]
+]
+
+scenario check_trace_negative [
+  run [
+    1:integer <- add 2:literal, 2:literal
+  ]
+  trace-should-not-contain [
+    mem: storing 5 in location 1
+  ]
+]
+
+scenario check_trace_instruction [
+  run [
+    trace [foo], [aaa]
+  ]
+  trace-should-contain [
+    foo: aaa
+  ]
+]