mirror of
https://github.com/protocolbuffers/protobuf-go.git
synced 2024-12-29 12:17:48 +00:00
19058431cd
Create a single binary for handling generation of protos. This replaces previous logic spread throughout the repo in: * regenerate.bash * cmd/protoc-gen-go/golden_test.go * cmd/protoc-gen-go-grpc/golden_test.go * (indirectly) internal/protogen/goldentest One of the problems with the former approaches is that they relied on a version of protoc that was specific to a developer's workstation. This meant that the result of generation was not hermetic. To address this, we rely on the hard-coded version of protobuf specified in the test.bash script. A summary of changes in this CL are: * The internal_gengo.GenerateFile and internal_gengogrpc.GenerateFile functions are unified to have consistent signatures. It seems that the former accepted a *protogen.GeneratedFile to support v1 where gRPC code was generated into the same file as the base .pb.go file. However, the same functionality can be achieved by having the function return the generated file object. * The test.bash script patches the protobuf toolchain to have properly specified go_package options in each proto source file. * The test.bash script accepts a "-regenerate" argument. * Add generation for the well-known types. Contrary to how these were laid out in the v1 repo, all the well-known types are placed in the same Go package. * Add generation for the conformance proto. * Remove regenerate.bash * Remove internal/protogen * Remove cmd/protoc-gen-go/golden_test.go * Remove cmd/protoc-gen-go-grpc/golden_test.go * Add cmd/protoc-gen-go/annotation_test.go Change-Id: I4a1a97ae6f66e2fabcf4e4d292c95ab2a2db0248 Reviewed-on: https://go-review.googlesource.com/c/164477 Reviewed-by: Damien Neil <dneil@google.com>
751 lines
28 KiB
Go
751 lines
28 KiB
Go
// Copyright 2018 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style.
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package proto_test
|
|
|
|
import (
|
|
"fmt"
|
|
"reflect"
|
|
"testing"
|
|
|
|
protoV1 "github.com/golang/protobuf/proto"
|
|
"github.com/golang/protobuf/v2/internal/encoding/pack"
|
|
"github.com/golang/protobuf/v2/internal/scalar"
|
|
"github.com/golang/protobuf/v2/proto"
|
|
pref "github.com/golang/protobuf/v2/reflect/protoreflect"
|
|
|
|
testpb "github.com/golang/protobuf/v2/internal/testprotos/test"
|
|
)
|
|
|
|
type testProto struct {
|
|
desc string
|
|
decodeTo []proto.Message
|
|
wire []byte
|
|
}
|
|
|
|
func TestDecode(t *testing.T) {
|
|
for _, test := range testProtos {
|
|
for _, want := range test.decodeTo {
|
|
t.Run(fmt.Sprintf("%s (%T)", test.desc, want), func(t *testing.T) {
|
|
wire := append(([]byte)(nil), test.wire...)
|
|
got := reflect.New(reflect.TypeOf(want).Elem()).Interface().(proto.Message)
|
|
if err := proto.Unmarshal(wire, got); err != nil {
|
|
t.Errorf("Unmarshal error: %v\nMessage:\n%v", err, protoV1.MarshalTextString(want.(protoV1.Message)))
|
|
return
|
|
}
|
|
|
|
// Aliasing check: Modifying the original wire bytes shouldn't
|
|
// affect the unmarshaled message.
|
|
for i := range wire {
|
|
wire[i] = 0
|
|
}
|
|
|
|
if !protoV1.Equal(got.(protoV1.Message), want.(protoV1.Message)) {
|
|
t.Errorf("Unmarshal returned unexpected result; got:\n%v\nwant:\n%v", protoV1.MarshalTextString(got.(protoV1.Message)), protoV1.MarshalTextString(want.(protoV1.Message)))
|
|
}
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
var testProtos = []testProto{
|
|
{
|
|
desc: "basic scalar types",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{
|
|
OptionalInt32: scalar.Int32(1001),
|
|
OptionalInt64: scalar.Int64(1002),
|
|
OptionalUint32: scalar.Uint32(1003),
|
|
OptionalUint64: scalar.Uint64(1004),
|
|
OptionalSint32: scalar.Int32(1005),
|
|
OptionalSint64: scalar.Int64(1006),
|
|
OptionalFixed32: scalar.Uint32(1007),
|
|
OptionalFixed64: scalar.Uint64(1008),
|
|
OptionalSfixed32: scalar.Int32(1009),
|
|
OptionalSfixed64: scalar.Int64(1010),
|
|
OptionalFloat: scalar.Float32(1011.5),
|
|
OptionalDouble: scalar.Float64(1012.5),
|
|
OptionalBool: scalar.Bool(true),
|
|
OptionalString: scalar.String("string"),
|
|
OptionalBytes: []byte("bytes"),
|
|
OptionalNestedEnum: testpb.TestAllTypes_BAR.Enum(),
|
|
}, build(
|
|
&testpb.TestAllExtensions{},
|
|
extend(testpb.E_OptionalInt32Extension, scalar.Int32(1001)),
|
|
extend(testpb.E_OptionalInt64Extension, scalar.Int64(1002)),
|
|
extend(testpb.E_OptionalUint32Extension, scalar.Uint32(1003)),
|
|
extend(testpb.E_OptionalUint64Extension, scalar.Uint64(1004)),
|
|
extend(testpb.E_OptionalSint32Extension, scalar.Int32(1005)),
|
|
extend(testpb.E_OptionalSint64Extension, scalar.Int64(1006)),
|
|
extend(testpb.E_OptionalFixed32Extension, scalar.Uint32(1007)),
|
|
extend(testpb.E_OptionalFixed64Extension, scalar.Uint64(1008)),
|
|
extend(testpb.E_OptionalSfixed32Extension, scalar.Int32(1009)),
|
|
extend(testpb.E_OptionalSfixed64Extension, scalar.Int64(1010)),
|
|
extend(testpb.E_OptionalFloatExtension, scalar.Float32(1011.5)),
|
|
extend(testpb.E_OptionalDoubleExtension, scalar.Float64(1012.5)),
|
|
extend(testpb.E_OptionalBoolExtension, scalar.Bool(true)),
|
|
extend(testpb.E_OptionalStringExtension, scalar.String("string")),
|
|
extend(testpb.E_OptionalBytesExtension, []byte("bytes")),
|
|
extend(testpb.E_OptionalNestedEnumExtension, testpb.TestAllTypes_BAR.Enum()),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(1001),
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1002),
|
|
pack.Tag{3, pack.VarintType}, pack.Uvarint(1003),
|
|
pack.Tag{4, pack.VarintType}, pack.Uvarint(1004),
|
|
pack.Tag{5, pack.VarintType}, pack.Svarint(1005),
|
|
pack.Tag{6, pack.VarintType}, pack.Svarint(1006),
|
|
pack.Tag{7, pack.Fixed32Type}, pack.Uint32(1007),
|
|
pack.Tag{8, pack.Fixed64Type}, pack.Uint64(1008),
|
|
pack.Tag{9, pack.Fixed32Type}, pack.Int32(1009),
|
|
pack.Tag{10, pack.Fixed64Type}, pack.Int64(1010),
|
|
pack.Tag{11, pack.Fixed32Type}, pack.Float32(1011.5),
|
|
pack.Tag{12, pack.Fixed64Type}, pack.Float64(1012.5),
|
|
pack.Tag{13, pack.VarintType}, pack.Bool(true),
|
|
pack.Tag{14, pack.BytesType}, pack.String("string"),
|
|
pack.Tag{15, pack.BytesType}, pack.Bytes([]byte("bytes")),
|
|
pack.Tag{21, pack.VarintType}, pack.Varint(int(testpb.TestAllTypes_BAR)),
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "groups",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{
|
|
Optionalgroup: &testpb.TestAllTypes_OptionalGroup{
|
|
A: scalar.Int32(1017),
|
|
},
|
|
}, build(
|
|
&testpb.TestAllExtensions{},
|
|
extend(testpb.E_OptionalgroupExtension, &testpb.OptionalGroupExtension{
|
|
A: scalar.Int32(1017),
|
|
}),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{16, pack.StartGroupType},
|
|
pack.Tag{17, pack.VarintType}, pack.Varint(1017),
|
|
pack.Tag{16, pack.EndGroupType},
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "groups (field overridden)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{
|
|
Optionalgroup: &testpb.TestAllTypes_OptionalGroup{
|
|
A: scalar.Int32(2),
|
|
},
|
|
}, build(
|
|
&testpb.TestAllExtensions{},
|
|
extend(testpb.E_OptionalgroupExtension, &testpb.OptionalGroupExtension{
|
|
A: scalar.Int32(2),
|
|
}),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{16, pack.StartGroupType},
|
|
pack.Tag{17, pack.VarintType}, pack.Varint(1),
|
|
pack.Tag{16, pack.EndGroupType},
|
|
pack.Tag{16, pack.StartGroupType},
|
|
pack.Tag{17, pack.VarintType}, pack.Varint(2),
|
|
pack.Tag{16, pack.EndGroupType},
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "messages",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{
|
|
OptionalNestedMessage: &testpb.TestAllTypes_NestedMessage{
|
|
A: scalar.Int32(42),
|
|
Corecursive: &testpb.TestAllTypes{
|
|
OptionalInt32: scalar.Int32(43),
|
|
},
|
|
},
|
|
}, build(
|
|
&testpb.TestAllExtensions{},
|
|
extend(testpb.E_OptionalNestedMessageExtension, &testpb.TestAllTypes_NestedMessage{
|
|
A: scalar.Int32(42),
|
|
Corecursive: &testpb.TestAllTypes{
|
|
OptionalInt32: scalar.Int32(43),
|
|
},
|
|
}),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{18, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(42),
|
|
pack.Tag{2, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(43),
|
|
}),
|
|
}),
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "messages (split across multiple tags)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{
|
|
OptionalNestedMessage: &testpb.TestAllTypes_NestedMessage{
|
|
A: scalar.Int32(42),
|
|
Corecursive: &testpb.TestAllTypes{
|
|
OptionalInt32: scalar.Int32(43),
|
|
},
|
|
},
|
|
}, build(
|
|
&testpb.TestAllExtensions{},
|
|
extend(testpb.E_OptionalNestedMessageExtension, &testpb.TestAllTypes_NestedMessage{
|
|
A: scalar.Int32(42),
|
|
Corecursive: &testpb.TestAllTypes{
|
|
OptionalInt32: scalar.Int32(43),
|
|
},
|
|
}),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{18, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(42),
|
|
}),
|
|
pack.Tag{18, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{2, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(43),
|
|
}),
|
|
}),
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "messages (field overridden)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{
|
|
OptionalNestedMessage: &testpb.TestAllTypes_NestedMessage{
|
|
A: scalar.Int32(2),
|
|
},
|
|
}, build(
|
|
&testpb.TestAllExtensions{},
|
|
extend(testpb.E_OptionalNestedMessageExtension, &testpb.TestAllTypes_NestedMessage{
|
|
A: scalar.Int32(2),
|
|
}),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{18, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(1),
|
|
}),
|
|
pack.Tag{18, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(2),
|
|
}),
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "basic repeated types",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{
|
|
RepeatedInt32: []int32{1001, 2001},
|
|
RepeatedInt64: []int64{1002, 2002},
|
|
RepeatedUint32: []uint32{1003, 2003},
|
|
RepeatedUint64: []uint64{1004, 2004},
|
|
RepeatedSint32: []int32{1005, 2005},
|
|
RepeatedSint64: []int64{1006, 2006},
|
|
RepeatedFixed32: []uint32{1007, 2007},
|
|
RepeatedFixed64: []uint64{1008, 2008},
|
|
RepeatedSfixed32: []int32{1009, 2009},
|
|
RepeatedSfixed64: []int64{1010, 2010},
|
|
RepeatedFloat: []float32{1011.5, 2011.5},
|
|
RepeatedDouble: []float64{1012.5, 2012.5},
|
|
RepeatedBool: []bool{true, false},
|
|
RepeatedString: []string{"foo", "bar"},
|
|
RepeatedBytes: [][]byte{[]byte("FOO"), []byte("BAR")},
|
|
RepeatedNestedEnum: []testpb.TestAllTypes_NestedEnum{
|
|
testpb.TestAllTypes_FOO,
|
|
testpb.TestAllTypes_BAR,
|
|
},
|
|
}, build(
|
|
&testpb.TestAllExtensions{},
|
|
extend(testpb.E_RepeatedInt32Extension, []int32{1001, 2001}),
|
|
extend(testpb.E_RepeatedInt64Extension, []int64{1002, 2002}),
|
|
extend(testpb.E_RepeatedUint32Extension, []uint32{1003, 2003}),
|
|
extend(testpb.E_RepeatedUint64Extension, []uint64{1004, 2004}),
|
|
extend(testpb.E_RepeatedSint32Extension, []int32{1005, 2005}),
|
|
extend(testpb.E_RepeatedSint64Extension, []int64{1006, 2006}),
|
|
extend(testpb.E_RepeatedFixed32Extension, []uint32{1007, 2007}),
|
|
extend(testpb.E_RepeatedFixed64Extension, []uint64{1008, 2008}),
|
|
extend(testpb.E_RepeatedSfixed32Extension, []int32{1009, 2009}),
|
|
extend(testpb.E_RepeatedSfixed64Extension, []int64{1010, 2010}),
|
|
extend(testpb.E_RepeatedFloatExtension, []float32{1011.5, 2011.5}),
|
|
extend(testpb.E_RepeatedDoubleExtension, []float64{1012.5, 2012.5}),
|
|
extend(testpb.E_RepeatedBoolExtension, []bool{true, false}),
|
|
extend(testpb.E_RepeatedStringExtension, []string{"foo", "bar"}),
|
|
extend(testpb.E_RepeatedBytesExtension, [][]byte{[]byte("FOO"), []byte("BAR")}),
|
|
extend(testpb.E_RepeatedNestedEnumExtension, []testpb.TestAllTypes_NestedEnum{
|
|
testpb.TestAllTypes_FOO,
|
|
testpb.TestAllTypes_BAR,
|
|
}),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{31, pack.VarintType}, pack.Varint(1001),
|
|
pack.Tag{31, pack.VarintType}, pack.Varint(2001),
|
|
pack.Tag{32, pack.VarintType}, pack.Varint(1002),
|
|
pack.Tag{32, pack.VarintType}, pack.Varint(2002),
|
|
pack.Tag{33, pack.VarintType}, pack.Uvarint(1003),
|
|
pack.Tag{33, pack.VarintType}, pack.Uvarint(2003),
|
|
pack.Tag{34, pack.VarintType}, pack.Uvarint(1004),
|
|
pack.Tag{34, pack.VarintType}, pack.Uvarint(2004),
|
|
pack.Tag{35, pack.VarintType}, pack.Svarint(1005),
|
|
pack.Tag{35, pack.VarintType}, pack.Svarint(2005),
|
|
pack.Tag{36, pack.VarintType}, pack.Svarint(1006),
|
|
pack.Tag{36, pack.VarintType}, pack.Svarint(2006),
|
|
pack.Tag{37, pack.Fixed32Type}, pack.Uint32(1007),
|
|
pack.Tag{37, pack.Fixed32Type}, pack.Uint32(2007),
|
|
pack.Tag{38, pack.Fixed64Type}, pack.Uint64(1008),
|
|
pack.Tag{38, pack.Fixed64Type}, pack.Uint64(2008),
|
|
pack.Tag{39, pack.Fixed32Type}, pack.Int32(1009),
|
|
pack.Tag{39, pack.Fixed32Type}, pack.Int32(2009),
|
|
pack.Tag{40, pack.Fixed64Type}, pack.Int64(1010),
|
|
pack.Tag{40, pack.Fixed64Type}, pack.Int64(2010),
|
|
pack.Tag{41, pack.Fixed32Type}, pack.Float32(1011.5),
|
|
pack.Tag{41, pack.Fixed32Type}, pack.Float32(2011.5),
|
|
pack.Tag{42, pack.Fixed64Type}, pack.Float64(1012.5),
|
|
pack.Tag{42, pack.Fixed64Type}, pack.Float64(2012.5),
|
|
pack.Tag{43, pack.VarintType}, pack.Bool(true),
|
|
pack.Tag{43, pack.VarintType}, pack.Bool(false),
|
|
pack.Tag{44, pack.BytesType}, pack.String("foo"),
|
|
pack.Tag{44, pack.BytesType}, pack.String("bar"),
|
|
pack.Tag{45, pack.BytesType}, pack.Bytes([]byte("FOO")),
|
|
pack.Tag{45, pack.BytesType}, pack.Bytes([]byte("BAR")),
|
|
pack.Tag{51, pack.VarintType}, pack.Varint(int(testpb.TestAllTypes_FOO)),
|
|
pack.Tag{51, pack.VarintType}, pack.Varint(int(testpb.TestAllTypes_BAR)),
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "basic repeated types (packed encoding)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{
|
|
RepeatedInt32: []int32{1001, 2001},
|
|
RepeatedInt64: []int64{1002, 2002},
|
|
RepeatedUint32: []uint32{1003, 2003},
|
|
RepeatedUint64: []uint64{1004, 2004},
|
|
RepeatedSint32: []int32{1005, 2005},
|
|
RepeatedSint64: []int64{1006, 2006},
|
|
RepeatedFixed32: []uint32{1007, 2007},
|
|
RepeatedFixed64: []uint64{1008, 2008},
|
|
RepeatedSfixed32: []int32{1009, 2009},
|
|
RepeatedSfixed64: []int64{1010, 2010},
|
|
RepeatedFloat: []float32{1011.5, 2011.5},
|
|
RepeatedDouble: []float64{1012.5, 2012.5},
|
|
RepeatedBool: []bool{true, false},
|
|
RepeatedNestedEnum: []testpb.TestAllTypes_NestedEnum{
|
|
testpb.TestAllTypes_FOO,
|
|
testpb.TestAllTypes_BAR,
|
|
},
|
|
}, build(
|
|
&testpb.TestAllExtensions{},
|
|
extend(testpb.E_RepeatedInt32Extension, []int32{1001, 2001}),
|
|
extend(testpb.E_RepeatedInt64Extension, []int64{1002, 2002}),
|
|
extend(testpb.E_RepeatedUint32Extension, []uint32{1003, 2003}),
|
|
extend(testpb.E_RepeatedUint64Extension, []uint64{1004, 2004}),
|
|
extend(testpb.E_RepeatedSint32Extension, []int32{1005, 2005}),
|
|
extend(testpb.E_RepeatedSint64Extension, []int64{1006, 2006}),
|
|
extend(testpb.E_RepeatedFixed32Extension, []uint32{1007, 2007}),
|
|
extend(testpb.E_RepeatedFixed64Extension, []uint64{1008, 2008}),
|
|
extend(testpb.E_RepeatedSfixed32Extension, []int32{1009, 2009}),
|
|
extend(testpb.E_RepeatedSfixed64Extension, []int64{1010, 2010}),
|
|
extend(testpb.E_RepeatedFloatExtension, []float32{1011.5, 2011.5}),
|
|
extend(testpb.E_RepeatedDoubleExtension, []float64{1012.5, 2012.5}),
|
|
extend(testpb.E_RepeatedBoolExtension, []bool{true, false}),
|
|
extend(testpb.E_RepeatedNestedEnumExtension, []testpb.TestAllTypes_NestedEnum{
|
|
testpb.TestAllTypes_FOO,
|
|
testpb.TestAllTypes_BAR,
|
|
}),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{31, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Varint(1001), pack.Varint(2001),
|
|
},
|
|
pack.Tag{32, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Varint(1002), pack.Varint(2002),
|
|
},
|
|
pack.Tag{33, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Uvarint(1003), pack.Uvarint(2003),
|
|
},
|
|
pack.Tag{34, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Uvarint(1004), pack.Uvarint(2004),
|
|
},
|
|
pack.Tag{35, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Svarint(1005), pack.Svarint(2005),
|
|
},
|
|
pack.Tag{36, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Svarint(1006), pack.Svarint(2006),
|
|
},
|
|
pack.Tag{37, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Uint32(1007), pack.Uint32(2007),
|
|
},
|
|
pack.Tag{38, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Uint64(1008), pack.Uint64(2008),
|
|
},
|
|
pack.Tag{39, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Int32(1009), pack.Int32(2009),
|
|
},
|
|
pack.Tag{40, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Int64(1010), pack.Int64(2010),
|
|
},
|
|
pack.Tag{41, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Float32(1011.5), pack.Float32(2011.5),
|
|
},
|
|
pack.Tag{42, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Float64(1012.5), pack.Float64(2012.5),
|
|
},
|
|
pack.Tag{43, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Bool(true), pack.Bool(false),
|
|
},
|
|
pack.Tag{51, pack.BytesType}, pack.LengthPrefix{
|
|
pack.Varint(int(testpb.TestAllTypes_FOO)),
|
|
pack.Varint(int(testpb.TestAllTypes_BAR)),
|
|
},
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "repeated messages",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{
|
|
RepeatedNestedMessage: []*testpb.TestAllTypes_NestedMessage{
|
|
{A: scalar.Int32(1)},
|
|
{A: scalar.Int32(2)},
|
|
},
|
|
}, build(
|
|
&testpb.TestAllExtensions{},
|
|
extend(testpb.E_RepeatedNestedMessageExtension, []*testpb.TestAllTypes_NestedMessage{
|
|
{A: scalar.Int32(1)},
|
|
{A: scalar.Int32(2)},
|
|
}),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{48, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(1),
|
|
}),
|
|
pack.Tag{48, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(2),
|
|
}),
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "repeated groups",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{
|
|
Repeatedgroup: []*testpb.TestAllTypes_RepeatedGroup{
|
|
{A: scalar.Int32(1017)},
|
|
{A: scalar.Int32(2017)},
|
|
},
|
|
}, build(
|
|
&testpb.TestAllExtensions{},
|
|
extend(testpb.E_RepeatedgroupExtension, []*testpb.RepeatedGroupExtension{
|
|
{A: scalar.Int32(1017)},
|
|
{A: scalar.Int32(2017)},
|
|
}),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{46, pack.StartGroupType},
|
|
pack.Tag{47, pack.VarintType}, pack.Varint(1017),
|
|
pack.Tag{46, pack.EndGroupType},
|
|
pack.Tag{46, pack.StartGroupType},
|
|
pack.Tag{47, pack.VarintType}, pack.Varint(2017),
|
|
pack.Tag{46, pack.EndGroupType},
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "maps",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{
|
|
MapInt32Int32: map[int32]int32{1056: 1156, 2056: 2156},
|
|
MapInt64Int64: map[int64]int64{1057: 1157, 2057: 2157},
|
|
MapUint32Uint32: map[uint32]uint32{1058: 1158, 2058: 2158},
|
|
MapUint64Uint64: map[uint64]uint64{1059: 1159, 2059: 2159},
|
|
MapSint32Sint32: map[int32]int32{1060: 1160, 2060: 2160},
|
|
MapSint64Sint64: map[int64]int64{1061: 1161, 2061: 2161},
|
|
MapFixed32Fixed32: map[uint32]uint32{1062: 1162, 2062: 2162},
|
|
MapFixed64Fixed64: map[uint64]uint64{1063: 1163, 2063: 2163},
|
|
MapSfixed32Sfixed32: map[int32]int32{1064: 1164, 2064: 2164},
|
|
MapSfixed64Sfixed64: map[int64]int64{1065: 1165, 2065: 2165},
|
|
MapInt32Float: map[int32]float32{1066: 1166.5, 2066: 2166.5},
|
|
MapInt32Double: map[int32]float64{1067: 1167.5, 2067: 2167.5},
|
|
MapBoolBool: map[bool]bool{true: false, false: true},
|
|
MapStringString: map[string]string{"69.1.key": "69.1.val", "69.2.key": "69.2.val"},
|
|
MapStringBytes: map[string][]byte{"70.1.key": []byte("70.1.val"), "70.2.key": []byte("70.2.val")},
|
|
MapStringNestedMessage: map[string]*testpb.TestAllTypes_NestedMessage{
|
|
"71.1.key": {A: scalar.Int32(1171)},
|
|
"71.2.key": {A: scalar.Int32(2171)},
|
|
},
|
|
MapStringNestedEnum: map[string]testpb.TestAllTypes_NestedEnum{
|
|
"73.1.key": testpb.TestAllTypes_FOO,
|
|
"73.2.key": testpb.TestAllTypes_BAR,
|
|
},
|
|
}},
|
|
wire: pack.Message{
|
|
pack.Tag{56, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(1056),
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1156),
|
|
}),
|
|
pack.Tag{56, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(2056),
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(2156),
|
|
}),
|
|
pack.Tag{57, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(1057),
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1157),
|
|
}),
|
|
pack.Tag{57, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(2057),
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(2157),
|
|
}),
|
|
pack.Tag{58, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(1058),
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1158),
|
|
}),
|
|
pack.Tag{58, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(2058),
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(2158),
|
|
}),
|
|
pack.Tag{59, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(1059),
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1159),
|
|
}),
|
|
pack.Tag{59, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(2059),
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(2159),
|
|
}),
|
|
pack.Tag{60, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Svarint(1060),
|
|
pack.Tag{2, pack.VarintType}, pack.Svarint(1160),
|
|
}),
|
|
pack.Tag{60, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Svarint(2060),
|
|
pack.Tag{2, pack.VarintType}, pack.Svarint(2160),
|
|
}),
|
|
pack.Tag{61, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Svarint(1061),
|
|
pack.Tag{2, pack.VarintType}, pack.Svarint(1161),
|
|
}),
|
|
pack.Tag{61, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Svarint(2061),
|
|
pack.Tag{2, pack.VarintType}, pack.Svarint(2161),
|
|
}),
|
|
pack.Tag{62, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.Fixed32Type}, pack.Int32(1062),
|
|
pack.Tag{2, pack.Fixed32Type}, pack.Int32(1162),
|
|
}),
|
|
pack.Tag{62, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.Fixed32Type}, pack.Int32(2062),
|
|
pack.Tag{2, pack.Fixed32Type}, pack.Int32(2162),
|
|
}),
|
|
pack.Tag{63, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.Fixed64Type}, pack.Int64(1063),
|
|
pack.Tag{2, pack.Fixed64Type}, pack.Int64(1163),
|
|
}),
|
|
pack.Tag{63, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.Fixed64Type}, pack.Int64(2063),
|
|
pack.Tag{2, pack.Fixed64Type}, pack.Int64(2163),
|
|
}),
|
|
pack.Tag{64, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.Fixed32Type}, pack.Int32(1064),
|
|
pack.Tag{2, pack.Fixed32Type}, pack.Int32(1164),
|
|
}),
|
|
pack.Tag{64, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.Fixed32Type}, pack.Int32(2064),
|
|
pack.Tag{2, pack.Fixed32Type}, pack.Int32(2164),
|
|
}),
|
|
pack.Tag{65, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.Fixed64Type}, pack.Int64(1065),
|
|
pack.Tag{2, pack.Fixed64Type}, pack.Int64(1165),
|
|
}),
|
|
pack.Tag{65, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.Fixed64Type}, pack.Int64(2065),
|
|
pack.Tag{2, pack.Fixed64Type}, pack.Int64(2165),
|
|
}),
|
|
pack.Tag{66, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(1066),
|
|
pack.Tag{2, pack.Fixed32Type}, pack.Float32(1166.5),
|
|
}),
|
|
pack.Tag{66, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(2066),
|
|
pack.Tag{2, pack.Fixed32Type}, pack.Float32(2166.5),
|
|
}),
|
|
pack.Tag{67, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(1067),
|
|
pack.Tag{2, pack.Fixed64Type}, pack.Float64(1167.5),
|
|
}),
|
|
pack.Tag{67, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(2067),
|
|
pack.Tag{2, pack.Fixed64Type}, pack.Float64(2167.5),
|
|
}),
|
|
pack.Tag{68, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Bool(true),
|
|
pack.Tag{2, pack.VarintType}, pack.Bool(false),
|
|
}),
|
|
pack.Tag{68, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Bool(false),
|
|
pack.Tag{2, pack.VarintType}, pack.Bool(true),
|
|
}),
|
|
pack.Tag{69, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.String("69.1.key"),
|
|
pack.Tag{2, pack.BytesType}, pack.String("69.1.val"),
|
|
}),
|
|
pack.Tag{69, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.String("69.2.key"),
|
|
pack.Tag{2, pack.BytesType}, pack.String("69.2.val"),
|
|
}),
|
|
pack.Tag{70, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.String("70.1.key"),
|
|
pack.Tag{2, pack.BytesType}, pack.String("70.1.val"),
|
|
}),
|
|
pack.Tag{70, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.String("70.2.key"),
|
|
pack.Tag{2, pack.BytesType}, pack.String("70.2.val"),
|
|
}),
|
|
pack.Tag{71, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.String("71.1.key"),
|
|
pack.Tag{2, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(1171),
|
|
}),
|
|
}),
|
|
pack.Tag{71, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.String("71.2.key"),
|
|
pack.Tag{2, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(2171),
|
|
}),
|
|
}),
|
|
pack.Tag{73, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.String("73.1.key"),
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(int(testpb.TestAllTypes_FOO)),
|
|
}),
|
|
pack.Tag{73, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.String("73.2.key"),
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(int(testpb.TestAllTypes_BAR)),
|
|
}),
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "oneof (uint32)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{OneofField: &testpb.TestAllTypes_OneofUint32{1111}}},
|
|
wire: pack.Message{pack.Tag{111, pack.VarintType}, pack.Varint(1111)}.Marshal(),
|
|
},
|
|
{
|
|
desc: "oneof (message)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{OneofField: &testpb.TestAllTypes_OneofNestedMessage{
|
|
&testpb.TestAllTypes_NestedMessage{A: scalar.Int32(1112)},
|
|
}}},
|
|
wire: pack.Message{pack.Tag{112, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Message{pack.Tag{1, pack.VarintType}, pack.Varint(1112)},
|
|
})}.Marshal(),
|
|
},
|
|
{
|
|
desc: "oneof (overridden message)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{OneofField: &testpb.TestAllTypes_OneofNestedMessage{
|
|
&testpb.TestAllTypes_NestedMessage{
|
|
Corecursive: &testpb.TestAllTypes{
|
|
OptionalInt32: scalar.Int32(43),
|
|
},
|
|
},
|
|
}}},
|
|
wire: pack.Message{
|
|
pack.Tag{112, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Message{pack.Tag{1, pack.VarintType}, pack.Varint(1)},
|
|
}),
|
|
pack.Tag{112, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{2, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(43),
|
|
}),
|
|
}),
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "oneof (string)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{OneofField: &testpb.TestAllTypes_OneofString{"1113"}}},
|
|
wire: pack.Message{pack.Tag{113, pack.BytesType}, pack.String("1113")}.Marshal(),
|
|
},
|
|
{
|
|
desc: "oneof (bytes)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{OneofField: &testpb.TestAllTypes_OneofBytes{[]byte("1114")}}},
|
|
wire: pack.Message{pack.Tag{114, pack.BytesType}, pack.String("1114")}.Marshal(),
|
|
},
|
|
{
|
|
desc: "oneof (bool)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{OneofField: &testpb.TestAllTypes_OneofBool{true}}},
|
|
wire: pack.Message{pack.Tag{115, pack.VarintType}, pack.Bool(true)}.Marshal(),
|
|
},
|
|
{
|
|
desc: "oneof (uint64)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{OneofField: &testpb.TestAllTypes_OneofUint64{116}}},
|
|
wire: pack.Message{pack.Tag{116, pack.VarintType}, pack.Varint(116)}.Marshal(),
|
|
},
|
|
{
|
|
desc: "oneof (float)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{OneofField: &testpb.TestAllTypes_OneofFloat{117.5}}},
|
|
wire: pack.Message{pack.Tag{117, pack.Fixed32Type}, pack.Float32(117.5)}.Marshal(),
|
|
},
|
|
{
|
|
desc: "oneof (double)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{OneofField: &testpb.TestAllTypes_OneofDouble{118.5}}},
|
|
wire: pack.Message{pack.Tag{118, pack.Fixed64Type}, pack.Float64(118.5)}.Marshal(),
|
|
},
|
|
{
|
|
desc: "oneof (enum)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{OneofField: &testpb.TestAllTypes_OneofEnum{testpb.TestAllTypes_BAR}}},
|
|
wire: pack.Message{pack.Tag{119, pack.VarintType}, pack.Varint(int(testpb.TestAllTypes_BAR))}.Marshal(),
|
|
},
|
|
{
|
|
desc: "oneof (overridden value)",
|
|
decodeTo: []proto.Message{&testpb.TestAllTypes{OneofField: &testpb.TestAllTypes_OneofUint64{2}}},
|
|
wire: pack.Message{
|
|
pack.Tag{111, pack.VarintType}, pack.Varint(1),
|
|
pack.Tag{116, pack.VarintType}, pack.Varint(2),
|
|
}.Marshal(),
|
|
},
|
|
// TODO: More unknown field tests for ordering, repeated fields, etc.
|
|
//
|
|
// It is currently impossible to produce results that the v1 Equal
|
|
// considers equivalent to those of the v1 decoder. Figure out if
|
|
// that's a problem or not.
|
|
{
|
|
desc: "unknown fields",
|
|
decodeTo: []proto.Message{build(
|
|
&testpb.TestAllTypes{},
|
|
unknown(100000, pack.Message{
|
|
pack.Tag{100000, pack.VarintType}, pack.Varint(1),
|
|
}.Marshal()),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{100000, pack.VarintType}, pack.Varint(1),
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "field type mismatch",
|
|
decodeTo: []proto.Message{build(
|
|
&testpb.TestAllTypes{},
|
|
unknown(1, pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.String("string"),
|
|
}.Marshal()),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.String("string"),
|
|
}.Marshal(),
|
|
},
|
|
{
|
|
desc: "map field element mismatch",
|
|
decodeTo: []proto.Message{
|
|
&testpb.TestAllTypes{
|
|
MapInt32Int32: map[int32]int32{1: 0},
|
|
},
|
|
},
|
|
wire: pack.Message{
|
|
pack.Tag{56, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(1),
|
|
pack.Tag{2, pack.BytesType}, pack.String("string"),
|
|
}),
|
|
}.Marshal(),
|
|
},
|
|
}
|
|
|
|
func build(m proto.Message, opts ...buildOpt) proto.Message {
|
|
for _, opt := range opts {
|
|
opt(m)
|
|
}
|
|
return m
|
|
}
|
|
|
|
type buildOpt func(proto.Message)
|
|
|
|
func unknown(num pref.FieldNumber, raw pref.RawFields) buildOpt {
|
|
return func(m proto.Message) {
|
|
m.ProtoReflect().UnknownFields().Set(num, raw)
|
|
}
|
|
}
|
|
|
|
func extend(desc *protoV1.ExtensionDesc, value interface{}) buildOpt {
|
|
return func(m proto.Message) {
|
|
if err := protoV1.SetExtension(m.(protoV1.Message), desc, value); err != nil {
|
|
panic(err)
|
|
}
|
|
}
|
|
}
|