CLeanuo: don't use hardcoded filenames in `FileStreamTest`
Never ever use hardcoded names in tests!
--- a/RegressionTests__FileStreamTest.st Mon May 01 21:45:24 2017 +0200
+++ b/RegressionTests__FileStreamTest.st Wed May 31 07:27:55 2017 +0100
@@ -3,19 +3,13 @@
"{ NameSpace: RegressionTests }"
TestCase subclass:#FileStreamTest
- instanceVariableNames:''
+ instanceVariableNames:'testFilename'
classVariableNames:''
poolDictionaries:''
category:'tests-Regression-Streams'
!
-!FileStreamTest methodsFor:'cleanup'!
-
-tearDown
- self testFilename remove
-! !
-
!FileStreamTest methodsFor:'helpers'!
createBigDirectoryWithManyFiles
@@ -50,14 +44,14 @@
|f bytes|
- f := self testFilename writeStream binary.
+ f := 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.
@@ -66,7 +60,8 @@
self new createTestFile
"
- "Created: / 12.8.1998 / 13:25:25 / cg"
+ "Created: / 12-08-1998 / 13:25:25 / cg"
+ "Modified: / 31-05-2017 / 07:23:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
doTestWrite:size
@@ -113,23 +108,35 @@
|f buffer n nRead|
- f := self testFilename readStream binary.
+ f := testFilename readStream binary.
buffer := ByteArray new:128.
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)
- "Created: / 12.8.1998 / 13:29:41 / cg"
- "Modified: / 12.8.1998 / 13:36:40 / cg"
+ "Created: / 12-08-1998 / 13:29:41 / cg"
+ "Modified: / 31-05-2017 / 07:23:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!FileStreamTest methodsFor:'running'!
+
+setUp
+ testFilename := Filename newTemporary
+
+ "Created: / 31-05-2017 / 07:22:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-testFilename
- ^ 'testFile' asFilename
+tearDown
+ testFilename exists ifTrue:[
+ testFilename remove
+ ]
+
+ "Modified: / 31-05-2017 / 07:23:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!FileStreamTest methodsFor:'tests'!
@@ -174,13 +181,15 @@
self createTestFile.
- sz := self testFilename fileSize.
+ sz := testFilename fileSize.
self readFileExpecting:sz.
"
self new testOpenRead1
"
+
+ "Modified: / 31-05-2017 / 07:23:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
testRead1
@@ -190,7 +199,7 @@
self createTestFile.
- sz := self testFilename fileSize.
+ sz := testFilename fileSize.
self readFileExpecting:sz.
@@ -198,7 +207,8 @@
self new testRead1
"
- "Modified: / 12.8.1998 / 13:29:55 / cg"
+ "Modified: / 12-08-1998 / 13:29:55 / cg"
+ "Modified: / 31-05-2017 / 07:23:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
testRead2
@@ -210,20 +220,20 @@
verbose := false.
self createTestFile.
- self assert:(self testFilename exists).
+ self assert:(testFilename exists).
- sz := self testFilename fileSize.
+ sz := 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.
@@ -233,6 +243,7 @@
"
"Modified: / 10-01-2012 / 19:28:45 / cg"
+ "Modified: / 31-05-2017 / 07:24:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
testRead3
@@ -245,22 +256,22 @@
self createTestFile.
- sz := self testFilename fileSize.
+ sz := 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...
@@ -270,7 +281,8 @@
self new testRead3
"
- "Modified: / 12.8.1998 / 13:42:13 / cg"
+ "Modified: / 12-08-1998 / 13:42:13 / cg"
+ "Modified: / 31-05-2017 / 07:23:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
testRewrite1
@@ -405,63 +417,65 @@
testWriteEOLModes
- 'xxx' asFilename writingFileDo:[:s |
- s eolMode:#crlf.
- s nextPutLine:'hello'
+ testFilename writingFileDo:[:s |
+ s eolMode:#crlf.
+ s nextPutLine:'hello'
].
- self assert:('xxx' asFilename fileSize == 7).
- self assert:('xxx' asFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0D 16r0A]).
+ self assert:(testFilename fileSize == 7).
+ self assert:(testFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0D 16r0A]).
- 'xxx' asFilename writingFileDo:[:s |
- s eolMode:#nl.
- s nextPutLine:'hello'
+ testFilename writingFileDo:[:s |
+ s eolMode:#nl.
+ s nextPutLine:'hello'
].
- self assert:('xxx' asFilename fileSize == 6).
- self assert:('xxx' asFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0A]).
+ self assert:(testFilename fileSize == 6).
+ self assert:(testFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0A]).
- 'xxx' asFilename writingFileDo:[:s |
- s eolMode:#cr.
- s nextPutLine:'hello'
+ testFilename writingFileDo:[:s |
+ s eolMode:#cr.
+ s nextPutLine:'hello'
].
- self assert:('xxx' asFilename fileSize == 6).
- self assert:('xxx' asFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0D]).
+ self assert:(testFilename fileSize == 6).
+ self assert:(testFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0D]).
"/ ------------------------
- 'xxx' asFilename writingFileDo:[:s |
- s eolMode:#crlf.
- s nextPutAll:'hello' , Character cr
+ testFilename writingFileDo:[:s |
+ 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]).
+ self assert:(testFilename fileSize == 7).
+ self assert:(testFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0D 16r0A]).
- 'xxx' asFilename writingFileDo:[:s |
- s eolMode:#nl.
- s nextPutAll:'hello' , Character cr
+ testFilename writingFileDo:[:s |
+ 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]).
+ self assert:(testFilename fileSize == 6).
+ self assert:(testFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0A]).
- 'xxx' asFilename writingFileDo:[:s |
- s eolMode:#cr.
- s nextPutAll:'hello' , Character cr
+ testFilename writingFileDo:[:s |
+ 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]).
+ self assert:(testFilename fileSize == 6).
+ self assert:(testFilename 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
+ testFilename writingFileDo:[:s |
+ 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]).
+ self assert:(testFilename fileSize == 6).
+ self assert:(testFilename binaryContentsOfEntireFile = #[16r68 16r65 16r6C 16r6C 16r6F 16r0A]).
"
self new testWriteEOLModes
"
+
+ "Modified: / 31-05-2017 / 07:26:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!FileStreamTest class methodsFor:'documentation'!
@@ -472,5 +486,10 @@
version_CVS
^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
! !