changeset 31:102945485663

Small simplification to tests
author Chris Cannam
date Fri, 21 Dec 2012 13:31:10 +0000
parents 45a57e2fb4ae
children 025c88d62f7a
files test/test_framer.yeti
diffstat 1 files changed, 9 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/test/test_framer.yeti	Fri Dec 21 13:30:23 2012 +0000
+++ b/test/test_framer.yeti	Fri Dec 21 13:31:10 2012 +0000
@@ -64,31 +64,27 @@
 
 "frames-2x5": \( 
     fr = fr.frames { blocksize = 2, hop = 2 } (test.testStream 5);
-    expected = array [ [1,2], [3,4], [5,0] ];
-    obtained = array (map block.list fr);
-    test.compare obtained expected;
+    expected = [ [1,2], [3,4], [5,0] ];
+    test.compare (map block.list fr) expected;
 ),
 
 "frames-4.3x4": \( 
     fr = fr.frames { blocksize = 4, hop = 3 } (test.testStream 4);
-    expected = array [ [0,1,2,3], [3,4,0,0] ];
-    obtained = array (map block.list fr);
-    test.compare obtained expected;
+    expected = [ [0,1,2,3], [3,4,0,0] ];
+    test.compare (map block.list fr) expected;
 ),
 
 "frames-3.2x4": \(
     fr = fr.frames { blocksize = 3, hop = 2 } (test.testStream 4);
-    expected = array [ [0,1,2], [2,3,4], [4,0,0] ];
-    obtained = array (map block.list fr);
-    test.compare obtained expected;
+    expected = [ [0,1,2], [2,3,4], [4,0,0] ];
+    test.compare (map block.list fr) expected;
 ),
 
 "frames-3.1x6": \(
     fr = fr.frames { blocksize = 3, hop = 1 } (test.testStream 6);
-    expected = array [ [0,0,1], [0,1,2], [1,2,3], [2,3,4],
-                       [3,4,5], [4,5,6], [5,6,0], [6,0,0] ];
-    obtained = array (map block.list fr);
-    test.compare obtained expected;
+    expected = [ [0,0,1], [0,1,2], [1,2,3], [2,3,4],
+                 [3,4,5], [4,5,6], [5,6,0], [6,0,0] ];
+    test.compare (map block.list fr) expected;
 ),
 
 ];