codes: replace %q to %d in error string when invalid code is an integ…

…er (#7188)

codes/codes.go

@@ -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)

codes/codes_test.go

@@ -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)
+	}
+}