RegressionTests__ExternalStreamTest.st
branchjv
changeset 1496 fa09c72ff3cf
parent 274 14bd9bd8c7f2
child 1499 26a16a04219b
--- a/RegressionTests__ExternalStreamTest.st	Wed Jun 01 23:32:01 2016 +0200
+++ b/RegressionTests__ExternalStreamTest.st	Thu Jun 23 21:55:16 2016 +0100
@@ -6,11 +6,18 @@
 	instanceVariableNames:''
 	classVariableNames:''
 	poolDictionaries:''
-	category:'Streams-New-Tests'
+	category:'tests-Regression-Streams'
 !
 
+!ExternalStreamTest class methodsFor:'documentation'!
 
-!ExternalStreamTest methodsFor:'tests'!
+documentation
+"
+    tests functions of the new stream package (which is not yet deployed)
+"
+! !
+
+!ExternalStreamTest methodsFor:'test-helpers'!
 
 createWithSize10:fileName
     "helper"
@@ -27,7 +34,9 @@
     "
      self new createWithSize10:'xxx1'
     "
-!
+! !
+
+!ExternalStreamTest methodsFor:'tests'!
 
 testCopyFile1
     self assert:('smalltalk.rc' asFilename exists).
@@ -44,12 +53,15 @@
 !
 
 testPosition1
-    |h s ch|
+    |h s ch externalReadStream|
+
+    externalReadStream := (Smalltalk at:#ExternalReadStream).
+    self skipIf:externalReadStream isBehavior not description:'skipped until new stream package is used'.
 
     self createWithSize10:'xxx3'.
 
     h := OperatingSystem openFileForRead:'xxx3'.
-    s := ExternalReadStream on:h.
+    s := externalReadStream on:h.
 
     self assert:( s atEnd not ).
     self assert:( s position == 0 ).
@@ -77,12 +89,15 @@
 !
 
 testPosition2
-    |h s|
+    |h s externalReadStream|
+
+    externalReadStream := (Smalltalk at:#ExternalReadStream).
+    self skipIf:externalReadStream isBehavior not description:'skipped until new stream package is used'.
 
     self createWithSize10:'xxx3'.
 
     h := OperatingSystem openFileForRead:'xxx3'.
-    s := ExternalReadStream on:h.
+    s := externalReadStream on:h.
 
     self assert:( s atEnd not ).
     self assert:( s position == 0 ).
@@ -104,15 +119,18 @@
 testRead1
     "open an existing file for reading; should read 10 chars"
 
-    |h s nBytesRead|
+    |h s nBytesRead externalReadStream|
+
+    externalReadStream := (Smalltalk at:#ExternalReadStream).
+    self skipIf:externalReadStream isBehavior not description:'skipped until new stream package is used'.
 
     self createWithSize10:'xxx3'.
 
     h := OperatingSystem openFileForRead:'xxx3'.
-    s := ExternalReadStream on:h.
+    s := externalReadStream on:h.
 
     '1234567890' do:[:eachExpected |
-	self assert:( s next == eachExpected ).
+        self assert:( s next == eachExpected ).
     ].
 
     s close.
@@ -127,19 +145,22 @@
 testRead2
     "open an existing file for reading; should read 10 chars"
 
-    |h s|
+    |h s externalReadStream|
+
+    externalReadStream := (Smalltalk at:#ExternalReadStream).
+    self skipIf:externalReadStream isBehavior not description:'skipped until new stream package is used'.
 
     self createWithSize10:'xxx3'.
 
     h := OperatingSystem openFileForRead:'xxx3'.
-    s := ExternalReadStream on:h.
+    s := externalReadStream on:h.
     s binary.
 
     '1234567890' do:[:eachExpected |
-	|eachRead|
+        |eachRead|
 
-	eachRead := s next.
-	self assert:( eachRead == eachExpected asciiValue ).
+        eachRead := s next.
+        self assert:( eachRead == eachExpected asciiValue ).
     ].
 
     s close.
@@ -154,12 +175,15 @@
 testRead3
     "open an existing file for reading; should read 10 chars"
 
-    |h s bytesRead|
+    |h s bytesRead externalReadStream|
+
+    externalReadStream := (Smalltalk at:#ExternalReadStream).
+    self skipIf:externalReadStream isBehavior not description:'skipped until new stream package is used'.
 
     self createWithSize10:'xxx3'.
 
     h := OperatingSystem openFileForRead:'xxx3'.
-    s := ExternalReadStream on:h.
+    s := externalReadStream on:h.
 
     self assert:( s atEnd not ).
 
@@ -177,12 +201,15 @@
 !
 
 testReadWait1
-    |h s ok|
+    |h s ok externalReadStream|
+
+    externalReadStream := (Smalltalk at:#ExternalReadStream).
+    self skipIf:externalReadStream isBehavior not description:'skipped until new stream package is used'.
 
     self createWithSize10:'xxx3'.
 
     h := OperatingSystem openFileForRead:'xxx3'.
-    s := ExternalReadStream on:h.
+    s := externalReadStream on:h.
 
     ok := (s readWaitWithTimeout:1) == false.
 
@@ -198,19 +225,23 @@
 !
 
 testTiming1
-    |h s t|
+    |h s t externalWriteStream externalReadStream|
+
+    externalWriteStream := (Smalltalk at:#ExternalWriteStream).
+    externalReadStream := (Smalltalk at:#ExternalReadStream).
+    self skipIf:externalWriteStream isBehavior not description:'skipped until new stream package is used'.
 
     ('xxx1' asFilename exists) ifTrue:[
-	'xxx1' asFilename delete
+        'xxx1' asFilename delete
     ].
 
     h := OperatingSystem createFileForReadWrite:'xxx1'.
-    s := ExternalWriteStream on:h.
+    s := externalWriteStream on:h.
 
     t := Time millisecondsToRun:[
-	1000000 timesRepeat:[
-	    s nextPut:$a.
-	].
+        1000000 timesRepeat:[
+            s nextPut:$a.
+        ].
     ].
     s close.
     Transcript showCR:'Time to write: ' , t printString.
@@ -219,18 +250,18 @@
     self assert:( 'xxx1' asFilename fileSize == 1000000 ).
 
     h := OperatingSystem openFileForRead:'xxx1'.
-    s := ExternalReadStream on:h.
+    s := externalReadStream on:h.
 
     t := Time millisecondsToRun:[
-	1000000 timesRepeat:[
-	    self assert:(s next == $a).
-	].
+        1000000 timesRepeat:[
+            self assert:(s next == $a).
+        ].
     ].
     s close.
     Transcript showCR:'Time to read: ' , t printString.
 
     ('xxx1' asFilename exists) ifTrue:[
-	'xxx1' asFilename delete
+        'xxx1' asFilename delete
     ].
 
     "
@@ -239,19 +270,23 @@
 !
 
 testTiming2
-    |h s t|
+    |h s t externalWriteStream externalReadStream|
+
+    externalWriteStream := (Smalltalk at:#ExternalWriteStream).
+    externalReadStream := (Smalltalk at:#ExternalReadStream).
+    self skipIf:externalWriteStream isBehavior not description:'skipped until new stream package is used'.
 
     ('xxx1' asFilename exists) ifTrue:[
-	'xxx1' asFilename delete
+        'xxx1' asFilename delete
     ].
 
     h := OperatingSystem createFileForReadWrite:'xxx1'.
-    s := ExternalWriteStream on:h.
+    s := externalWriteStream on:h.
 
     t := Time millisecondsToRun:[
-	100000 timesRepeat:[
-	    s nextPutAll:'0123456789'.
-	].
+        100000 timesRepeat:[
+            s nextPutAll:'0123456789'.
+        ].
     ].
     s close.
     Transcript showCR:'Time to write: ' , t printString.
@@ -260,18 +295,18 @@
     self assert:( 'xxx1' asFilename fileSize == 1000000 ).
 
     h := OperatingSystem openFileForRead:'xxx1'.
-    s := ExternalReadStream on:h.
+    s := externalReadStream on:h.
 
     t := Time millisecondsToRun:[
-	100000 timesRepeat:[
-	    self assert:((s next:10) = '0123456789').
-	].
+        100000 timesRepeat:[
+            self assert:((s next:10) = '0123456789').
+        ].
     ].
     s close.
     Transcript showCR:'Time to read: ' , t printString.
 
     ('xxx1' asFilename exists) ifTrue:[
-	'xxx1' asFilename delete
+        'xxx1' asFilename delete
     ].
 
     "
@@ -280,14 +315,17 @@
 !
 
 testWrite1
-    |h s|
+    |h s externalWriteStream|
+
+    externalWriteStream := (Smalltalk at:#ExternalWriteStream).
+    self skipIf:externalWriteStream isBehavior not description:'skipped until new stream package is used'.
 
     ('xxx1' asFilename exists) ifTrue:[
-	'xxx1' asFilename delete
+        'xxx1' asFilename delete
     ].
 
     h := OperatingSystem createFileForReadWrite:'xxx1'.
-    s := ExternalWriteStream on:h.
+    s := externalWriteStream on:h.
 
     s nextPutAll:'1234567890'.
     s close.
@@ -297,7 +335,7 @@
     self assert:( 'xxx1' asFilename contentsOfEntireFile = '1234567890' ).
 
     ('xxx1' asFilename exists) ifTrue:[
-	'xxx1' asFilename delete
+        'xxx1' asFilename delete
     ].
 
     "
@@ -306,14 +344,17 @@
 !
 
 testWrite2
-    |h s|
+    |h s externalWriteStream|
+
+    externalWriteStream := (Smalltalk at:#ExternalWriteStream).
+    self skipIf:externalWriteStream isBehavior not description:'skipped until new stream package is used'.
 
     ('xxx1' asFilename exists) ifTrue:[
-	'xxx1' asFilename delete
+        'xxx1' asFilename delete
     ].
 
     h := OperatingSystem createFileForReadWrite:'xxx1'.
-    s := ExternalWriteStream on:h.
+    s := externalWriteStream on:h.
 
     self assert:( s position == 0 ).
     s nextPutAll:'1234567890'.
@@ -327,7 +368,7 @@
     self assert:( 'xxx1' asFilename contentsOfEntireFile = '1234567890' ).
 
     ('xxx1' asFilename exists) ifTrue:[
-	'xxx1' asFilename delete
+        'xxx1' asFilename delete
     ].
 
     "
@@ -336,14 +377,17 @@
 !
 
 testWrite3
-    |h s|
+    |h s externalWriteStream|
+
+    externalWriteStream := (Smalltalk at:#ExternalWriteStream).
+    self skipIf:externalWriteStream isBehavior not description:'skipped until new stream package is used'.
 
     ('xxx1' asFilename exists) ifTrue:[
-	'xxx1' asFilename delete
+        'xxx1' asFilename delete
     ].
 
     h := OperatingSystem createFileForReadWrite:'xxx1'.
-    s := ExternalWriteStream on:h.
+    s := externalWriteStream on:h.
 
     s nextPutAll:'1234567890'.
     self assert:( s position == 10 ).
@@ -358,7 +402,7 @@
     self assert:( 'xxx1' asFilename contentsOfEntireFile = '12345abcdefghij' ).
 
     ('xxx1' asFilename exists) ifTrue:[
-	'xxx1' asFilename delete
+        'xxx1' asFilename delete
     ].
 
     "