Allow test cases to require failure with "! % test"

2 files changed, 14 insertions, 5 deletions

diff --git a/test/dz_comp b/test/dz_comp
index f8d69c57..49847fef 100755
--- a/test/dz_comp
+++ b/test/dz_comp
@@ -30,8 +30,14 @@ Cases ← (0<≠)◶0‿('#'≠⊑)¨⊸/ · •FLines "cases/"∾∾⟜".bqn"
 c ← ∾ Cases¨ files
 Trim ← ((∨`∧∨`⌾⌽)' '⊸≠)⊸/
 M ← {e‿b:
-  Msg ← {(@+10)∾˜""""∾b∾""": expected "∾e∾" but "∾0⊸≢◶⟨"evaluation failed","received "∾·⍕⊑⟩𝕩}
-  (<Native e) ≢◶""‿Msg <∘Exec⎊0 b
+  Msg ← {∾⟨
+    """",b,""": expected "
+    "to fail"⍟("!"⊸≡)e
+    " but "
+    0⊸≡◶⟨"received "∾·⍕⊑,"evaluation failed"⟩𝕩
+    ⥊@+10
+  ⟩}
+  ("!"⊸≡◶⟨<Native,0˙⟩ e) ≢◶""‿Msg <∘Exec⎊0 b
 }
 r ← (M '%'⊸= (∨´⊣)◶⟨"1"≍○<⊢, Trim¨(+`-2⊸×)⊸⊔⟩ ⊢)¨ c
 •Out ("All "∾(⍕≠c)∾" passed!")⍟(0=≠) ∾r
diff --git a/test/js b/test/js
index 0f09b0a9..3f1bcced 100755
--- a/test/js
+++ b/test/js
@@ -12,14 +12,17 @@ let files = onfiles ? args.slice(1) : ['simple','syntax'];
 if (onfiles || args.length==0) {
   let t = [].concat.apply([],files.map(cases));
   let test = t.map(e=>e[1]);
-  let expt = t.map(e=>+e[0]);
+  let expt = t.map(e=>e[0]==='!'?null:+e[0]);
 
-  let rslt = test.map(bqn);
+  let rslt = test.map(t => {try{return bqn(t);}catch(e){return null;}});
   let pass = rslt.map((r,i)=>r===expt[i]);
   let fail = pass.map((p,i)=>p?-1:i).filter(i=>i>=0);
   console.log(
       fail.length
-      ? fail.map(i=>'"'+test[i]+'": expected '+expt[i]+' but received '+rslt[i])
+      ? fail.map(i=>'"'+test[i]+'": expected '
+                   +(e=>e===null?'to fail':e)(expt[i])
+                   +' but '
+                   +(r=>r===null?'evaluation failed':'received '+r)(rslt[i]))
       : "All "+test.length+" passed!"
   );
 } else {