fix:modify encoding test proto path (#1388)

* fix:modify encoding test proto  path

* fix

* fix

* fix

encoding/form/form_test.go

@@ -1,11 +1,11 @@
 package form
 
 import (
-	"github.com/go-kratos/kratos/v2/internal/test/testproto"
 	"testing"
 
 	"github.com/go-kratos/kratos/v2/encoding"
 	"github.com/go-kratos/kratos/v2/internal/testproto/complex"
+	testproto "github.com/go-kratos/kratos/v2/internal/testproto/encoding"
 	"github.com/stretchr/testify/require"
 )
 
@@ -34,8 +34,8 @@ func TestFormCodecMarshal(t *testing.T) {
 	require.Equal(t, []byte("username=kratos"), content)
 
 	m := testproto.TestModel{
-		Id:    1,
+		Id:   1,
-		Name:  "kratos",
+		Name: "kratos",
 	}
 	content, err = encoding.GetCodec(contentType).Marshal(m)
 	require.NoError(t, err)

encoding/json/json_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-kratos/kratos/v2/internal/test/testproto"
+	testproto "github.com/go-kratos/kratos/v2/internal/testproto/encoding"
 )
 
 type testEmbed struct {
@@ -36,7 +36,7 @@ func TestJSON_Marshal(t *testing.T) {
 		},
 		{
 			input:  &testproto.TestModel{Id: 1, Name: "go-kratos", Hobby: []string{"1", "2"}},
-			expect: `{"id":"1", "name":"go-kratos", "hobby":["1", "2"], "attrs":{}}`,
+			expect: `{"id":"1","name":"go-kratos","hobby":["1","2"],"attrs":{}}`,
 		},
 	}
 	for _, v := range tests {
@@ -44,7 +44,7 @@ func TestJSON_Marshal(t *testing.T) {
 		if err != nil {
 			t.Errorf("marshal(%#v): %s", v.input, err)
 		}
-		if got, want := string(data), v.expect; got != want {
+		if got, want := string(data), v.expect; strings.ReplaceAll(got, " ", "") != want {
 			if strings.Contains(want, "\n") {
 				t.Errorf("marshal(%#v):\nHAVE:\n%s\nWANT:\n%s", v.input, got, want)
 			} else {

encoding/proto/proto_test.go

@@ -1,9 +1,10 @@
 package proto
 
 import (
-	"github.com/go-kratos/kratos/v2/internal/test/testproto"
 	"github.com/stretchr/testify/assert"
 	"testing"
+
+	testproto "github.com/go-kratos/kratos/v2/internal/testproto/encoding"
 )
 
 func TestName(t *testing.T) {
@@ -28,7 +29,7 @@ func TestCodec(t *testing.T) {
 	err = c.Unmarshal(m, &res)
 	assert.Nil(t, err)
 
-	assert.Equal(t, res.Id,model.Id)
+	assert.Equal(t, res.Id, model.Id)
-	assert.Equal(t, res.Name,model.Name)
+	assert.Equal(t, res.Name, model.Name)
-	assert.Equal(t, res.Hobby,model.Hobby)
+	assert.Equal(t, res.Hobby, model.Hobby)
 }

internal/testproto/complex/complex.pb.go

@@ -178,11 +178,11 @@ func file_complex_proto_rawDescGZIP() []byte {
 
 var file_complex_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_complex_proto_goTypes = []interface{}{
-	(*Complex)(nil), // 0: testproto.Complex
+	(*Complex)(nil), // 0: encoding.Complex
-	(*Simple)(nil),  // 1: testproto.Simple
+	(*Simple)(nil),  // 1: encoding.Simple
 }
 var file_complex_proto_depIdxs = []int32{
-	1, // 0: testproto.Complex.simple:type_name -> testproto.Simple
+	1, // 0: encoding.Complex.simple:type_name -> encoding.Simple
 	1, // [1:1] is the sub-list for method output_type
 	1, // [1:1] is the sub-list for method input_type
 	1, // [1:1] is the sub-list for extension type_name

internal/testproto/complex/complex.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-option go_package = "github.com/go-kratos/kratos/cmd/protoc-gen-go-http/internal/testproto/complex/;complex";
+option go_package = "github.com/go-kratos/kratos/cmd/protoc-gen-go-http/internal/encoding/complex/;complex";
 
 package testproto;
 

internal/testproto/echo/echo_service.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package echo;
 
-option go_package = "github.com/go-kratos/kratos/cmd/protoc-gen-go-http/internal/testproto/echo;echo";
+option go_package = "github.com/go-kratos/kratos/cmd/protoc-gen-go-http/internal/encoding/echo;echo";
 
 import "google/api/annotations.proto";
 import "google/protobuf/field_mask.proto";

internal/testproto/echo/stream.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package echo;
 
-option go_package = "github.com/go-kratos/kratos/cmd/protoc-gen-go-http/internal/testproto/echo;echo";
+option go_package = "github.com/go-kratos/kratos/cmd/protoc-gen-go-http/internal/encoding/echo;echo";
 
 import "google/api/annotations.proto";
 import "google/api/httpbody.proto";

internal/testproto/encoding/test.pb.go

@@ -2,9 +2,9 @@
 // versions:
 // 	protoc-gen-go v1.27.1
 // 	protoc        v3.17.3
-// source: testproto/test.proto
+// source: encoding/test.proto
 
-package testproto
+package encoding
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -34,7 +34,7 @@ type TestModel struct {
 func (x *TestModel) Reset() {
 	*x = TestModel{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_testproto_test_proto_msgTypes[0]
+		mi := &file_encoding_test_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -47,7 +47,7 @@ func (x *TestModel) String() string {
 func (*TestModel) ProtoMessage() {}
 
 func (x *TestModel) ProtoReflect() protoreflect.Message {
-	mi := &file_testproto_test_proto_msgTypes[0]
+	mi := &file_encoding_test_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -60,7 +60,7 @@ func (x *TestModel) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TestModel.ProtoReflect.Descriptor instead.
 func (*TestModel) Descriptor() ([]byte, []int) {
-	return file_testproto_test_proto_rawDescGZIP(), []int{0}
+	return file_encoding_test_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *TestModel) GetId() int64 {
@@ -91,44 +91,44 @@ func (x *TestModel) GetAttrs() map[string]string {
 	return nil
 }
 
-var File_testproto_test_proto protoreflect.FileDescriptor
+var File_encoding_test_proto protoreflect.FileDescriptor
-
+
-var file_testproto_test_proto_rawDesc = []byte{
+var file_encoding_test_proto_rawDesc = []byte{
-	0x0a, 0x14, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74,
+	0x0a, 0x13, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x74, 0x65, 0x73, 0x74, 0x22, 0xb3, 0x01, 0x0a,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x74, 0x65, 0x73, 0x74, 0x22, 0xb3, 0x01, 0x0a, 0x0a,
-	0x0a, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x74, 0x65, 0x73, 0x74, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14,
-	0x14, 0x0a, 0x05, 0x68, 0x6f, 0x62, 0x62, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05,
+	0x0a, 0x05, 0x68, 0x6f, 0x62, 0x62, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x68,
-	0x68, 0x6f, 0x62, 0x62, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x18, 0x04,
+	0x6f, 0x62, 0x62, 0x79, 0x12, 0x31, 0x0a, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x18, 0x04, 0x20,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x74, 0x65, 0x73, 0x74,
+	0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x5f,
-	0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x41, 0x74, 0x74, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72,
+	0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x41, 0x74, 0x74, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x79, 0x52, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x74, 0x74, 0x72,
+	0x52, 0x05, 0x61, 0x74, 0x74, 0x72, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x74, 0x74, 0x72, 0x73,
-	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+	0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
-	0x38, 0x01, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2e, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f,
+	0x01, 0x42, 0x0d, 0x5a, 0x0b, 0x2e, 0x2e, 0x2f, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67,
-	0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_testproto_test_proto_rawDescOnce sync.Once
+	file_encoding_test_proto_rawDescOnce sync.Once
-	file_testproto_test_proto_rawDescData = file_testproto_test_proto_rawDesc
+	file_encoding_test_proto_rawDescData = file_encoding_test_proto_rawDesc
 )
 
-func file_testproto_test_proto_rawDescGZIP() []byte {
+func file_encoding_test_proto_rawDescGZIP() []byte {
-	file_testproto_test_proto_rawDescOnce.Do(func() {
+	file_encoding_test_proto_rawDescOnce.Do(func() {
-		file_testproto_test_proto_rawDescData = protoimpl.X.CompressGZIP(file_testproto_test_proto_rawDescData)
+		file_encoding_test_proto_rawDescData = protoimpl.X.CompressGZIP(file_encoding_test_proto_rawDescData)
 	})
-	return file_testproto_test_proto_rawDescData
+	return file_encoding_test_proto_rawDescData
 }
 
-var file_testproto_test_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_encoding_test_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_testproto_test_proto_goTypes = []interface{}{
+var file_encoding_test_proto_goTypes = []interface{}{
 	(*TestModel)(nil), // 0: test.test_model
 	nil,               // 1: test.test_model.AttrsEntry
 }
-var file_testproto_test_proto_depIdxs = []int32{
+var file_encoding_test_proto_depIdxs = []int32{
 	1, // 0: test.test_model.attrs:type_name -> test.test_model.AttrsEntry
 	1, // [1:1] is the sub-list for method output_type
 	1, // [1:1] is the sub-list for method input_type
@@ -137,13 +137,13 @@ var file_testproto_test_proto_depIdxs = []int32{
 	0, // [0:1] is the sub-list for field type_name
 }
 
-func init() { file_testproto_test_proto_init() }
+func init() { file_encoding_test_proto_init() }
-func file_testproto_test_proto_init() {
+func file_encoding_test_proto_init() {
-	if File_testproto_test_proto != nil {
+	if File_encoding_test_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_testproto_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_encoding_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TestModel); i {
 			case 0:
 				return &v.state
@@ -160,18 +160,18 @@ func file_testproto_test_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_testproto_test_proto_rawDesc,
+			RawDescriptor: file_encoding_test_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_testproto_test_proto_goTypes,
+		GoTypes:           file_encoding_test_proto_goTypes,
-		DependencyIndexes: file_testproto_test_proto_depIdxs,
+		DependencyIndexes: file_encoding_test_proto_depIdxs,
-		MessageInfos:      file_testproto_test_proto_msgTypes,
+		MessageInfos:      file_encoding_test_proto_msgTypes,
 	}.Build()
-	File_testproto_test_proto = out.File
+	File_encoding_test_proto = out.File
-	file_testproto_test_proto_rawDesc = nil
+	file_encoding_test_proto_rawDesc = nil
-	file_testproto_test_proto_goTypes = nil
+	file_encoding_test_proto_goTypes = nil
-	file_testproto_test_proto_depIdxs = nil
+	file_encoding_test_proto_depIdxs = nil
 }

internal/testproto/encoding/test.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package test;
 
-option go_package = "../testproto";
+option go_package = "../encoding";
 
 message test_model {
   int64 id = 1;