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

codes: replace %q to %d in error string when invalid code is an integer (#7188)

This commit is contained in:
Purnesh Dixit 2024-05-09 21:41:37 +05:30 committed by GitHub
parent 5d24ee2bd1
commit 070d9c793a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codes/codes.go
View File

@ -235,7 +235,7 @@ func (c *Code) UnmarshalJSON(b []byte) error {
if ci, err := strconv.ParseUint(string(b), 10, 32); err == nil {
if ci >= _maxCode {
return fmt.Errorf("invalid code: %q", ci)
return fmt.Errorf("invalid code: %d", ci)
}
*c = Code(ci)

14
codes/codes_test.go
View File

@ -20,9 +20,10 @@ package codes
import (
"encoding/json"
"reflect"
"strings"
"testing"
"github.com/google/go-cmp/cmp"
cpb "google.golang.org/genproto/googleapis/rpc/code"
"google.golang.org/grpc/internal/grpctest"
)
@ -50,7 +51,7 @@ func (s) TestJSONUnmarshal(t *testing.T) {
want := []Code{OK, NotFound, Internal, Canceled}
in := `["OK", "NOT_FOUND", "INTERNAL", "CANCELLED"]`
err := json.Unmarshal([]byte(in), &got)
if err != nil || !reflect.DeepEqual(got, want) {
if err != nil || !cmp.Equal(got, want) {
t.Fatalf("json.Unmarshal(%q, &got) = %v; want <nil>. got=%v; want %v", in, err, got, want)
}
}
@ -91,3 +92,12 @@ func (s) TestUnmarshalJSON_MarshalUnmarshal(t *testing.T) {
}
}
}
func (s) TestUnmarshalJSON_InvalidIntegerCode(t *testing.T) {
const wantErr = "invalid code: 200" // for integer invalid code, expect integer value in error message
var got Code
if err := got.UnmarshalJSON([]byte("200")); !strings.Contains(err.Error(), wantErr) {
t.Errorf("got.UnmarshalJSON(200) = %v; wantErr: %v", err, wantErr)
}
}