--- a/RegressionTests__FileStreamTest.st Wed Jun 29 21:40:53 2016 +0100
+++ b/RegressionTests__FileStreamTest.st Thu Jun 30 09:02:08 2016 +0100
@@ -13,7 +13,7 @@
!FileStreamTest methodsFor:'cleanup'!
tearDown
- self testFilename remove
+ self testFilename remove
! !
!FileStreamTest methodsFor:'helpers'!
@@ -22,18 +22,18 @@
"create a directory with 20000 files"
'c:\tmp' asFilename exists ifFalse:[
- 'c:\tmp' asFilename makeDirectory
+ 'c:\tmp' asFilename makeDirectory
].
'c:\tmp\BigDirectory' asFilename exists ifFalse:[
- 'c:\tmp\BigDirectory' asFilename makeDirectory
+ 'c:\tmp\BigDirectory' asFilename makeDirectory
].
1 to:20000 do:[:i|
|f s buffer|
- f :='c:\tmp\BigDirectory' asFilename
- construct:(i printString leftPaddedTo:5 with:$0).
+ f :='c:\tmp\BigDirectory' asFilename
+ construct:(i printString leftPaddedTo:5 with:$0).
s := f writeStream binary.
- buffer := ByteArray new:1024.
+ buffer := ByteArray new:1024.
32 timesRepeat:[ s nextPutAll:buffer ].
s close.
].
@@ -53,11 +53,11 @@
f := self testFilename writeStream binary.
bytes := ByteArray new:1024.
1 to:bytes size do:[:i |
- bytes at:i put:(i \\ 256).
+ bytes at:i put:(i \\ 256).
].
100 timesRepeat:[
- f nextPutAll:bytes.
+ f nextPutAll:bytes.
].
f close.
@@ -77,7 +77,7 @@
buffer := ByteArray new:size.
1 to:buffer size do:[:idx |
- buffer at:idx put:(idx \\ 256)
+ buffer at:idx put:(idx \\ 256)
].
file := Filename newTemporary.
@@ -93,13 +93,13 @@
s := file readStream.
s binary.
1 to:size do:[:idx |
- byte := s next.
- byte ~~ (idx \\ 256) ifTrue:[self error:'read data mismatch'].
+ byte := s next.
+ byte ~~ (idx \\ 256) ifTrue:[self error:'read data mismatch'].
].
s close.
(file binaryContentsOfEntireFile ~= buffer) ifTrue:[
- self error:'read data mismatch2'
+ self error:'read data mismatch2'
].
file delete.
@@ -118,8 +118,8 @@
n := 0.
[f atEnd] whileFalse:[
- nRead := f nextBytes:128 into:buffer.
- n := n + nRead.
+ nRead := f nextBytes:128 into:buffer.
+ n := n + nRead.
].
f close.
self assert:(expect = n) description:('got <1p>; expected:<2p>' expandMacrosWith:n with:expect)
@@ -215,15 +215,15 @@
sz := self testFilename fileSize.
sema := Semaphore new:1-20.
20 timesRepeat:[
- [
- [
- self readFileExpecting:sz.
- verbose ifTrue:[ 'done' printCR ].
- ] on:Error do:[:ex|
- errorOccured := ex.
- ].
- sema signal.
- ] fork.
+ [
+ [
+ self readFileExpecting:sz.
+ verbose ifTrue:[ 'done' printCR ].
+ ] on:Error do:[:ex|
+ errorOccured := ex.
+ ].
+ sema signal.
+ ] fork.
].
self assert:(sema waitWithTimeout:20) notNil.
self assert:errorOccured isNil.
@@ -248,19 +248,19 @@
sz := self testFilename fileSize.
p := [
- [
- nLoop timesRepeat:[
- self readFileExpecting:sz.
- ].
- ] on:Error do:[:ex|
- errorOccured := ex.
- ].
+ [
+ nLoop timesRepeat:[
+ self readFileExpecting:sz.
+ ].
+ ] on:Error do:[:ex|
+ errorOccured := ex.
+ ].
] forkAt:7.
count := 0.
[p isDead] whileFalse:[
- Delay waitForMilliseconds:5.
- p interruptWith:[count := count + 1].
+ Delay waitForMilliseconds:5.
+ p interruptWith:[count := count + 1].
].
self assert:errorOccured isNil.
self assert:count > 50. "/ at least 50 times interrupted...
@@ -296,7 +296,7 @@
sz ~= 100 ifTrue:[self error:'size mismatch'].
(file binaryContentsOfEntireFile ~= (101 to:200) asByteArray) ifTrue:[
- self error:'contents mismatch'
+ self error:'contents mismatch'
].
file delete.
@@ -328,9 +328,9 @@
sz := file fileSize.
sz ~= 200 ifTrue:[self error:'size mismatch'].
- (file binaryContentsOfEntireFile ~=
- ((101 to:200) asByteArray , (101 to:200) asByteArray)) ifTrue:[
- self error:'contents mismatch'
+ (file binaryContentsOfEntireFile ~=
+ ((101 to:200) asByteArray , (101 to:200) asByteArray)) ifTrue:[
+ self error:'contents mismatch'
].
file delete.
@@ -366,7 +366,7 @@
"basic writing"
10 timesRepeat:[
- self testWrite1.
+ self testWrite1.
].
"
@@ -382,17 +382,17 @@
|interruptor|
interruptor := [
- [true] whileTrue:[
- Delay waitForMilliseconds:10.
- ].
+ [true] whileTrue:[
+ Delay waitForMilliseconds:10.
+ ].
] forkAt:9.
[
- 50 timesRepeat:[
- self testWrite1.
- ].
+ 50 timesRepeat:[
+ self testWrite1.
+ ].
] valueNowOrOnUnwindDo:[
- interruptor terminate
+ interruptor terminate
].
"
@@ -406,22 +406,22 @@
testWriteEOLModes
'xxx' asFilename writingFileDo:[:s |
- s eolMode:#crlf.
- s nextPutLine:'hello'
+ s eolMode:#crlf.
+ s nextPutLine:'hello'
].
self assert:('xxx' asFilename fileSize == 7).
self assert:('xxx' asFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0D 16r0A]).
'xxx' asFilename writingFileDo:[:s |
- s eolMode:#nl.
- s nextPutLine:'hello'
+ s eolMode:#nl.
+ s nextPutLine:'hello'
].
self assert:('xxx' asFilename fileSize == 6).
self assert:('xxx' asFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0A]).
'xxx' asFilename writingFileDo:[:s |
- s eolMode:#cr.
- s nextPutLine:'hello'
+ s eolMode:#cr.
+ s nextPutLine:'hello'
].
self assert:('xxx' asFilename fileSize == 6).
self assert:('xxx' asFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0D]).
@@ -429,31 +429,31 @@
"/ ------------------------
'xxx' asFilename writingFileDo:[:s |
- s eolMode:#crlf.
- s nextPutAll:'hello' , Character cr
+ s eolMode:#crlf.
+ s nextPutAll:'hello' , Character cr
].
self assert:('xxx' asFilename fileSize == 7).
self assert:('xxx' asFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0D 16r0A]).
'xxx' asFilename writingFileDo:[:s |
- s eolMode:#nl.
- s nextPutAll:'hello' , Character cr
+ s eolMode:#nl.
+ s nextPutAll:'hello' , Character cr
].
self assert:('xxx' asFilename fileSize == 6).
self assert:('xxx' asFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0A]).
'xxx' asFilename writingFileDo:[:s |
- s eolMode:#cr.
- s nextPutAll:'hello' , Character cr
+ s eolMode:#cr.
+ s nextPutAll:'hello' , Character cr
].
self assert:('xxx' asFilename fileSize == 6).
self assert:('xxx' asFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0D]).
"/ in binary mode, this should be ignored
'xxx' asFilename writingFileDo:[:s |
- s binary.
- s eolMode:#crlf.
- s nextPutAll:'hello' , Character cr
+ s binary.
+ s eolMode:#crlf.
+ s nextPutAll:'hello' , Character cr
].
self assert:('xxx' asFilename fileSize == 6).
self assert:('xxx' asFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0A]).