From bf69eb9810b0758a5e1b88e84012450a7da6d218 Mon Sep 17 00:00:00 2001 From: Hengfeng Li Date: Fri, 16 Jul 2021 13:16:25 +1000 Subject: [PATCH 1/2] test(spanner): fix the failed TestColumnTypeErr test --- spanner/row_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spanner/row_test.go b/spanner/row_test.go index a27d758fa6f..530f825a41d 100644 --- a/spanner/row_test.go +++ b/spanner/row_test.go @@ -18,6 +18,7 @@ package spanner import ( "encoding/base64" + "fmt" "reflect" "strconv" "strings" @@ -417,6 +418,9 @@ func TestColumnTypeErr(t *testing.T) { etc = f.Type.ArrayElementType.Code } wantErr := errDecodeColumn(i, errTypeMismatch(tc, etc, badDst)) + if strings.Contains(f.Name, "STRUCT_ARRAY") { + wantErr = errDecodeColumn(i, fmt.Errorf("the container is not a slice of struct pointers: %v", errTypeMismatch(tc, etc, badDst))) + } if gotErr := row.Column(i, badDst); !testEqual(gotErr, wantErr) { t.Errorf("Column(%v): decoding into destination with wrong type %T returns error %v, want %v", i, badDst, gotErr, wantErr) From 0c388134abea95d403d87ded3a5ad112602775e8 Mon Sep 17 00:00:00 2001 From: Hengfeng Li Date: Sat, 17 Jul 2021 23:55:31 +1000 Subject: [PATCH 2/2] Fix the random added two spaces issue. --- spanner/row_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spanner/row_test.go b/spanner/row_test.go index 530f825a41d..0f7ca970c52 100644 --- a/spanner/row_test.go +++ b/spanner/row_test.go @@ -1689,7 +1689,11 @@ func TestRowToString(t *testing.T) { } got := r.String() want := `{fields: [name:"F1" type:{code:STRING} name:"F2" type:{code:STRING}], values: [string_value:"v1" string_value:"v2"]}` - if !testEqual(r.String(), want) { + // In protobuf-go, the encoder will add an additional space based on a + // deterministically random boolean value. + wantWithTwoSpaces := `{fields: [name:"F1" type:{code:STRING} name:"F2" type:{code:STRING}], values: [string_value:"v1" string_value:"v2"]}` + + if !testEqual(r.String(), want) && !testEqual(r.String(), wantWithTwoSpaces) { t.Errorf("got %+v, want %+v", got, want) } }