all: unify test files

Signed-off-by: Koichi Shiraishi <[email protected]>

Author: zchee

base.go

@@ -3,6 +3,12 @@
 
 package protocol
 
+import (
+	"fmt"
+
+	"github.com/segmentio/encoding/json"
+)
+
 // CancelParams params of cancelRequest.
 type CancelParams struct {
 	// ID is the request id to cancel.
@@ -19,3 +25,72 @@ type ProgressParams struct {
 	// Value is the progress data.
 	Value interface{} `json:"value"`
 }
+
+// ProgressToken is the progress token provided by the client or server.
+//
+// @since 3.15.0.
+type ProgressToken struct {
+	name   string
+	number int32
+}
+
+// compile time check whether the ProgressToken implements a fmt.Formatter, fmt.Stringer, json.Marshaler and json.Unmarshaler interfaces.
+var (
+	_ fmt.Formatter    = (*ProgressToken)(nil)
+	_ fmt.Stringer     = (*ProgressToken)(nil)
+	_ json.Marshaler   = (*ProgressToken)(nil)
+	_ json.Unmarshaler = (*ProgressToken)(nil)
+)
+
+// NewProgressToken returns a new ProgressToken.
+func NewProgressToken(s string) *ProgressToken {
+	return &ProgressToken{name: s}
+}
+
+// NewNumberProgressToken returns a new number ProgressToken.
+func NewNumberProgressToken(n int32) *ProgressToken {
+	return &ProgressToken{number: n}
+}
+
+// Format writes the ProgressToken to the formatter.
+//
+// If the rune is q the representation is non ambiguous,
+// string forms are quoted.
+func (v ProgressToken) Format(f fmt.State, r rune) {
+	const numF = `%d`
+	strF := `%s`
+	if r == 'q' {
+		strF = `%q`
+	}
+
+	switch {
+	case v.name != "":
+		fmt.Fprintf(f, strF, v.name)
+	default:
+		fmt.Fprintf(f, numF, v.number)
+	}
+}
+
+// String returns a string representation of the ProgressToken.
+func (v ProgressToken) String() string {
+	return fmt.Sprint(v)
+}
+
+// MarshalJSON implements json.Marshaler.
+func (v *ProgressToken) MarshalJSON() ([]byte, error) {
+	if v.name != "" {
+		return json.Marshal(v.name)
+	}
+
+	return json.Marshal(v.number)
+}
+
+// UnmarshalJSON implements json.Unmarshaler.
+func (v *ProgressToken) UnmarshalJSON(data []byte) error {
+	*v = ProgressToken{}
+	if err := json.Unmarshal(data, &v.number); err == nil {
+		return nil
+	}
+
+	return json.Unmarshal(data, &v.name)
+}

base_json.go

@@ -10,9 +10,12 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/segmentio/encoding/json"
 )
 
-func testCancelParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFunc) {
+func TestCancelParams(t *testing.T) {
+	t.Parallel()
+
 	const want = `{"id":"testID"}`
 	wantType := CancelParams{
 		ID: "testID",
@@ -42,7 +45,7 @@ func testCancelParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFunc
 			t.Run(tt.name, func(t *testing.T) {
 				t.Parallel()
 
-				got, err := marshal(&tt.field)
+				got, err := json.Marshal(&tt.field)
 				if (err != nil) != tt.wantMarshalErr {
 					t.Fatal(err)
 				}
@@ -79,7 +82,7 @@ func testCancelParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFunc
 				t.Parallel()
 
 				var got CancelParams
-				if err := unmarshal([]byte(tt.field), &got); (err != nil) != tt.wantUnmarshalErr {
+				if err := json.Unmarshal([]byte(tt.field), &got); (err != nil) != tt.wantUnmarshalErr {
 					t.Fatal(err)
 				}
 
@@ -91,7 +94,9 @@ func testCancelParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFunc
 	})
 }
 
-func testProgressParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFunc) {
+func TestProgressParams(t *testing.T) {
+	t.Parallel()
+
 	const wantWorkDoneToken = "156edea9-9d8d-422f-b7ee-81a84594afbb"
 	const want = `{"token":"` + wantWorkDoneToken + `","value":"testValue"}`
 
@@ -125,7 +130,7 @@ func testProgressParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFu
 			t.Run(tt.name, func(t *testing.T) {
 				t.Parallel()
 
-				got, err := marshal(&tt.field)
+				got, err := json.Marshal(&tt.field)
 				if (err != nil) != tt.wantMarshalErr {
 					t.Fatal(err)
 				}
@@ -162,7 +167,7 @@ func testProgressParams(t *testing.T, marshal marshalFunc, unmarshal unmarshalFu
 				t.Parallel()
 
 				var got ProgressParams
-				if err := unmarshal([]byte(tt.field), &got); (err != nil) != tt.wantUnmarshalErr {
+				if err := json.Unmarshal([]byte(tt.field), &got); (err != nil) != tt.wantUnmarshalErr {
 					t.Fatal(err)
 				}