Unify prim.bqn and other test formats by using expected result 1 if there's no %

2 files changed, 5 insertions, 11 deletions

diff --git a/test/dz_comp b/test/dz_comp
index bb6f40dd..4fee5da3 100755
--- a/test/dz_comp
+++ b/test/dz_comp
@@ -26,11 +26,10 @@ Native ← {⍎𝕩}
 exec ← (rt¬nc)◶⟨Native˙, DRun˙, {𝕩⊸DRun}∘GetRT⟩ @
 
 Cases ← (0<≠)◶0‿('#'≠⊑)¨⊸/ · •FLines "cases/"∾∾⟜".bqn"
-c ← ∾ Cases¨ "simple"‿"syntax"
-{𝕩: c ∾↩ "1 %"⊸∾¨ Cases "prim" }⍟⊢ prim
+c ← ∾ Cases¨ "simple"‿"syntax"∾prim/⟨"prim"⟩
 M ← {e‿b:
   Err ← {(@+10)∾˜""""∾b∾""": expected "∾e∾" but received "∾⍕𝕩}
   (Native e) ≢◶""‿Err Exec b
 }
-r ← '%' M∘((+`-2⊸×)∘=⊔⊢)¨ c
+r ← (M '%'⊸= (∨´⊣)◶⟨"1"≍○<⊢,(+`-2⊸×)⊸⊔⟩ ⊢)¨ c
 •Out ("All "∾(⍕≠c)∾" passed!")⍟(0=≠) ∾r
diff --git a/test/js b/test/js
index fd1fa980..6c312b38 100755
--- a/test/js
+++ b/test/js
@@ -3,20 +3,15 @@
 let bqn = require(__dirname+'/../docs/bqn.js');
 let read = require('fs').readFileSync;
 let cases = f=>read(__dirname+'/cases/'+f+'.bqn','utf8').split('\n')
-               .filter(x=>x.length>0 && x.charAt(0)!=='#');
+               .filter(x=>x.length>0 && x.charAt(0)!=='#')
+               .map(x=>x.indexOf('%')===-1?[1,x]:x.split(' % '));
 let args = process.argv.slice(2);
 let prim = args[0]==="-prim";
 
 if (prim || args.length==0) {
-  let t = [].concat(cases('simple'),cases('syntax'))
-          .map(x=>x.split(' % '));
+  let t = [].concat(cases('simple'),cases('syntax'),prim?cases('prim'):[]);
   let test = t.map(e=>e[1]);
   let expt = t.map(e=>+e[0]);
-  if (prim) {
-    let r = cases('prim');
-    test = test.concat(r);
-    expt = expt.concat(r.map(e=>1));
-  }
 
   let rslt = test.map(bqn);
   let pass = rslt.map((r,i)=>r===expt[i]);