mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

image: avoid sharing test images between tests and benchmarks 

CL 136796 introduced benchmarks and refactored tests to use a
common list of test images. The tests now fail when run with
count > 2 since they rely on a fresh image each run.

Fix this by changing the list of test images to a list of test
image generator functions.

Change-Id: I5884c6bccba5e29bf84ee546fa501bc258379f42
Reviewed-on: https://go-review.googlesource.com/137295
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Ian Davis 2018-09-25 15:33:49 +01:00 committed by Brad Fitzpatrick
parent b84a58095f
commit 36a3d4f3fe
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/image/image_test.go
View File

@ -24,25 +24,27 @@ func cmp(cm color.Model, c0, c1 color.Color) bool {
var testImages = []struct {
name string
image image
image func() image
}{
{"rgba", NewRGBA(Rect(0, 0, 10, 10))},
{"rgba64", NewRGBA64(Rect(0, 0, 10, 10))},
{"nrgba", NewNRGBA(Rect(0, 0, 10, 10))},
{"nrgba64", NewNRGBA64(Rect(0, 0, 10, 10))},
{"alpha", NewAlpha(Rect(0, 0, 10, 10))},
{"alpha16", NewAlpha16(Rect(0, 0, 10, 10))},
{"gray", NewGray(Rect(0, 0, 10, 10))},
{"gray16", NewGray16(Rect(0, 0, 10, 10))},
{"paletted", NewPaletted(Rect(0, 0, 10, 10), color.Palette{
Transparent,
Opaque,
})},
{"rgba", func() image { return NewRGBA(Rect(0, 0, 10, 10)) }},
{"rgba64", func() image { return NewRGBA64(Rect(0, 0, 10, 10)) }},
{"nrgba", func() image { return NewNRGBA(Rect(0, 0, 10, 10)) }},
{"nrgba64", func() image { return NewNRGBA64(Rect(0, 0, 10, 10)) }},
{"alpha", func() image { return NewAlpha(Rect(0, 0, 10, 10)) }},
{"alpha16", func() image { return NewAlpha16(Rect(0, 0, 10, 10)) }},
{"gray", func() image { return NewGray(Rect(0, 0, 10, 10)) }},
{"gray16", func() image { return NewGray16(Rect(0, 0, 10, 10)) }},
{"paletted", func() image {
return NewPaletted(Rect(0, 0, 10, 10), color.Palette{
Transparent,
Opaque,
})
}},
}
func TestImage(t *testing.T) {
for _, tc := range testImages {
m := tc.image
m := tc.image()
if !Rect(0, 0, 10, 10).Eq(m.Bounds()) {
t.Errorf("%T: want bounds %v, got %v", m, Rect(0, 0, 10, 10), m.Bounds())
continue
@ -120,9 +122,11 @@ func Test16BitsPerColorChannel(t *testing.T) {
func BenchmarkAt(b *testing.B) {
for _, tc := range testImages {
b.Run(tc.name, func(b *testing.B) {
m := tc.image()
b.ReportAllocs()
b.ResetTimer()
for i := 0; i < b.N; i++ {
tc.image.At(4, 5)
m.At(4, 5)
}
})
}
@ -132,9 +136,11 @@ func BenchmarkSet(b *testing.B) {
c := color.Gray{0xff}
for _, tc := range testImages {
b.Run(tc.name, func(b *testing.B) {
m := tc.image()
b.ReportAllocs()
b.ResetTimer()
for i := 0; i < b.N; i++ {
tc.image.Set(4, 5, c)
m.Set(4, 5, c)
}
})
}