From d74be30a9051745d7754c5a78ae9f5135cad7a3c Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 30 Oct 2019 14:45:05 +0100 Subject: [PATCH] cmd/gogio: ignore alpha in end-to-end tests On FreeBSD the X11 test seems to succeed except for the alpha value: --- FAIL: TestX11 (2.04s) js_test.go:138: got 0xffff000000000000 at (5,5), want 0xffff00000000ffff js_test.go:138: got 0xffff000000000000 at (595,595), want 0xffff00000000ffff FAIL Ignore alpha values for now. Signed-off-by: Elias Naur --- cmd/gogio/js_test.go | 14 +++++++------- cmd/gogio/x11_test.go | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/gogio/js_test.go b/cmd/gogio/js_test.go index 88bbdad8..a04f2796 100644 --- a/cmd/gogio/js_test.go +++ b/cmd/gogio/js_test.go @@ -127,15 +127,15 @@ func TestJSOnChrome(t *testing.T) { t.Fatalf("expected dimensions to be %d*%d, got %d*%d", wantSize, wantSize, size.X, size.Y) } - wantColor(t, img, 5, 5, 0xffff, 0x0, 0x0, 0xffff) - wantColor(t, img, 595, 595, 0xffff, 0x0, 0x0, 0xffff) + wantColor(t, img, 5, 5, 0xffff, 0x0, 0x0) + wantColor(t, img, 595, 595, 0xffff, 0x0, 0x0) } -func wantColor(t *testing.T, img image.Image, x, y int, r, g, b, a uint32) { +func wantColor(t *testing.T, img image.Image, x, y int, r, g, b uint32) { color := img.At(x, y) - r_, g_, b_, a_ := color.RGBA() - if r_ != r || g_ != g || b_ != b || a_ != a { - t.Errorf("got 0x%04x%04x%04x%04x at (%d,%d), want 0x%04x%04x%04x%04x", - r_, g_, b_, a_, x, y, r, g, b, a) + r_, g_, b_, _ := color.RGBA() + if r_ != r || g_ != g || b_ != b { + t.Errorf("got 0x%04x%04x%04x at (%d,%d), want 0x%04x%04x%04x", + r_, g_, b_, x, y, r, g, b) } } diff --git a/cmd/gogio/x11_test.go b/cmd/gogio/x11_test.go index dc6fc488..337e2118 100644 --- a/cmd/gogio/x11_test.go +++ b/cmd/gogio/x11_test.go @@ -170,7 +170,7 @@ func TestX11(t *testing.T) { t.Fatalf("expected dimensions to be %d*%d, got %d*%d", wantSize, wantSize, size.X, size.Y) } - wantColor(t, img, 5, 5, 0xffff, 0x0, 0x0, 0xffff) - wantColor(t, img, 595, 595, 0xffff, 0x0, 0x0, 0xffff) + wantColor(t, img, 5, 5, 0xffff, 0x0, 0x0) + wantColor(t, img, 595, 595, 0xffff, 0x0, 0x0) } }