--- a/RegressionTests__StreamTests.st Mon Dec 05 15:39:39 2016 +0100
+++ b/RegressionTests__StreamTests.st Tue Dec 06 14:07:39 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"{ Package: 'stx:goodies/regression' }"
"{ NameSpace: RegressionTests }"
@@ -646,56 +644,60 @@
|fn stream lineEnd contents expected eolModeOfStream check|
eolModeOfStream :=
- [:stream |
- (stream eolMode == #nl) ifTrue:[
- lineEnd := String lf.
- ] ifFalse:[
- (stream eolMode == #crlf) ifTrue:[
- lineEnd := String crlf.
- ] ifFalse:[
- (stream eolMode == #cr) ifTrue:[
- lineEnd := String return.
- ] ifFalse:[
- self error
- ].
- ].
- ].
- ].
+ [:stream |
+ (stream eolMode == #nl) ifTrue:[
+ lineEnd := String lf.
+ ] ifFalse:[
+ (stream eolMode == #crlf) ifTrue:[
+ lineEnd := String crlf.
+ ] ifFalse:[
+ (stream eolMode == #cr) ifTrue:[
+ lineEnd := String return.
+ ] ifFalse:[
+ self error
+ ].
+ ].
+ ].
+ ].
[
- fn := Filename newTemporary.
- stream := fn writeStream.
- "/ all show the same default behavior
- self assert:(stream eolMode == #nl).
+ fn := Filename newTemporary.
+ stream := fn writeStream.
+ "/ all show the same default behavior
+ OperatingSystem isMSDOSlike ifTrue:[
+ self assert:(stream eolMode == #crlf).
+ ] ifFalse:[
+ self assert:(stream eolMode == #nl).
+ ].
] ensure:[
- stream close.
- fn delete.
+ stream close.
+ fn delete.
].
check :=
- [:eolMode |
- fn := Filename newTemporary.
- stream := fn writeStream.
- stream eolMode:eolMode.
+ [:eolMode |
+ fn := Filename newTemporary.
+ stream := fn writeStream.
+ stream eolMode:eolMode.
- [
- lineEnd := eolModeOfStream value:stream.
+ [
+ lineEnd := eolModeOfStream value:stream.
- stream nextPutAll:'line1'; cr.
- stream nextPutLine:'line2'.
- stream nextPutAll:'line3
+ stream nextPutAll:'line1'; cr.
+ stream nextPutLine:'line2'.
+ stream nextPutAll:'line3
line4'; cr.
- stream close.
+ stream close.
- contents := fn binaryContentsOfEntireFile.
- expected := ('line1*line2*line3*line4*' copyReplaceString:'*' withString:lineEnd) asByteArray.
+ contents := fn binaryContentsOfEntireFile.
+ expected := ('line1*line2*line3*line4*' copyReplaceString:'*' withString:lineEnd) asByteArray.
- self assert:(contents = expected ).
- ] ensure:[
- stream close.
- fn delete
- ].
- ].
+ self assert:(contents = expected ).
+ ] ensure:[
+ stream close.
+ fn delete
+ ].
+ ].
check value:#lf.
check value:#nl.