From 1ec00d1f5afe204a5c9d125b417b01af29eeb7bb Mon Sep 17 00:00:00 2001
From: Ink33 <Ink33@smlk.org>
Date: Fri, 6 Oct 2023 17:33:47 +0800
Subject: [PATCH] fix: verify grpc expect body

Signed-off-by: Ink33 <Ink33@smlk.org>
---
 pkg/runner/grpc.go      |  4 +-
 pkg/runner/grpc_test.go | 95 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+), 2 deletions(-)

diff --git a/pkg/runner/grpc.go b/pkg/runner/grpc.go
index 7f60e509..d56f948c 100644
--- a/pkg/runner/grpc.go
+++ b/pkg/runner/grpc.go
@@ -542,7 +542,7 @@ func parseExpect(md protoreflect.MethodDescriptor, expect testing.Response) (exp
 		}
 		msgb = append(msgb, '[')
 		for i := range msgpbs {
-			msg, _ := json.Marshal(msgpbs[i])
+			msg, _ := protojson.Marshal(msgpbs[i])
 			msgb = append(msgb, msg...)
 			msg = append(msg, ',')
 		}
@@ -552,7 +552,7 @@ func parseExpect(md protoreflect.MethodDescriptor, expect testing.Response) (exp
 		if err != nil {
 			return gjson.Result{}, err
 		}
-		msgb, _ = json.Marshal(msgpb)
+		msgb, _ = protojson.Marshal(msgpb)
 	}
 	return gjson.ParseBytes(msgb), nil
 }
diff --git a/pkg/runner/grpc_test.go b/pkg/runner/grpc_test.go
index 56718192..55cb0970 100644
--- a/pkg/runner/grpc_test.go
+++ b/pkg/runner/grpc_test.go
@@ -294,6 +294,23 @@ func doGRPCTest(t *testing.T, l net.Listener, sec *atest.Secure, desc *atest.GRP
 				assert.Nil(t, err)
 			},
 		},
+		{
+			name: "test unary rpc not equal",
+			testCase: &atest.TestCase{
+				Request: atest.Request{
+					API:  unary,
+					Body: "{}",
+				},
+				Expect: atest.Response{
+					Body: getJSONOrCache("unaryneq", &testsrv.HelloReply{
+						Message: "Happy!",
+					}),
+				},
+			},
+			verify: func(t *testing.T, output any, err error) {
+				assert.NotNil(t, err)
+			},
+		},
 		{
 			name: "test client stream rpc",
 			testCase: &atest.TestCase{
@@ -351,6 +368,43 @@ func doGRPCTest(t *testing.T, l net.Listener, sec *atest.Secure, desc *atest.GRP
 				assert.Nil(t, err)
 			},
 		},
+		{
+			name: "test bid stream rpc len not equal",
+			testCase: &atest.TestCase{
+				Request: atest.Request{
+					API:  bidStream,
+					Body: getJSONOrCache("stream", nil),
+				},
+				Expect: atest.Response{
+					Body: getJSONOrCache("streamneq", []*testsrv.StreamMessage{
+						{MsgID: 1, ExpectLen: 2},
+						{MsgID: 2, ExpectLen: 2},
+					}),
+				},
+			},
+			verify: func(t *testing.T, output any, err error) {
+				assert.NotNil(t, err)
+			},
+		},
+		{
+			name: "test bid stream rpc content not equal",
+			testCase: &atest.TestCase{
+				Request: atest.Request{
+					API:  bidStream,
+					Body: getJSONOrCache("stream", nil),
+				},
+				Expect: atest.Response{
+					Body: getJSONOrCache("streamneq", []*testsrv.StreamMessage{
+						{MsgID: 4, ExpectLen: 3},
+						{MsgID: 5, ExpectLen: 3},
+						{MsgID: 6, ExpectLen: 3},
+					}),
+				},
+			},
+			verify: func(t *testing.T, output any, err error) {
+				assert.NotNil(t, err)
+			},
+		},
 		{
 			name: "test basic type",
 			testCase: &atest.TestCase{
@@ -404,6 +458,47 @@ func doGRPCTest(t *testing.T, l net.Listener, sec *atest.Secure, desc *atest.GRP
 				assert.Nil(t, err)
 			},
 		},
+		{
+			name: "test advanced type not equal",
+			testCase: &atest.TestCase{
+				Request: atest.Request{
+					API: advanced,
+					Body: getJSONOrCache("advanced",
+						&testsrv.AdvancedType{
+							Int32Array:   []int32{rand.Int31(), rand.Int31()},
+							Int64Array:   []int64{rand.Int63(), rand.Int63()},
+							Uint32Array:  []uint32{rand.Uint32(), rand.Uint32()},
+							Uint64Array:  []uint64{rand.Uint64(), rand.Uint64()},
+							Float32Array: []float32{rand.Float32(), rand.Float32()},
+							Float64Array: []float64{rand.NormFloat64(), rand.NormFloat64()},
+							StringArray:  []string{time.Now().Format(time.RFC3339), time.Now().Format(time.RFC822)},
+							BoolArray:    []bool{true, false},
+							HelloReplyMap: map[string]*testsrv.HelloReply{"key": {
+								Message: "Hello",
+							}},
+						}),
+				},
+				Expect: atest.Response{
+					Body: getJSONOrCache("advancedneq",
+						&testsrv.AdvancedType{
+							Int32Array:   []int32{rand.Int31(), rand.Int31()},
+							Int64Array:   []int64{rand.Int63(), rand.Int63()},
+							Uint32Array:  []uint32{rand.Uint32(), rand.Uint32()},
+							Uint64Array:  []uint64{rand.Uint64(), rand.Uint64()},
+							Float32Array: []float32{rand.Float32(), rand.Float32()},
+							Float64Array: []float64{rand.NormFloat64(), rand.NormFloat64()},
+							StringArray:  []string{time.Now().Format(time.RFC3339), time.Now().Format(time.RFC822)},
+							BoolArray:    []bool{true, false},
+							HelloReplyMap: map[string]*testsrv.HelloReply{"key": {
+								Message: "Happy",
+							}},
+						}),
+				},
+			},
+			verify: func(t *testing.T, output any, err error) {
+				assert.NotNil(t, err)
+			},
+		},
 		{
 			name: "test unknown rpc",
 			testCase: &atest.TestCase{