RegressionTests__StreamTests.st
changeset 1310 f98c9b95f3e7
parent 1309 546f3f8c980f
child 1311 b45b95e640f9
--- a/RegressionTests__StreamTests.st	Wed Feb 24 15:48:38 2016 +0100
+++ b/RegressionTests__StreamTests.st	Wed Feb 24 16:03:43 2016 +0100
@@ -449,36 +449,34 @@
         self assert:(s contents reversed = expected).
     ].
     
-    #(true false) do:[:msb |
-        testVector := 
-            #(
-                0 1 -1
-                16r7f 16r80 16r81
-                -16r7f -16r80 -16r81
-                16r7fff -16r7fff -16r8000
-            ).
-             
-        s := ReadWriteStream on:(ByteArray new).
-        testVector do:[:written |
-            s nextPutShort:written MSB:msb.
-        ].
+    #(
+        nextPutShort:MSB:   nextShortMSB:
+        nextPutLong:MSB:    nextLongMSB:
+        nextPutHyper:MSB:   nextHyperMSB:
+        
+        nextPutInt16:MSB:   nextInt16MSB:
+        nextPutInt32:MSB:   nextInt32MSB:
+        nextPutInt64:MSB:   nextInt64MSB:
+    ) pairWiseDo:[:writer :reader |
+        #(true false) do:[:msb |
+            testVector := 
+                #(
+                    0 1 -1
+                    16r7f 16r80 16r81
+                    -16r7f -16r80 -16r81
+                    16r7fff -16r7fff -16r8000
+                ).
+                 
+            s := ReadWriteStream on:(ByteArray new).
+            testVector do:[:written |
+                s perform:writer with:written with:msb.
+            ].
 
-        s reset.
-
-        testVector do:[:expected |
-            self assert:(val := s nextShortMSB:msb) == expected.
-        ].
-
+            s reset.
 
-        s := ReadWriteStream on:(ByteArray new).
-        testVector do:[:written |
-            s nextPutLong:written MSB:msb.
-        ].
-
-        s reset.
-
-        testVector do:[:expected |
-            self assert:(val := s nextLongMSB:msb) == expected.
+            testVector do:[:expected |
+                self assert:(val := s perform:reader with:msb) == expected.
+            ].
         ].
     ].