#FEATURE
class: RegressionTests::ImageReaderTest
comment/format in: #testPNG_003_basi0g01
changed:
#test_bmp_01
#test_bmp_02
#test_png_01
#test_png_02
--- a/RegressionTests__ImageReaderTest.st Mon Mar 07 14:30:02 2016 +0100
+++ b/RegressionTests__ImageReaderTest.st Tue Mar 08 14:23:22 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"{ Package: 'exept:regression' }"
"{ NameSpace: RegressionTests }"
@@ -266,8 +264,8 @@
self assert:(img extent = (32@32)).
self assert:(img colorAt:(0@0)) = Color white.
self assert:(img colorAt:(31@31)) = Color black.
+ "/ img inspect.
- "/ img inspect.
"
self run:#testPNG_003_basi0g01
self new testPNG_003_basi0g01
@@ -277,8 +275,9 @@
!
test_bmp_01
- |img allOK|
+ |img allOK failed|
+ failed := OrderedCollection new.
allOK := true.
(self class packageDirectory construct:'testData/bmpImages') directoryContentsAsFilenamesDo:[:f |
(f isRegularFile and:[f hasSuffix:'bmp']) ifTrue:[
@@ -289,11 +288,12 @@
].
img isNil ifTrue:[
Transcript printf:'failed: %s\n' with:f baseName.
- allOK := false
+ allOK := false.
+ failed add:f baseName.
].
].
].
- self assert:allOK.
+ self assert:allOK description:('failed to read: %s' printfWith:(failed asStringWith:', ')).
"
self run:#test_bmp_01
@@ -302,8 +302,9 @@
!
test_bmp_02
- |img allOK|
+ |img allOK failed|
+ failed := OrderedCollection new.
allOK := true.
(self class packageDirectory construct:'testData/bmpImages/bmpsuite-2.4') directoryContentsAsFilenamesDo:[:f |
(f isRegularFile and:[f hasSuffix:'bmp']) ifTrue:[
@@ -314,11 +315,12 @@
].
img isNil ifTrue:[
Transcript printf:'failed: %s\n' with:f baseName.
- allOK := false
+ allOK := false.
+ failed add:f baseName.
].
].
].
- self assert:allOK.
+ self assert:allOK description:('failed to read: %s' printfWith:(failed asStringWith:', ')).
"
self run:#test_bmp_02
@@ -327,23 +329,32 @@
!
test_png_01
- |img allOK|
+ |img allOK failed|
+ failed := OrderedCollection new.
allOK := true.
(self class packageDirectory construct:'testData/pngImages') directoryContentsAsFilenamesDo:[:f |
(f isRegularFile and:[f hasSuffix:'png']) ifTrue:[
- Error handle:[:ex |
- img := nil.
- ] do:[
- img := Image fromFile:f.
- ].
- img isNil ifTrue:[
- Transcript printf:'failed: %s\n' with:f baseName.
- allOK := false
+ img := nil.
+ (f baseName startsWith:'x') ifTrue:[
+ "/ should fail
+ self should:[ img := Image fromFile:f ] raise:(Image badImageFormatQuerySignal).
+ self assert:img == nil.
+ ] ifFalse:[
+ Error handle:[:ex |
+ img := nil.
+ ] do:[
+ img := Image fromFile:f.
+ ].
+ img isNil ifTrue:[
+ Transcript printf:'failed: %s\n' with:f baseName.
+ allOK := false.
+ failed add:f baseName.
+ ].
].
].
].
- self assert:allOK.
+ self assert:allOK description:('failed to read: %s' printfWith:(failed asStringWith:', ')).
"
self run:#test_png_01
@@ -367,7 +378,14 @@
colorMapFromArray:#[0 0 0 255 255 255];
yourself.
- self assert:(img asImageWithDepth:1) = (referenceImg asImageWithDepth:1).
+ self assert:(img bits = referenceImg bits).
+ self assert:(img width = referenceImg width).
+ self assert:(img height = referenceImg height).
+ self assert:(img depth = referenceImg depth).
+ self assert:(img bitsPerSample asArray = referenceImg bitsPerSample asArray).
+ self assert:(img samplesPerPixel = referenceImg samplesPerPixel).
+ self assert:(img colorFromValue:0) = (referenceImg colorFromValue:0).
+ self assert:(img colorFromValue:1) = (referenceImg colorFromValue:1).
"
self run:#test_png_02