about summary refs log tree commit diff stats
path: root/sandbox/007-sandbox-delete.mu
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2016-09-28 19:48:56 -0700
committerKartik K. Agaram <vc@akkartik.com>2016-09-28 19:48:56 -0700
commit6f65d5918f4b73de56e6cb6362c7cbc7dbbe5945 (patch)
treedec4043f2d62f5dd02156d369e20af247881e2ac /sandbox/007-sandbox-delete.mu
parent1627d836b46440f57d766b154ec488fa2e5a1e06 (diff)
downloadmu-6f65d5918f4b73de56e6cb6362c7cbc7dbbe5945.tar.gz
3429 - standardize Mu scenarios
A long-standing problem has been that I couldn't spread code across
'run' blocks because they were separate scopes, so I've ended up making
them effectively comments. Running code inside a 'run' block is
identical in every way to simply running the code directly. The 'run'
block is merely a visual aid to separate setup from the component under
test.

In the process I've also standardized all Mu scenarios to always run in
a local scope, and only use (raw) numeric addresses for values they want
to check later.
Diffstat (limited to 'sandbox/007-sandbox-delete.mu')
-rw-r--r--sandbox/007-sandbox-delete.mu50
1 files changed, 25 insertions, 25 deletions
diff --git a/sandbox/007-sandbox-delete.mu b/sandbox/007-sandbox-delete.mu
index 03dcb4ec..59fa2c6b 100644
--- a/sandbox/007-sandbox-delete.mu
+++ b/sandbox/007-sandbox-delete.mu
@@ -1,10 +1,10 @@
 ## deleting sandboxes
 
 scenario deleting-sandboxes [
+  local-scope
   trace-until 100/app  # trace too long
   assume-screen 50/width, 15/height
-  1:text <- new []
-  2:&:environment <- new-programming-environment screen:&:screen, 1:text
+  env:&:environment <- new-programming-environment screen:&:screen, []
   # run a few commands
   assume-console [
     type [divide-with-remainder 11, 3]
@@ -12,7 +12,7 @@ scenario deleting-sandboxes [
     type [add 2, 2]
     press F4
   ]
-  event-loop screen:&:screen, console:&:console, 2:&:environment
+  event-loop screen:&:screen, console:&:console, env
   screen-should-contain [
     .                               run (F4)           .
     .                                                  .
@@ -33,7 +33,7 @@ scenario deleting-sandboxes [
     left-click 7, 34
   ]
   run [
-    event-loop screen:&:screen, console:&:console, 2:&:environment
+    event-loop screen:&:screen, console:&:console, env
   ]
   screen-should-contain [
     .                               run (F4)           .
@@ -50,7 +50,7 @@ scenario deleting-sandboxes [
     left-click 3, 49
   ]
   run [
-    event-loop screen:&:screen, console:&:console, 2:&:environment
+    event-loop screen:&:screen, console:&:console, env
   ]
   screen-should-contain [
     .                               run (F4)           .
@@ -144,12 +144,12 @@ def delete-sandbox env:&:environment, sandbox:&:sandbox -> env:&:environment [
 ]
 
 scenario deleting-sandbox-after-scroll [
+  local-scope
   trace-until 100/app  # trace too long
   assume-screen 50/width, 10/height
   # initialize environment
-  1:text <- new []
-  2:&:environment <- new-programming-environment screen:&:screen, 1:text
-  render-all screen, 2:&:environment, render
+  env:&:environment <- new-programming-environment screen:&:screen, []
+  render-all screen, env, render
   # create 2 sandboxes and scroll to second
   assume-console [
     press ctrl-n
@@ -159,7 +159,7 @@ scenario deleting-sandbox-after-scroll [
     press F4
     press page-down
   ]
-  event-loop screen:&:screen, console:&:console, 2:&:environment
+  event-loop screen:&:screen, console:&:console, env
   screen-should-contain [
     .                               run (F4)           .
     .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.
@@ -177,7 +177,7 @@ scenario deleting-sandbox-after-scroll [
     left-click 6, 34
   ]
   run [
-    event-loop screen:&:screen, console:&:console, 2:&:environment
+    event-loop screen:&:screen, console:&:console, env
   ]
   # second sandbox shows in editor; scroll resets to display first sandbox
   screen-should-contain [
@@ -192,12 +192,12 @@ scenario deleting-sandbox-after-scroll [
 ]
 
 scenario deleting-top-sandbox-after-scroll [
+  local-scope
   trace-until 100/app  # trace too long
   assume-screen 50/width, 10/height
   # initialize environment
-  1:text <- new []
-  2:&:environment <- new-programming-environment screen:&:screen, 1:text
-  render-all screen, 2:&:environment, render
+  env:&:environment <- new-programming-environment screen:&:screen, []
+  render-all screen, env, render
   # create 2 sandboxes and scroll to second
   assume-console [
     press ctrl-n
@@ -207,7 +207,7 @@ scenario deleting-top-sandbox-after-scroll [
     press F4
     press page-down
   ]
-  event-loop screen:&:screen, console:&:console, 2:&:environment
+  event-loop screen:&:screen, console:&:console, env
   screen-should-contain [
     .                               run (F4)           .
     .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.
@@ -225,7 +225,7 @@ scenario deleting-top-sandbox-after-scroll [
     left-click 2, 34
   ]
   run [
-    event-loop screen:&:screen, console:&:console, 2:&:environment
+    event-loop screen:&:screen, console:&:console, env
   ]
   # second sandbox shows in editor; scroll resets to display first sandbox
   screen-should-contain [
@@ -240,12 +240,12 @@ scenario deleting-top-sandbox-after-scroll [
 ]
 
 scenario deleting-final-sandbox-after-scroll [
+  local-scope
   trace-until 100/app  # trace too long
   assume-screen 50/width, 10/height
   # initialize environment
-  1:text <- new []
-  2:&:environment <- new-programming-environment screen:&:screen, 1:text
-  render-all screen, 2:&:environment, render
+  env:&:environment <- new-programming-environment screen:&:screen, []
+  render-all screen, env, render
   # create 2 sandboxes and scroll to second
   assume-console [
     press ctrl-n
@@ -256,7 +256,7 @@ scenario deleting-final-sandbox-after-scroll [
     press page-down
     press page-down
   ]
-  event-loop screen:&:screen, console:&:console, 2:&:environment
+  event-loop screen:&:screen, console:&:console, env
   screen-should-contain [
     .                               run (F4)           .
     .━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━.
@@ -271,7 +271,7 @@ scenario deleting-final-sandbox-after-scroll [
     left-click 2, 34
   ]
   run [
-    event-loop screen:&:screen, console:&:console, 2:&:environment
+    event-loop screen:&:screen, console:&:console, env
   ]
   # implicitly scroll up to first sandbox
   screen-should-contain [
@@ -287,12 +287,12 @@ scenario deleting-final-sandbox-after-scroll [
 ]
 
 scenario deleting-updates-sandbox-count [
+  local-scope
   trace-until 100/app  # trace too long
   assume-screen 50/width, 10/height
   # initialize environment
-  1:text <- new []
-  2:&:environment <- new-programming-environment screen:&:screen, 1:text
-  render-all screen, 2:&:environment, render
+  env:&:environment <- new-programming-environment screen:&:screen, []
+  render-all screen, env, render
   # create 2 sandboxes
   assume-console [
     press ctrl-n
@@ -301,7 +301,7 @@ scenario deleting-updates-sandbox-count [
     type [add 1, 1]
     press F4
   ]
-  event-loop screen:&:screen, console:&:console, 2:&:environment
+  event-loop screen:&:screen, console:&:console, env
   screen-should-contain [
     .                               run (F4)           .
     .                                                  .
@@ -321,7 +321,7 @@ scenario deleting-updates-sandbox-count [
     press page-down
   ]
   run [
-    event-loop screen:&:screen, console:&:console, 2:&:environment
+    event-loop screen:&:screen, console:&:console, env
   ]
   # shouldn't go past last sandbox
   screen-should-contain [