Merge pull request SeasideSt#108 from SeasideSt/107-Pharo7-contents-of-empty-binary-file-are-nil-rather-than-an-empty-instance-of-ByteArray

Johan Brichau · web-flow · commit 0168127b34ce · 2020-07-31T11:58:05.000+02:00
Fix reading contents of empty binary file
diff --git a/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/contentsOfFile.binary..st b/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/contentsOfFile.binary..st
@@ -1,3 +1,5 @@
 file library
 contentsOfFile: aString binary: aBoolean
-	^ self fileStreamOn: aString do: [ :stream | stream contents ] binary: aBoolean
+	^ aBoolean
+		ifTrue:[ self fileStreamOn: aString do: [ :stream | stream contents ifNil:[ ByteArray new ] ] binary: aBoolean ]
+		ifFalse:[ self fileStreamOn: aString do: [ :stream | stream contents ] binary: aBoolean ]
diff --git a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteEmptyFileInFolderBinary.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteEmptyFileInFolderBinary.st
@@ -0,0 +1,8 @@
+tests-filestreams
+testReadWriteEmptyFileInFolderBinary
+	| bytes |
+	bytes := ByteArray new.
+	self 
+		writeToFile: bytes 
+		withFileNameDo:[ :fileName |
+			self assert: (bytes = (GRPlatform current contentsOfFile: fileName binary: true)) ] 
diff --git a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteEmptyFileInFolderText.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/testReadWriteEmptyFileInFolderText.st
@@ -0,0 +1,8 @@
+tests-filestreams
+testReadWriteEmptyFileInFolderText
+	| text |
+	text := String new.
+	self 
+		writeToFile: text 
+		withFileNameDo:[ :fileName |
+			self assert: (text = (GRPlatform current contentsOfFile: fileName binary: false)) ] 
