mirror/protobuf-go
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf-go.git synced 2025-01-29 18:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
protobuf-go/encoding/prototext/encode_test.go

1719 lines
41 KiB
Go
Raw Normal View History

encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
// 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.
protogen, encoding/jsonpb, encoding/textpb: rename packages Rename encoding/*pb to follow the convention of prefixing package names with 'proto': google.golang.org/protobuf/encoding/protojson google.golang.org/protobuf/encoding/prototext Move protogen under a compiler/ directory, just in case we ever do add more compiler-related packages. google.golang.org/protobuf/compiler/protogen Change-Id: I31010cb5cabcea8274fffcac468477b58b56e8eb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177178 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-14 12:44:37 -07:00
package prototext_test
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
import (
encoding: add MarshalAppend to protojson and prototext Adds MarshalAppend methods to allow for byte slices to be reused. Copies signature from the binary encoding. Small changes to internal json and text libraries to use strconv AppendInt and AppendUint for number encoding. Change-Id: Ife7c8979c1c153a0a0bf9b70b296b8158d38dffc Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/489615 Reviewed-by: Edward McFarlane <emcfarlane000@gmail.com> Reviewed-by: Joseph Tsai <joetsai@digital-static.net> Reviewed-by: Lasse Folger <lassefolger@google.com> Reviewed-by: Damien Neil <dneil@google.com>
2023-04-27 11:07:10 +01:00
"bytes"
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
"math"
"testing"
"github.com/google/go-cmp/cmp"
all: trivial formatting changes Changes: * import grouping for third-party dependencies * import grouping for generated protobufs * blank space removal Change-Id: I2950b0606bb2064046d79a23a78b05c23147cbfe Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/221017 Reviewed-by: Damien Neil <dneil@google.com>
2020-02-25 12:51:10 -08:00
protogen, encoding/jsonpb, encoding/textpb: rename packages Rename encoding/*pb to follow the convention of prefixing package names with 'proto': google.golang.org/protobuf/encoding/protojson google.golang.org/protobuf/encoding/prototext Move protogen under a compiler/ directory, just in case we ever do add more compiler-related packages. google.golang.org/protobuf/compiler/protogen Change-Id: I31010cb5cabcea8274fffcac468477b58b56e8eb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177178 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-14 12:44:37 -07:00
"google.golang.org/protobuf/encoding/prototext"
all: change module to google.golang.org/protobuf Temporarily remove go.mod, since we can't generate an accurate one until the corresponding v1 change is submitted. Change-Id: I1e1ad97f2b455e33f61ffaeb8676289795e47e72 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177000 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-13 23:55:40 -07:00
"google.golang.org/protobuf/internal/detrand"
encoding: unify MessageSet extension handling logic This CL unifies common MessageSet logic in prototext and protojson into the messageset package. While we are at it, also enable MessageSet support only if the proto1_legacy build flag is enabled. Change-Id: I1a7d475e8bb1dad61ecd286df45e4239e5bef072 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185898 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-11 18:23:08 -07:00
"google.golang.org/protobuf/internal/flags"
all: change module to google.golang.org/protobuf Temporarily remove go.mod, since we can't generate an accurate one until the corresponding v1 change is submitted. Change-Id: I1e1ad97f2b455e33f61ffaeb8676289795e47e72 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177000 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-13 23:55:40 -07:00
"google.golang.org/protobuf/proto"
all: remove shorthand import aliases Change-Id: I62ec79419354a2c65ac69e4bcc1cc864a6a40a1a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/407934 Reviewed-by: Lasse Folger <lassefolger@google.com> Reviewed-by: Damien Neil <dneil@google.com>
2022-05-24 05:12:23 +09:00
"google.golang.org/protobuf/reflect/protoregistry"
testing/protopack: make package publicly available Change-Id: I342ed27df17867f18c58e60880bcac5a31a3096b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/219837 Reviewed-by: Damien Neil <dneil@google.com>
2020-02-14 18:13:14 -08:00
"google.golang.org/protobuf/testing/protopack"
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
internal/testprotos: hide all public testprotos The encoding/testprotos and reflect/protoregistry/testprotos are accessible by other modules. Move them under internal/testprotos to dissuade programmers who are too lazy to use their own test protos when they need one. Change-Id: I3dbfbce74e68ef033ec252bed076861cb47dd21e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/214341 Reviewed-by: Damien Neil <dneil@google.com>
2020-01-10 23:31:25 -08:00
pb2 "google.golang.org/protobuf/internal/testprotos/textpb2"
pb3 "google.golang.org/protobuf/internal/testprotos/textpb3"
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
pbeditions "google.golang.org/protobuf/internal/testprotos/textpbeditions"
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
"google.golang.org/protobuf/types/known/anypb"
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
)
func init() {
// Disable detrand to enable direct comparisons on outputs.
detrand.Disable()
}
func TestMarshal(t *testing.T) {
tests := []struct {
desc string
protogen, encoding/jsonpb, encoding/textpb: rename packages Rename encoding/*pb to follow the convention of prefixing package names with 'proto': google.golang.org/protobuf/encoding/protojson google.golang.org/protobuf/encoding/prototext Move protogen under a compiler/ directory, just in case we ever do add more compiler-related packages. google.golang.org/protobuf/compiler/protogen Change-Id: I31010cb5cabcea8274fffcac468477b58b56e8eb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177178 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-14 12:44:37 -07:00
mo prototext.MarshalOptions
encoding/textpb: switch tests to use V2 generated messages Change-Id: I817568aec5fbf053c3566b311e92b79aff1caf7e Reviewed-on: https://go-review.googlesource.com/c/154177 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-13 14:19:50 -08:00
input proto.Message
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want string
encoding/textpb: clean up tests on Any Remove unnecessary v1 wrapping. Change most tests to operate on message Any directly. Change-Id: I19bbca6c1af72894f6a292aab8ebd09e0301a260 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168517 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-20 18:05:16 -07:00
wantErr bool // TODO: Verify error message content.
encoding: unify MessageSet extension handling logic This CL unifies common MessageSet logic in prototext and protojson into the messageset package. While we are at it, also enable MessageSet support only if the proto1_legacy build flag is enabled. Change-Id: I1a7d475e8bb1dad61ecd286df45e4239e5bef072 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185898 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-11 18:23:08 -07:00
skip bool
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}{{
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "proto2 optional scalars not set",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Scalars{},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
}, {
desc: "protoeditions optional scalars not set",
input: &pbeditions.Scalars{},
want: "",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "proto3 scalars not set",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb3.Scalars{},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
all: implement support for proto3 optional semantics In the upcoming 3.12.x release of protoc, the proto3 language will be amended to support true presence for scalars. This CL adds support to both the generator and runtime to support these semantics. Newly added public API: protogen.Plugin.SupportedFeatures protoreflect.FieldDescriptor.HasPresence protoreflect.FieldDescriptor.HasOptionalKeyword protoreflect.OneofDescriptor.IsSynthetic Change-Id: I7c86bf66d0ae56642109beb5f2132184593747ad Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/230698 Reviewed-by: Damien Neil <dneil@google.com>
2020-04-28 14:44:38 -07:00
}, {
desc: "proto3 optional not set",
input: &pb3.Proto3Optional{},
want: "",
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
}, {
desc: "protoeditions implicit not set",
input: &pbeditions.ImplicitScalars{},
want: "",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "proto2 optional scalars set to zero values",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Scalars{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptBool: proto.Bool(false),
OptInt32: proto.Int32(0),
OptInt64: proto.Int64(0),
OptUint32: proto.Uint32(0),
OptUint64: proto.Uint64(0),
OptSint32: proto.Int32(0),
OptSint64: proto.Int64(0),
OptFixed32: proto.Uint32(0),
OptFixed64: proto.Uint64(0),
OptSfixed32: proto.Int32(0),
OptSfixed64: proto.Int64(0),
OptFloat: proto.Float32(0),
OptDouble: proto.Float64(0),
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
OptBytes: []byte{},
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String(""),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: `opt_bool: false
opt_int32: 0
opt_int64: 0
opt_uint32: 0
opt_uint64: 0
opt_sint32: 0
opt_sint64: 0
opt_fixed32: 0
opt_fixed64: 0
opt_sfixed32: 0
opt_sfixed64: 0
opt_float: 0
opt_double: 0
opt_bytes: ""
opt_string: ""
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
`,
}, {
desc: "protoeditions optional scalars set to zero values",
input: &pbeditions.Scalars{
OptBool: proto.Bool(false),
OptInt32: proto.Int32(0),
OptInt64: proto.Int64(0),
OptUint32: proto.Uint32(0),
OptUint64: proto.Uint64(0),
OptSint32: proto.Int32(0),
OptSint64: proto.Int64(0),
OptFixed32: proto.Uint32(0),
OptFixed64: proto.Uint64(0),
OptSfixed32: proto.Int32(0),
OptSfixed64: proto.Int64(0),
OptFloat: proto.Float32(0),
OptDouble: proto.Float64(0),
OptBytes: []byte{},
OptString: proto.String(""),
},
want: `opt_bool: false
opt_int32: 0
opt_int64: 0
opt_uint32: 0
opt_uint64: 0
opt_sint32: 0
opt_sint64: 0
opt_fixed32: 0
opt_fixed64: 0
opt_sfixed32: 0
opt_sfixed64: 0
opt_float: 0
opt_double: 0
opt_bytes: ""
opt_string: ""
all: implement support for proto3 optional semantics In the upcoming 3.12.x release of protoc, the proto3 language will be amended to support true presence for scalars. This CL adds support to both the generator and runtime to support these semantics. Newly added public API: protogen.Plugin.SupportedFeatures protoreflect.FieldDescriptor.HasPresence protoreflect.FieldDescriptor.HasOptionalKeyword protoreflect.OneofDescriptor.IsSynthetic Change-Id: I7c86bf66d0ae56642109beb5f2132184593747ad Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/230698 Reviewed-by: Damien Neil <dneil@google.com>
2020-04-28 14:44:38 -07:00
`,
}, {
desc: "proto3 optional set to zero values",
input: &pb3.Proto3Optional{
OptBool: proto.Bool(false),
OptInt32: proto.Int32(0),
OptInt64: proto.Int64(0),
OptUint32: proto.Uint32(0),
OptUint64: proto.Uint64(0),
OptFloat: proto.Float32(0),
OptDouble: proto.Float64(0),
OptString: proto.String(""),
OptBytes: []byte{},
OptEnum: pb3.Enum_ZERO.Enum(),
OptMessage: &pb3.Nested{},
},
want: `opt_bool: false
opt_int32: 0
opt_int64: 0
opt_uint32: 0
opt_uint64: 0
opt_float: 0
opt_double: 0
opt_string: ""
opt_bytes: ""
opt_enum: ZERO
opt_message: {}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
`,
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "proto3 scalars set to zero values",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb3.Scalars{
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
SBool: false,
SInt32: 0,
SInt64: 0,
SUint32: 0,
SUint64: 0,
SSint32: 0,
SSint64: 0,
SFixed32: 0,
SFixed64: 0,
SSfixed32: 0,
SSfixed64: 0,
SFloat: 0,
SDouble: 0,
SBytes: []byte{},
SString: "",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
}, {
desc: "protoeditions implicit scalars set to zero values",
input: &pbeditions.ImplicitScalars{
SBool: false,
SInt32: 0,
SInt64: 0,
SUint32: 0,
SUint64: 0,
SSint32: 0,
SSint64: 0,
SFixed32: 0,
SFixed64: 0,
SSfixed32: 0,
SSfixed64: 0,
SFloat: 0,
SDouble: 0,
SBytes: []byte{},
SString: "",
},
want: "",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "proto2 optional scalars set to some values",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Scalars{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptBool: proto.Bool(true),
OptInt32: proto.Int32(0xff),
OptInt64: proto.Int64(0xdeadbeef),
OptUint32: proto.Uint32(47),
OptUint64: proto.Uint64(0xdeadbeef),
OptSint32: proto.Int32(-1001),
OptSint64: proto.Int64(-0xffff),
OptFixed64: proto.Uint64(64),
OptSfixed32: proto.Int32(-32),
OptFloat: proto.Float32(1.02),
OptDouble: proto.Float64(1.0199999809265137),
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
OptBytes: []byte("\xe8\xb0\xb7\xe6\xad\x8c"),
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("谷歌"),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: `opt_bool: true
opt_int32: 255
opt_int64: 3735928559
opt_uint32: 47
opt_uint64: 3735928559
opt_sint32: -1001
opt_sint64: -65535
opt_fixed64: 64
opt_sfixed32: -32
internal/encoding/text: format using 32 bitsize when encoding float32 When encoding/textpb marshals out float32 values, it was previously formatting it as float64 bitsize since both float types are stored as float64 and internal/encoding/text only has one Float type. A consequence of this is that the output may display a different value than expected, e.g. 1.02 becomes 1.0199999809265137. This CL splits Float type into Float32 and Float64 to keep track of which bitsize to use when formatting. Values of both types are still stored as float64 to keep the logic simple. Decoding will always use Float64, but users can ask for a float32 value from it. Change-Id: Iea5b14b283fec2236a0c3946fac34d4d79b95274 Reviewed-on: https://go-review.googlesource.com/c/158497 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-17 19:31:47 -08:00
opt_float: 1.02
opt_double: 1.0199999809265137
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
opt_bytes: "谷歌"
opt_string: "谷歌"
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
`,
}, {
desc: "proto editions optional scalars set to some values",
input: &pbeditions.Scalars{
OptBool: proto.Bool(true),
OptInt32: proto.Int32(0xff),
OptInt64: proto.Int64(0xdeadbeef),
OptUint32: proto.Uint32(47),
OptUint64: proto.Uint64(0xdeadbeef),
OptSint32: proto.Int32(-1001),
OptSint64: proto.Int64(-0xffff),
OptFixed64: proto.Uint64(64),
OptSfixed32: proto.Int32(-32),
OptFloat: proto.Float32(1.02),
OptDouble: proto.Float64(1.0199999809265137),
OptBytes: []byte("\xe8\xb0\xb7\xe6\xad\x8c"),
OptString: proto.String("谷歌"),
},
want: `opt_bool: true
opt_int32: 255
opt_int64: 3735928559
opt_uint32: 47
opt_uint64: 3735928559
opt_sint32: -1001
opt_sint64: -65535
opt_fixed64: 64
opt_sfixed32: -32
opt_float: 1.02
opt_double: 1.0199999809265137
opt_bytes: "谷歌"
opt_string: "谷歌"
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
`,
encoding/textpb: add string fields UTF-8 validation Change-Id: I15aec2b90efae9366eb496dc221b9e8cacd9d8e6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171122 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-08 17:32:44 -07:00
}, {
encoding/prototext: adjust handling of invalid UTF-8 The following changes are made: * Permit invalid UTF-8 in proto2. This goes against specified behavior, but matches functional behavior in wire marshaling (not just for Go, but also in the other major language implementations as well). * The Format function is specified as ignoring errors since its intended purpose is to surface information to the human user even if it's not exactly parsible back into a message. As such, add an unexported allowInvalidUTF8 option that is specially used by Format. * Add an EmitASCII option that forces the formatting of strings and bytes to always be encoded as ASCII. This ensures that the entire output is always ASCII as well. Note that we do not replicate this behavior for protojson since: * The JSON format fundamentally has a stricter and well-specified grammar for exactly what is valid/invalid, while the text format has not had a well-specified grammar for the longest time, leading to all sorts of weird usages due to Hyrum's law. * This is to ease migration from the legacy implementation, which did permit invalid UTF-8 in proto2. * The EmitASCII option relies on the ability to always escape Unicode characters using ASCII escape sequences, but this is not possible in JSON since the grammar only has an escape sequence defined for Unicode characters \u0000 to \uffff, inclusive. However, Unicode v12.0.0 defines characters up to \U0010FFFF, which is beyond what the JSON grammar provides escape sequences for. Change-Id: I2b524a904e9ec59f9ed5500e299613bc27c31a14 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/233077 Reviewed-by: Herbie Ong <herbie@google.com>
2020-05-07 15:10:54 -07:00
desc: "proto2 string with invalid UTF-8",
input: &pb2.Scalars{
OptString: proto.String("abc\xff"),
},
want: `opt_string: "abc\xff"
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
`,
}, {
desc: "protoeditions string with invalid UTF-8",
input: &pbeditions.Scalars{
OptString: proto.String("abc\xff"),
},
want: `opt_string: "abc\xff"
encoding/prototext: adjust handling of invalid UTF-8 The following changes are made: * Permit invalid UTF-8 in proto2. This goes against specified behavior, but matches functional behavior in wire marshaling (not just for Go, but also in the other major language implementations as well). * The Format function is specified as ignoring errors since its intended purpose is to surface information to the human user even if it's not exactly parsible back into a message. As such, add an unexported allowInvalidUTF8 option that is specially used by Format. * Add an EmitASCII option that forces the formatting of strings and bytes to always be encoded as ASCII. This ensures that the entire output is always ASCII as well. Note that we do not replicate this behavior for protojson since: * The JSON format fundamentally has a stricter and well-specified grammar for exactly what is valid/invalid, while the text format has not had a well-specified grammar for the longest time, leading to all sorts of weird usages due to Hyrum's law. * This is to ease migration from the legacy implementation, which did permit invalid UTF-8 in proto2. * The EmitASCII option relies on the ability to always escape Unicode characters using ASCII escape sequences, but this is not possible in JSON since the grammar only has an escape sequence defined for Unicode characters \u0000 to \uffff, inclusive. However, Unicode v12.0.0 defines characters up to \U0010FFFF, which is beyond what the JSON grammar provides escape sequences for. Change-Id: I2b524a904e9ec59f9ed5500e299613bc27c31a14 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/233077 Reviewed-by: Herbie Ong <herbie@google.com>
2020-05-07 15:10:54 -07:00
`,
}, {
desc: "proto3 string with invalid UTF-8",
encoding/textpb: add string fields UTF-8 validation Change-Id: I15aec2b90efae9366eb496dc221b9e8cacd9d8e6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171122 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-08 17:32:44 -07:00
input: &pb3.Scalars{
SString: "abc\xff",
},
wantErr: true,
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
}, {
desc: "protoeditions utf8 validated string with invalid UTF-8",
input: &pbeditions.UTF8Validated{
ValidatedString: "abc\xff",
},
wantErr: true,
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "float nan",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb3.Scalars{
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
SFloat: float32(math.NaN()),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: "s_float: nan\n",
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "float positive infinity",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb3.Scalars{
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
SFloat: float32(math.Inf(1)),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: "s_float: inf\n",
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "float negative infinity",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb3.Scalars{
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
SFloat: float32(math.Inf(-1)),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: "s_float: -inf\n",
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "double nan",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb3.Scalars{
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
SDouble: math.NaN(),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: "s_double: nan\n",
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "double positive infinity",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb3.Scalars{
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
SDouble: math.Inf(1),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: "s_double: inf\n",
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "double negative infinity",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb3.Scalars{
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
SDouble: math.Inf(-1),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: "s_double: -inf\n",
}, {
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
desc: "proto2 enum not set",
input: &pb2.Enums{},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
desc: "proto2 enum set to zero value",
input: &pb2.Enums{
encoding: cleanup some tests Change-Id: I07b8cd5e9b71fea6a162ca423186b4df7fd49355 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185458 Reviewed-by: Herbie Ong <herbie@google.com>
2019-07-09 23:11:13 -07:00
OptEnum: pb2.Enum(0).Enum(),
OptNestedEnum: pb2.Enums_NestedEnum(0).Enum(),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
want: `opt_enum: 0
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
opt_nested_enum: 0
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
`,
}, {
desc: "protoeditions enum set to zero value",
input: &pbeditions.Enums{
OptEnum: pbeditions.Enum(0).Enum(),
OptNestedEnum: pbeditions.Enums_NestedEnum(0).Enum(),
},
want: `opt_enum: 0
opt_nested_enum: 0
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
`,
}, {
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
desc: "proto2 enum",
input: &pb2.Enums{
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
OptEnum: pb2.Enum_ONE.Enum(),
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
OptNestedEnum: pb2.Enums_UNO.Enum(),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
want: `opt_enum: ONE
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
opt_nested_enum: UNO
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
`,
}, {
desc: "protoeditions enum",
input: &pbeditions.Enums{
OptEnum: pbeditions.Enum_ONE.Enum(),
OptNestedEnum: pbeditions.Enums_UNO.Enum(),
},
want: `opt_enum: ONE
opt_nested_enum: UNO
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
`,
}, {
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
desc: "proto2 enum set to numeric values",
input: &pb2.Enums{
encoding: cleanup some tests Change-Id: I07b8cd5e9b71fea6a162ca423186b4df7fd49355 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185458 Reviewed-by: Herbie Ong <herbie@google.com>
2019-07-09 23:11:13 -07:00
OptEnum: pb2.Enum(2).Enum(),
OptNestedEnum: pb2.Enums_NestedEnum(2).Enum(),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
want: `opt_enum: TWO
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
opt_nested_enum: DOS
`,
}, {
desc: "proto2 enum set to unnamed numeric values",
input: &pb2.Enums{
encoding: cleanup some tests Change-Id: I07b8cd5e9b71fea6a162ca423186b4df7fd49355 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185458 Reviewed-by: Herbie Ong <herbie@google.com>
2019-07-09 23:11:13 -07:00
OptEnum: pb2.Enum(101).Enum(),
OptNestedEnum: pb2.Enums_NestedEnum(-101).Enum(),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
want: `opt_enum: 101
opt_nested_enum: -101
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
`,
}, {
desc: "protoeditions enum set to unnamed numeric values",
input: &pbeditions.Enums{
OptEnum: pbeditions.Enum(101).Enum(),
OptNestedEnum: pbeditions.Enums_NestedEnum(-101).Enum(),
},
want: `opt_enum: 101
opt_nested_enum: -101
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
`,
}, {
desc: "proto3 enum not set",
input: &pb3.Enums{},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}, {
desc: "proto3 enum set to zero value",
input: &pb3.Enums{
SEnum: pb3.Enum_ZERO,
SNestedEnum: pb3.Enums_CERO,
},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
}, {
desc: "protoeditions implicit enum field set to default value",
input: &pbeditions.Enums{
ImplicitEnum: pbeditions.OpenEnum_UNKNOWN,
},
want: "",
}, {
desc: "protoeditions implicit enum field",
input: &pbeditions.Enums{
ImplicitEnum: pbeditions.OpenEnum_EINS,
ImplicitNestedEnum: pbeditions.Enums_ZEHN,
},
want: `implicit_enum: EINS
implicit_nested_enum: ZEHN
`,
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
desc: "proto3 enum",
input: &pb3.Enums{
SEnum: pb3.Enum_ONE,
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
SNestedEnum: pb3.Enums_UNO,
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
want: `s_enum: ONE
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
s_nested_enum: UNO
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
`,
}, {
desc: "proto3 enum set to numeric values",
input: &pb3.Enums{
SEnum: 2,
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
SNestedEnum: 2,
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: `s_enum: TWO
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
s_nested_enum: DOS
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
`,
}, {
desc: "protoeditions implicit enum set to unnamed numeric values",
input: &pbeditions.Enums{
ImplicitEnum: -47,
ImplicitNestedEnum: 47,
},
want: `implicit_enum: -47
implicit_nested_enum: 47
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
`,
}, {
desc: "proto3 enum set to unnamed numeric values",
input: &pb3.Enums{
SEnum: -47,
SNestedEnum: 47,
},
want: `s_enum: -47
s_nested_enum: 47
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
`,
}, {
desc: "proto2 nested message not set",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Nests{},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
desc: "proto2 nested message set to empty",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Nests{
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
OptNested: &pb2.Nested{},
Optgroup: &pb2.Nests_OptGroup{},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: `opt_nested: {}
encoding/textpb: fix handling of group field name Group field name in textproto should be the type name. Its field name is derived from lowercasing its type name. Change-Id: Ia12aafe934d3a59f3e07d09fe7939cfa6595a7b8 Reviewed-on: https://go-review.googlesource.com/c/157821 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-14 15:32:26 -08:00
OptGroup: {}
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
`,
}, {
desc: "protoeditions nested message set to empty",
input: &pbeditions.Nests{
OptNested: &pbeditions.Nested{},
Optgroup: &pbeditions.Nests_OptGroup{},
},
want: `opt_nested: {}
OptGroup: {}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
`,
}, {
desc: "proto2 nested messages",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Nests{
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
OptNested: &pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("nested message"),
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
OptNested: &pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("another nested message"),
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
},
},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: `opt_nested: {
opt_string: "nested message"
opt_nested: {
opt_string: "another nested message"
}
}
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
`,
}, {
desc: "protoeditions nested messages",
input: &pbeditions.Nests{
OptNested: &pbeditions.Nested{
OptString: proto.String("nested message"),
OptNested: &pbeditions.Nested{
OptString: proto.String("another nested message"),
},
},
},
want: `opt_nested: {
opt_string: "nested message"
opt_nested: {
opt_string: "another nested message"
}
}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
`,
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "proto2 groups",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Nests{
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
Optgroup: &pb2.Nests_OptGroup{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("inside a group"),
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
OptNested: &pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("nested message inside a group"),
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
},
Optnestedgroup: &pb2.Nests_OptGroup_OptNestedGroup{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptFixed32: proto.Uint32(47),
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
},
},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: fix handling of group field name Group field name in textproto should be the type name. Its field name is derived from lowercasing its type name. Change-Id: Ia12aafe934d3a59f3e07d09fe7939cfa6595a7b8 Reviewed-on: https://go-review.googlesource.com/c/157821 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-14 15:32:26 -08:00
want: `OptGroup: {
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
opt_string: "inside a group"
opt_nested: {
opt_string: "nested message inside a group"
}
encoding/textpb: fix handling of group field name Group field name in textproto should be the type name. Its field name is derived from lowercasing its type name. Change-Id: Ia12aafe934d3a59f3e07d09fe7939cfa6595a7b8 Reviewed-on: https://go-review.googlesource.com/c/157821 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-14 15:32:26 -08:00
OptNestedGroup: {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
opt_fixed32: 47
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
}
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
`,
}, {
protobuf: fix delimited fields under editions in go This brings go into conformance with other implementations. Group-like message fields with delimited encoding will continue to use the type name for text-format, but everything else will use the field name. Change-Id: Ib6d07f19ccfa853ce0370392c89fd24fb7148793 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/575896 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> Commit-Queue: Michael Stapelberg <stapelberg@google.com>
2024-04-02 12:59:48 -07:00
desc: "protoeditions group-like delimited encoded message field",
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
input: &pbeditions.Nests{
Optgroup: &pbeditions.Nests_OptGroup{
OptString: proto.String("inside a group"),
OptNested: &pbeditions.Nested{
OptString: proto.String("nested message inside a group"),
},
Optnestedgroup: &pbeditions.Nests_OptGroup_OptNestedGroup{
OptFixed32: proto.Uint32(47),
},
},
},
want: `OptGroup: {
opt_string: "inside a group"
opt_nested: {
opt_string: "nested message inside a group"
}
OptNestedGroup: {
opt_fixed32: 47
}
}
protobuf: fix delimited fields under editions in go This brings go into conformance with other implementations. Group-like message fields with delimited encoding will continue to use the type name for text-format, but everything else will use the field name. Change-Id: Ib6d07f19ccfa853ce0370392c89fd24fb7148793 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/575896 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> Commit-Queue: Michael Stapelberg <stapelberg@google.com>
2024-04-02 12:59:48 -07:00
`,
}, {
desc: "protoeditions delimited encoded message field",
input: &pbeditions.Nests{
DelimitedField: &pbeditions.Nests_OptGroup{
OptString: proto.String("second group"),
OptNested: &pbeditions.Nested{
OptString: proto.String("second nested message inside a group"),
},
NestedDelimitedField: &pbeditions.Nests_OptGroup_OptNestedGroup{
OptFixed32: proto.Uint32(47),
},
},
},
want: `delimited_field: {
opt_string: "second group"
opt_nested: {
opt_string: "second nested message inside a group"
}
nested_delimited_field: {
opt_fixed32: 47
}
}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
`,
}, {
desc: "proto3 nested message not set",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb3.Nests{},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
}, {
desc: "proto3 nested message set to empty",
input: &pb3.Nests{
SNested: &pb3.Nested{},
},
want: "s_nested: {}\n",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
desc: "proto3 nested message",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb3.Nests{
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
SNested: &pb3.Nested{
SString: "nested message",
SNested: &pb3.Nested{
SString: "another nested message",
},
},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: `s_nested: {
s_string: "nested message"
s_nested: {
s_string: "another nested message"
}
}
`,
encoding/textpb: add string fields UTF-8 validation Change-Id: I15aec2b90efae9366eb496dc221b9e8cacd9d8e6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171122 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-08 17:32:44 -07:00
}, {
desc: "proto3 nested message contains invalid UTF-8",
input: &pb3.Nests{
SNested: &pb3.Nested{
SString: "abc\xff",
},
},
wantErr: true,
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
}, {
desc: "protoeditions nested message contains invalid UTF-8",
input: &pbeditions.NestsUTF8Validated{
ValidatedMessage: &pbeditions.UTF8Validated{
ValidatedString: "abc\xff",
},
},
wantErr: true,
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "oneof not set",
input: &pb3.Oneofs{},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "oneof set to empty string",
input: &pb3.Oneofs{
Union: &pb3.Oneofs_OneofString{},
},
want: `oneof_string: ""
`,
}, {
desc: "oneof set to string",
input: &pb3.Oneofs{
Union: &pb3.Oneofs_OneofString{
OneofString: "hello",
},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
want: `oneof_string: "hello"
`,
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "oneof set to enum",
input: &pb3.Oneofs{
Union: &pb3.Oneofs_OneofEnum{
OneofEnum: pb3.Enum_ZERO,
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
want: `oneof_enum: ZERO
`,
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "oneof set to empty message",
input: &pb3.Oneofs{
Union: &pb3.Oneofs_OneofNested{
OneofNested: &pb3.Nested{},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
want: "oneof_nested: {}\n",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "oneof set to message",
input: &pb3.Oneofs{
Union: &pb3.Oneofs_OneofNested{
OneofNested: &pb3.Nested{
SString: "nested message",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
},
},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
want: `oneof_nested: {
s_string: "nested message"
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
`,
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "repeated fields not set",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Repeats{},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "repeated fields set to empty slices",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Repeats{
RptBool: []bool{},
RptInt32: []int32{},
RptInt64: []int64{},
RptUint32: []uint32{},
RptUint64: []uint64{},
RptFloat: []float32{},
RptDouble: []float64{},
RptBytes: [][]byte{},
},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "repeated fields set to some values",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Repeats{
RptBool: []bool{true, false, true, true},
RptInt32: []int32{1, 6, 0, 0},
RptInt64: []int64{-64, 47},
RptUint32: []uint32{0xff, 0xffff},
RptUint64: []uint64{0xdeadbeef},
internal/encoding/text: format using 32 bitsize when encoding float32 When encoding/textpb marshals out float32 values, it was previously formatting it as float64 bitsize since both float types are stored as float64 and internal/encoding/text only has one Float type. A consequence of this is that the output may display a different value than expected, e.g. 1.02 becomes 1.0199999809265137. This CL splits Float type into Float32 and Float64 to keep track of which bitsize to use when formatting. Values of both types are still stored as float64 to keep the logic simple. Decoding will always use Float64, but users can ask for a float32 value from it. Change-Id: Iea5b14b283fec2236a0c3946fac34d4d79b95274 Reviewed-on: https://go-review.googlesource.com/c/158497 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-17 19:31:47 -08:00
RptFloat: []float32{float32(math.NaN()), float32(math.Inf(1)), float32(math.Inf(-1)), 1.034},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
RptDouble: []float64{math.NaN(), math.Inf(1), math.Inf(-1), 1.23e-308},
RptString: []string{"hello", "世界"},
RptBytes: [][]byte{
[]byte("hello"),
[]byte("\xe4\xb8\x96\xe7\x95\x8c"),
},
},
want: `rpt_bool: true
rpt_bool: false
rpt_bool: true
rpt_bool: true
rpt_int32: 1
rpt_int32: 6
rpt_int32: 0
rpt_int32: 0
rpt_int64: -64
rpt_int64: 47
rpt_uint32: 255
rpt_uint32: 65535
rpt_uint64: 3735928559
internal/encoding/text: format using 32 bitsize when encoding float32 When encoding/textpb marshals out float32 values, it was previously formatting it as float64 bitsize since both float types are stored as float64 and internal/encoding/text only has one Float type. A consequence of this is that the output may display a different value than expected, e.g. 1.02 becomes 1.0199999809265137. This CL splits Float type into Float32 and Float64 to keep track of which bitsize to use when formatting. Values of both types are still stored as float64 to keep the logic simple. Decoding will always use Float64, but users can ask for a float32 value from it. Change-Id: Iea5b14b283fec2236a0c3946fac34d4d79b95274 Reviewed-on: https://go-review.googlesource.com/c/158497 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-17 19:31:47 -08:00
rpt_float: nan
rpt_float: inf
rpt_float: -inf
rpt_float: 1.034
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
rpt_double: nan
rpt_double: inf
rpt_double: -inf
rpt_double: 1.23e-308
rpt_string: "hello"
rpt_string: "世界"
rpt_bytes: "hello"
rpt_bytes: "世界"
`,
encoding/textpb: add string fields UTF-8 validation Change-Id: I15aec2b90efae9366eb496dc221b9e8cacd9d8e6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171122 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-08 17:32:44 -07:00
}, {
encoding/prototext: adjust handling of invalid UTF-8 The following changes are made: * Permit invalid UTF-8 in proto2. This goes against specified behavior, but matches functional behavior in wire marshaling (not just for Go, but also in the other major language implementations as well). * The Format function is specified as ignoring errors since its intended purpose is to surface information to the human user even if it's not exactly parsible back into a message. As such, add an unexported allowInvalidUTF8 option that is specially used by Format. * Add an EmitASCII option that forces the formatting of strings and bytes to always be encoded as ASCII. This ensures that the entire output is always ASCII as well. Note that we do not replicate this behavior for protojson since: * The JSON format fundamentally has a stricter and well-specified grammar for exactly what is valid/invalid, while the text format has not had a well-specified grammar for the longest time, leading to all sorts of weird usages due to Hyrum's law. * This is to ease migration from the legacy implementation, which did permit invalid UTF-8 in proto2. * The EmitASCII option relies on the ability to always escape Unicode characters using ASCII escape sequences, but this is not possible in JSON since the grammar only has an escape sequence defined for Unicode characters \u0000 to \uffff, inclusive. However, Unicode v12.0.0 defines characters up to \U0010FFFF, which is beyond what the JSON grammar provides escape sequences for. Change-Id: I2b524a904e9ec59f9ed5500e299613bc27c31a14 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/233077 Reviewed-by: Herbie Ong <herbie@google.com>
2020-05-07 15:10:54 -07:00
desc: "repeated proto2 contains invalid UTF-8",
encoding/textpb: add string fields UTF-8 validation Change-Id: I15aec2b90efae9366eb496dc221b9e8cacd9d8e6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171122 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-08 17:32:44 -07:00
input: &pb2.Repeats{
RptString: []string{"abc\xff"},
},
encoding/prototext: adjust handling of invalid UTF-8 The following changes are made: * Permit invalid UTF-8 in proto2. This goes against specified behavior, but matches functional behavior in wire marshaling (not just for Go, but also in the other major language implementations as well). * The Format function is specified as ignoring errors since its intended purpose is to surface information to the human user even if it's not exactly parsible back into a message. As such, add an unexported allowInvalidUTF8 option that is specially used by Format. * Add an EmitASCII option that forces the formatting of strings and bytes to always be encoded as ASCII. This ensures that the entire output is always ASCII as well. Note that we do not replicate this behavior for protojson since: * The JSON format fundamentally has a stricter and well-specified grammar for exactly what is valid/invalid, while the text format has not had a well-specified grammar for the longest time, leading to all sorts of weird usages due to Hyrum's law. * This is to ease migration from the legacy implementation, which did permit invalid UTF-8 in proto2. * The EmitASCII option relies on the ability to always escape Unicode characters using ASCII escape sequences, but this is not possible in JSON since the grammar only has an escape sequence defined for Unicode characters \u0000 to \uffff, inclusive. However, Unicode v12.0.0 defines characters up to \U0010FFFF, which is beyond what the JSON grammar provides escape sequences for. Change-Id: I2b524a904e9ec59f9ed5500e299613bc27c31a14 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/233077 Reviewed-by: Herbie Ong <herbie@google.com>
2020-05-07 15:10:54 -07:00
want: `rpt_string: "abc\xff"
`,
}, {
desc: "repeated proto3 contains invalid UTF-8",
input: &pb3.Repeats{
RptString: []string{"abc\xff"},
},
encoding/textpb: add string fields UTF-8 validation Change-Id: I15aec2b90efae9366eb496dc221b9e8cacd9d8e6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171122 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-08 17:32:44 -07:00
wantErr: true,
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "repeated enums",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Enums{
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
RptEnum: []pb2.Enum{pb2.Enum_ONE, 2, pb2.Enum_TEN, 42},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
RptNestedEnum: []pb2.Enums_NestedEnum{2, 47, 10},
},
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
want: `rpt_enum: ONE
rpt_enum: TWO
rpt_enum: TEN
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
rpt_enum: 42
rpt_nested_enum: DOS
rpt_nested_enum: 47
rpt_nested_enum: DIEZ
`,
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "repeated messages set to empty",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Nests{
RptNested: []*pb2.Nested{},
Rptgroup: []*pb2.Nests_RptGroup{},
},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "repeated messages",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Nests{
RptNested: []*pb2.Nested{
{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("repeat nested one"),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("repeat nested two"),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
OptNested: &pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("inside repeat nested two"),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
},
{},
},
},
want: `rpt_nested: {
opt_string: "repeat nested one"
}
rpt_nested: {
opt_string: "repeat nested two"
opt_nested: {
opt_string: "inside repeat nested two"
}
}
rpt_nested: {}
encoding/textpb: add tests for nil message in repeated and map Updates golang/protobuf#798 by adding testcases to show the intention. Also, slightly move code blocks in encode.go w/o affecting logic to make it cleaner. Change-Id: I14575f6e7139a0908483bd318b599339c2daf8ad Reviewed-on: https://go-review.googlesource.com/c/161717 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-07 20:17:45 -08:00
`,
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "repeated messages contains nil value",
encoding/textpb: add tests for nil message in repeated and map Updates golang/protobuf#798 by adding testcases to show the intention. Also, slightly move code blocks in encode.go w/o affecting logic to make it cleaner. Change-Id: I14575f6e7139a0908483bd318b599339c2daf8ad Reviewed-on: https://go-review.googlesource.com/c/161717 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-07 20:17:45 -08:00
input: &pb2.Nests{
RptNested: []*pb2.Nested{nil, {}},
},
want: `rpt_nested: {}
rpt_nested: {}
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
`,
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "repeated groups",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Nests{
Rptgroup: []*pb2.Nests_RptGroup{
{
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
RptString: []string{"hello", "world"},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
{},
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
nil,
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
},
encoding/textpb: fix marshaling repeated group field name In https://golang.org/cl/157821, I attempted to fix handling of group field names but forgot about repeated group fields as I forgot to properly update the marshaling tests as well for it. Unmarshal logic for both repeated and non-repeated was already fixed in that CL. Change-Id: Icb4a00d8b169709ca12dfee272b2bd73e7585e6e Reviewed-on: https://go-review.googlesource.com/c/157857 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-14 19:26:50 -08:00
want: `RptGroup: {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
rpt_string: "hello"
rpt_string: "world"
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}
encoding/textpb: fix marshaling repeated group field name In https://golang.org/cl/157821, I attempted to fix handling of group field names but forgot about repeated group fields as I forgot to properly update the marshaling tests as well for it. Unmarshal logic for both repeated and non-repeated was already fixed in that CL. Change-Id: Icb4a00d8b169709ca12dfee272b2bd73e7585e6e Reviewed-on: https://go-review.googlesource.com/c/157857 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-14 19:26:50 -08:00
RptGroup: {}
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
RptGroup: {}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
`,
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "map fields not set",
input: &pb3.Maps{},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "map fields set to empty",
input: &pb3.Maps{
Int32ToStr: map[int32]string{},
BoolToUint32: map[bool]uint32{},
Uint64ToEnum: map[uint64]pb3.Enum{},
StrToNested: map[string]*pb3.Nested{},
StrToOneofs: map[string]*pb3.Oneofs{},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
desc: "map fields 1",
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
input: &pb3.Maps{
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
Int32ToStr: map[int32]string{
-101: "-101",
0xff: "0xff",
0: "zero",
},
BoolToUint32: map[bool]uint32{
true: 42,
false: 101,
},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: `int32_to_str: {
key: -101
value: "-101"
}
int32_to_str: {
key: 0
value: "zero"
}
int32_to_str: {
key: 255
value: "0xff"
}
bool_to_uint32: {
key: false
value: 101
}
bool_to_uint32: {
key: true
value: 42
}
`,
}, {
desc: "map fields 2",
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
input: &pb3.Maps{
Uint64ToEnum: map[uint64]pb3.Enum{
1: pb3.Enum_ONE,
2: pb3.Enum_TWO,
10: pb3.Enum_TEN,
47: 47,
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: `uint64_to_enum: {
key: 1
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
value: ONE
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
uint64_to_enum: {
key: 2
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
value: TWO
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
uint64_to_enum: {
key: 10
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
value: TEN
}
uint64_to_enum: {
key: 47
value: 47
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
`,
}, {
desc: "map fields 3",
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
input: &pb3.Maps{
StrToNested: map[string]*pb3.Nested{
"nested": &pb3.Nested{
SString: "nested in a map",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
},
},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: `str_to_nested: {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
key: "nested"
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
value: {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
s_string: "nested in a map"
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
}
`,
}, {
desc: "map fields 4",
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
input: &pb3.Maps{
StrToOneofs: map[string]*pb3.Oneofs{
"string": &pb3.Oneofs{
Union: &pb3.Oneofs_OneofString{
OneofString: "hello",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
},
},
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
"nested": &pb3.Oneofs{
Union: &pb3.Oneofs_OneofNested{
OneofNested: &pb3.Nested{
SString: "nested oneof in map field value",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
},
},
},
},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
want: `str_to_oneofs: {
key: "nested"
value: {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
oneof_nested: {
s_string: "nested oneof in map field value"
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
}
}
str_to_oneofs: {
key: "string"
value: {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
oneof_string: "hello"
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
}
encoding/textpb: add tests for nil message in repeated and map Updates golang/protobuf#798 by adding testcases to show the intention. Also, slightly move code blocks in encode.go w/o affecting logic to make it cleaner. Change-Id: I14575f6e7139a0908483bd318b599339c2daf8ad Reviewed-on: https://go-review.googlesource.com/c/161717 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-07 20:17:45 -08:00
`,
encoding/textpb: add string fields UTF-8 validation Change-Id: I15aec2b90efae9366eb496dc221b9e8cacd9d8e6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171122 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-08 17:32:44 -07:00
}, {
encoding/prototext: adjust handling of invalid UTF-8 The following changes are made: * Permit invalid UTF-8 in proto2. This goes against specified behavior, but matches functional behavior in wire marshaling (not just for Go, but also in the other major language implementations as well). * The Format function is specified as ignoring errors since its intended purpose is to surface information to the human user even if it's not exactly parsible back into a message. As such, add an unexported allowInvalidUTF8 option that is specially used by Format. * Add an EmitASCII option that forces the formatting of strings and bytes to always be encoded as ASCII. This ensures that the entire output is always ASCII as well. Note that we do not replicate this behavior for protojson since: * The JSON format fundamentally has a stricter and well-specified grammar for exactly what is valid/invalid, while the text format has not had a well-specified grammar for the longest time, leading to all sorts of weird usages due to Hyrum's law. * This is to ease migration from the legacy implementation, which did permit invalid UTF-8 in proto2. * The EmitASCII option relies on the ability to always escape Unicode characters using ASCII escape sequences, but this is not possible in JSON since the grammar only has an escape sequence defined for Unicode characters \u0000 to \uffff, inclusive. However, Unicode v12.0.0 defines characters up to \U0010FFFF, which is beyond what the JSON grammar provides escape sequences for. Change-Id: I2b524a904e9ec59f9ed5500e299613bc27c31a14 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/233077 Reviewed-by: Herbie Ong <herbie@google.com>
2020-05-07 15:10:54 -07:00
desc: "proto2 map field value contains invalid UTF-8",
input: &pb2.Maps{
Int32ToStr: map[int32]string{
101: "abc\xff",
},
},
want: `int32_to_str: {
key: 101
value: "abc\xff"
}
`,
}, {
desc: "proto2 map field key contains invalid UTF-8",
input: &pb2.Maps{
StrToNested: map[string]*pb2.Nested{
"abc\xff": {},
},
},
want: `str_to_nested: {
key: "abc\xff"
value: {}
}
`,
}, {
desc: "proto3 map field value contains invalid UTF-8",
encoding/textpb: add string fields UTF-8 validation Change-Id: I15aec2b90efae9366eb496dc221b9e8cacd9d8e6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171122 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-08 17:32:44 -07:00
input: &pb3.Maps{
Int32ToStr: map[int32]string{
101: "abc\xff",
},
},
wantErr: true,
}, {
encoding/prototext: adjust handling of invalid UTF-8 The following changes are made: * Permit invalid UTF-8 in proto2. This goes against specified behavior, but matches functional behavior in wire marshaling (not just for Go, but also in the other major language implementations as well). * The Format function is specified as ignoring errors since its intended purpose is to surface information to the human user even if it's not exactly parsible back into a message. As such, add an unexported allowInvalidUTF8 option that is specially used by Format. * Add an EmitASCII option that forces the formatting of strings and bytes to always be encoded as ASCII. This ensures that the entire output is always ASCII as well. Note that we do not replicate this behavior for protojson since: * The JSON format fundamentally has a stricter and well-specified grammar for exactly what is valid/invalid, while the text format has not had a well-specified grammar for the longest time, leading to all sorts of weird usages due to Hyrum's law. * This is to ease migration from the legacy implementation, which did permit invalid UTF-8 in proto2. * The EmitASCII option relies on the ability to always escape Unicode characters using ASCII escape sequences, but this is not possible in JSON since the grammar only has an escape sequence defined for Unicode characters \u0000 to \uffff, inclusive. However, Unicode v12.0.0 defines characters up to \U0010FFFF, which is beyond what the JSON grammar provides escape sequences for. Change-Id: I2b524a904e9ec59f9ed5500e299613bc27c31a14 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/233077 Reviewed-by: Herbie Ong <herbie@google.com>
2020-05-07 15:10:54 -07:00
desc: "proto3 map field key contains invalid UTF-8",
encoding/textpb: add string fields UTF-8 validation Change-Id: I15aec2b90efae9366eb496dc221b9e8cacd9d8e6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171122 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-08 17:32:44 -07:00
input: &pb3.Maps{
StrToNested: map[string]*pb3.Nested{
"abc\xff": {},
},
},
wantErr: true,
encoding/textpb: add tests for nil message in repeated and map Updates golang/protobuf#798 by adding testcases to show the intention. Also, slightly move code blocks in encode.go w/o affecting logic to make it cleaner. Change-Id: I14575f6e7139a0908483bd318b599339c2daf8ad Reviewed-on: https://go-review.googlesource.com/c/161717 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-07 20:17:45 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "map field contains nil value",
input: &pb3.Maps{
StrToNested: map[string]*pb3.Nested{
encoding/textpb: add tests for nil message in repeated and map Updates golang/protobuf#798 by adding testcases to show the intention. Also, slightly move code blocks in encode.go w/o affecting logic to make it cleaner. Change-Id: I14575f6e7139a0908483bd318b599339c2daf8ad Reviewed-on: https://go-review.googlesource.com/c/161717 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-07 20:17:45 -08:00
"nil": nil,
},
},
want: `str_to_nested: {
key: "nil"
value: {}
}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
`,
}, {
encoding/textpb: add AllowPartial option to MarshalOptions and UnmarshalOptions Provide AllowPartial option to accept messages with missing required field during marshaling and unmarshaling. Change-Id: Ia23783870a8125633f8ddc0b686984b4c5ca15ba Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169500 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Damien Neil <dneil@google.com>
2019-03-26 16:26:22 -07:00
desc: "required fields not set",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Requireds{},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
wantErr: true,
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: add AllowPartial option to MarshalOptions and UnmarshalOptions Provide AllowPartial option to accept messages with missing required field during marshaling and unmarshaling. Change-Id: Ia23783870a8125633f8ddc0b686984b4c5ca15ba Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169500 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Damien Neil <dneil@google.com>
2019-03-26 16:26:22 -07:00
desc: "required fields partially set",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Requireds{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
ReqBool: proto.Bool(false),
ReqSfixed64: proto.Int64(0xbeefcafe),
ReqDouble: proto.Float64(math.NaN()),
ReqString: proto.String("hello"),
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
ReqEnum: pb2.Enum_ONE.Enum(),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
want: `req_bool: false
req_sfixed64: 3203386110
req_double: nan
req_string: "hello"
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
req_enum: ONE
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
`,
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
wantErr: true,
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: add AllowPartial option to MarshalOptions and UnmarshalOptions Provide AllowPartial option to accept messages with missing required field during marshaling and unmarshaling. Change-Id: Ia23783870a8125633f8ddc0b686984b4c5ca15ba Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169500 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Damien Neil <dneil@google.com>
2019-03-26 16:26:22 -07:00
desc: "required fields not set with AllowPartial",
protogen, encoding/jsonpb, encoding/textpb: rename packages Rename encoding/*pb to follow the convention of prefixing package names with 'proto': google.golang.org/protobuf/encoding/protojson google.golang.org/protobuf/encoding/prototext Move protogen under a compiler/ directory, just in case we ever do add more compiler-related packages. google.golang.org/protobuf/compiler/protogen Change-Id: I31010cb5cabcea8274fffcac468477b58b56e8eb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177178 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-14 12:44:37 -07:00
mo: prototext.MarshalOptions{AllowPartial: true},
encoding/textpb: add AllowPartial option to MarshalOptions and UnmarshalOptions Provide AllowPartial option to accept messages with missing required field during marshaling and unmarshaling. Change-Id: Ia23783870a8125633f8ddc0b686984b4c5ca15ba Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169500 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Damien Neil <dneil@google.com>
2019-03-26 16:26:22 -07:00
input: &pb2.Requireds{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
ReqBool: proto.Bool(false),
ReqSfixed64: proto.Int64(0xbeefcafe),
ReqDouble: proto.Float64(math.NaN()),
ReqString: proto.String("hello"),
encoding/textpb: add AllowPartial option to MarshalOptions and UnmarshalOptions Provide AllowPartial option to accept messages with missing required field during marshaling and unmarshaling. Change-Id: Ia23783870a8125633f8ddc0b686984b4c5ca15ba Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169500 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Damien Neil <dneil@google.com>
2019-03-26 16:26:22 -07:00
ReqEnum: pb2.Enum_ONE.Enum(),
},
want: `req_bool: false
req_sfixed64: 3203386110
req_double: nan
req_string: "hello"
req_enum: ONE
`,
}, {
desc: "required fields all set",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
input: &pb2.Requireds{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
ReqBool: proto.Bool(false),
ReqSfixed64: proto.Int64(0),
ReqDouble: proto.Float64(1.23),
ReqString: proto.String(""),
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
ReqEnum: pb2.Enum_ONE.Enum(),
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
ReqNested: &pb2.Nested{},
},
want: `req_bool: false
req_sfixed64: 0
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
req_double: 1.23
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
req_string: ""
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
req_enum: ONE
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
req_nested: {}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
`,
}, {
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
desc: "indirect required field",
input: &pb2.IndirectRequired{
OptNested: &pb2.NestedWithRequired{},
},
want: "opt_nested: {}\n",
wantErr: true,
encoding/textpb: add AllowPartial option to MarshalOptions and UnmarshalOptions Provide AllowPartial option to accept messages with missing required field during marshaling and unmarshaling. Change-Id: Ia23783870a8125633f8ddc0b686984b4c5ca15ba Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169500 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Damien Neil <dneil@google.com>
2019-03-26 16:26:22 -07:00
}, {
desc: "indirect required field with AllowPartial",
protogen, encoding/jsonpb, encoding/textpb: rename packages Rename encoding/*pb to follow the convention of prefixing package names with 'proto': google.golang.org/protobuf/encoding/protojson google.golang.org/protobuf/encoding/prototext Move protogen under a compiler/ directory, just in case we ever do add more compiler-related packages. google.golang.org/protobuf/compiler/protogen Change-Id: I31010cb5cabcea8274fffcac468477b58b56e8eb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177178 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-14 12:44:37 -07:00
mo: prototext.MarshalOptions{AllowPartial: true},
encoding/textpb: add AllowPartial option to MarshalOptions and UnmarshalOptions Provide AllowPartial option to accept messages with missing required field during marshaling and unmarshaling. Change-Id: Ia23783870a8125633f8ddc0b686984b4c5ca15ba Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169500 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Damien Neil <dneil@google.com>
2019-03-26 16:26:22 -07:00
input: &pb2.IndirectRequired{
OptNested: &pb2.NestedWithRequired{},
},
want: "opt_nested: {}\n",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}, {
desc: "indirect required field in empty repeated",
input: &pb2.IndirectRequired{
RptNested: []*pb2.NestedWithRequired{},
},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}, {
desc: "indirect required field in repeated",
input: &pb2.IndirectRequired{
RptNested: []*pb2.NestedWithRequired{
&pb2.NestedWithRequired{},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
want: "rpt_nested: {}\n",
wantErr: true,
encoding/textpb: add AllowPartial option to MarshalOptions and UnmarshalOptions Provide AllowPartial option to accept messages with missing required field during marshaling and unmarshaling. Change-Id: Ia23783870a8125633f8ddc0b686984b4c5ca15ba Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169500 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Damien Neil <dneil@google.com>
2019-03-26 16:26:22 -07:00
}, {
desc: "indirect required field in repeated with AllowPartial",
protogen, encoding/jsonpb, encoding/textpb: rename packages Rename encoding/*pb to follow the convention of prefixing package names with 'proto': google.golang.org/protobuf/encoding/protojson google.golang.org/protobuf/encoding/prototext Move protogen under a compiler/ directory, just in case we ever do add more compiler-related packages. google.golang.org/protobuf/compiler/protogen Change-Id: I31010cb5cabcea8274fffcac468477b58b56e8eb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177178 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-14 12:44:37 -07:00
mo: prototext.MarshalOptions{AllowPartial: true},
encoding/textpb: add AllowPartial option to MarshalOptions and UnmarshalOptions Provide AllowPartial option to accept messages with missing required field during marshaling and unmarshaling. Change-Id: Ia23783870a8125633f8ddc0b686984b4c5ca15ba Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169500 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Damien Neil <dneil@google.com>
2019-03-26 16:26:22 -07:00
input: &pb2.IndirectRequired{
RptNested: []*pb2.NestedWithRequired{
&pb2.NestedWithRequired{},
},
},
want: "rpt_nested: {}\n",
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}, {
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
desc: "indirect required field in empty map",
input: &pb2.IndirectRequired{
StrToNested: map[string]*pb2.NestedWithRequired{},
},
encoding/prototext: drop trailing newline for empty This is more consistent with the indent documentation: If indent is a non-empty string, it causes every entry in a List or Message to be preceded by the indent and trailed by a newline. Since an empty message has no entries, there should be no newlines. Change-Id: I5d57165aaf94ca6b184bb35bf05d5d68f5ee9dd5 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/194877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-11 15:31:45 -07:00
want: "",
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
}, {
desc: "indirect required field in map",
input: &pb2.IndirectRequired{
StrToNested: map[string]*pb2.NestedWithRequired{
"fail": &pb2.NestedWithRequired{},
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
},
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
},
want: `str_to_nested: {
key: "fail"
value: {}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
`,
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
wantErr: true,
encoding/textpb: add AllowPartial option to MarshalOptions and UnmarshalOptions Provide AllowPartial option to accept messages with missing required field during marshaling and unmarshaling. Change-Id: Ia23783870a8125633f8ddc0b686984b4c5ca15ba Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169500 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Damien Neil <dneil@google.com>
2019-03-26 16:26:22 -07:00
}, {
desc: "indirect required field in map with AllowPartial",
protogen, encoding/jsonpb, encoding/textpb: rename packages Rename encoding/*pb to follow the convention of prefixing package names with 'proto': google.golang.org/protobuf/encoding/protojson google.golang.org/protobuf/encoding/prototext Move protogen under a compiler/ directory, just in case we ever do add more compiler-related packages. google.golang.org/protobuf/compiler/protogen Change-Id: I31010cb5cabcea8274fffcac468477b58b56e8eb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177178 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-14 12:44:37 -07:00
mo: prototext.MarshalOptions{AllowPartial: true},
encoding/textpb: add AllowPartial option to MarshalOptions and UnmarshalOptions Provide AllowPartial option to accept messages with missing required field during marshaling and unmarshaling. Change-Id: Ia23783870a8125633f8ddc0b686984b4c5ca15ba Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169500 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Damien Neil <dneil@google.com>
2019-03-26 16:26:22 -07:00
input: &pb2.IndirectRequired{
StrToNested: map[string]*pb2.NestedWithRequired{
"fail": &pb2.NestedWithRequired{},
},
},
want: `str_to_nested: {
key: "fail"
value: {}
}
`,
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
}, {
desc: "indirect required field in oneof",
input: &pb2.IndirectRequired{
Union: &pb2.IndirectRequired_OneofNested{
OneofNested: &pb2.NestedWithRequired{},
},
},
want: "oneof_nested: {}\n",
wantErr: true,
encoding/textpb: add AllowPartial option to MarshalOptions and UnmarshalOptions Provide AllowPartial option to accept messages with missing required field during marshaling and unmarshaling. Change-Id: Ia23783870a8125633f8ddc0b686984b4c5ca15ba Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169500 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Damien Neil <dneil@google.com>
2019-03-26 16:26:22 -07:00
}, {
desc: "indirect required field in oneof with AllowPartial",
protogen, encoding/jsonpb, encoding/textpb: rename packages Rename encoding/*pb to follow the convention of prefixing package names with 'proto': google.golang.org/protobuf/encoding/protojson google.golang.org/protobuf/encoding/prototext Move protogen under a compiler/ directory, just in case we ever do add more compiler-related packages. google.golang.org/protobuf/compiler/protogen Change-Id: I31010cb5cabcea8274fffcac468477b58b56e8eb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177178 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-14 12:44:37 -07:00
mo: prototext.MarshalOptions{AllowPartial: true},
encoding/textpb: add AllowPartial option to MarshalOptions and UnmarshalOptions Provide AllowPartial option to accept messages with missing required field during marshaling and unmarshaling. Change-Id: Ia23783870a8125633f8ddc0b686984b4c5ca15ba Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/169500 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Reviewed-by: Damien Neil <dneil@google.com>
2019-03-26 16:26:22 -07:00
input: &pb2.IndirectRequired{
Union: &pb2.IndirectRequired_OneofNested{
OneofNested: &pb2.NestedWithRequired{},
},
},
want: "oneof_nested: {}\n",
encoding/prototext: add MarshalOptions.EmitUnknown This changes text marshaling to avoid unknown fields by default and instead adds an option so that unknown fields be emitted. This ensures that the default marshal/unknown can round-trip. Change-Id: I85c84ba6ab7916d538ec6bfd4e9d399a8fcba14e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/195778 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-14 19:14:24 -07:00
}, {
desc: "unknown fields not printed",
input: func() proto.Message {
m := &pb2.Scalars{
OptString: proto.String("this message contains unknown fields"),
}
testing/protopack: make package publicly available Change-Id: I342ed27df17867f18c58e60880bcac5a31a3096b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/219837 Reviewed-by: Damien Neil <dneil@google.com>
2020-02-14 18:13:14 -08:00
m.ProtoReflect().SetUnknown(protopack.Message{
protopack.Tag{101, protopack.VarintType}, protopack.Bool(true),
protopack.Tag{102, protopack.VarintType}, protopack.Varint(0xff),
protopack.Tag{103, protopack.Fixed32Type}, protopack.Uint32(47),
protopack.Tag{104, protopack.Fixed64Type}, protopack.Int64(0xdeadbeef),
encoding/prototext: add MarshalOptions.EmitUnknown This changes text marshaling to avoid unknown fields by default and instead adds an option so that unknown fields be emitted. This ensures that the default marshal/unknown can round-trip. Change-Id: I85c84ba6ab7916d538ec6bfd4e9d399a8fcba14e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/195778 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-14 19:14:24 -07:00
}.Marshal())
return m
}(),
want: `opt_string: "this message contains unknown fields"
`,
encoding/textpb: add marshaling of unknown fields Change-Id: Ifa2a86b3edd51d6c53d9cf7226b6f4f8d2f88a44 Reviewed-on: https://go-review.googlesource.com/c/153757 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-11 21:08:58 -08:00
}, {
desc: "unknown varint and fixed types",
encoding/prototext: add MarshalOptions.EmitUnknown This changes text marshaling to avoid unknown fields by default and instead adds an option so that unknown fields be emitted. This ensures that the default marshal/unknown can round-trip. Change-Id: I85c84ba6ab7916d538ec6bfd4e9d399a8fcba14e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/195778 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-14 19:14:24 -07:00
mo: prototext.MarshalOptions{EmitUnknown: true},
encoding: avoid direct access to XXX_unrecognized Use the SetUnknown API instead. Change-Id: Id9dc81581084ccf8ef5453a80c75fcfd63289636 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/184877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-06-22 13:20:09 -07:00
input: func() proto.Message {
m := &pb2.Scalars{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("this message contains unknown fields"),
encoding: avoid direct access to XXX_unrecognized Use the SetUnknown API instead. Change-Id: Id9dc81581084ccf8ef5453a80c75fcfd63289636 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/184877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-06-22 13:20:09 -07:00
}
testing/protopack: make package publicly available Change-Id: I342ed27df17867f18c58e60880bcac5a31a3096b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/219837 Reviewed-by: Damien Neil <dneil@google.com>
2020-02-14 18:13:14 -08:00
m.ProtoReflect().SetUnknown(protopack.Message{
protopack.Tag{101, protopack.VarintType}, protopack.Bool(true),
protopack.Tag{102, protopack.VarintType}, protopack.Varint(0xff),
protopack.Tag{103, protopack.Fixed32Type}, protopack.Uint32(0x47),
protopack.Tag{104, protopack.Fixed64Type}, protopack.Int64(0xdeadbeef),
encoding: avoid direct access to XXX_unrecognized Use the SetUnknown API instead. Change-Id: Id9dc81581084ccf8ef5453a80c75fcfd63289636 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/184877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-06-22 13:20:09 -07:00
}.Marshal())
return m
}(),
encoding/textpb: add marshaling of unknown fields Change-Id: Ifa2a86b3edd51d6c53d9cf7226b6f4f8d2f88a44 Reviewed-on: https://go-review.googlesource.com/c/153757 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-11 21:08:58 -08:00
want: `opt_string: "this message contains unknown fields"
101: 1
102: 255
encoding/prototext: rewrite of internal/encoding/text * Fixes golang/protobuf#842. Unmarshal can now parse singular or repeated message fields without the field separator. * Fixes golang/protobuf#1011. Handles negative 0 properly. * For unknown fields with fixed 32-bit and 64-bit wire types, output is now in hex format with 0x prefix similar to C++ lib output. Previous Go implementation simply outputs these as decimal numbers %d. * All parsing errors, except for unexpected EOF should now contain line and column number info. * Fixed following conformance-related features: * Parse nan,inf,-inf,infinity,-infinity as case-insensitive. * Interpret float32 overflows as inf or -inf. * Parse large int-like number as proto float. * Discard unknown map field if DiscardUnknown=true. * Allow whitespaces/comments in Any type URL and extension field names per spec. * Improves performance and memory usage. It is now as fast and efficient as protojson, if not better on most benchmarks. name old time/op new time/op delta Text/Unmarshal/google_message1_proto2-4 14.1µs ±43% 8.7µs ±12% -38.27% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 11.6µs ±18% 7.7µs ± 9% -33.69% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 6.20ms ±27% 4.10ms ± 5% -33.95% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 12.8µs ± 6% 10.3µs ±23% -19.54% (p=0.000 n=9+10) Text/Marshal/google_message1_proto3-4 11.9µs ±16% 8.6µs ±10% -27.45% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.59ms ± 5% 5.30ms ±22% ~ (p=0.356 n=9+10) JSON/Unmarshal/google_message1_proto2-4 12.3µs ±61% 13.9µs ±26% ~ (p=0.190 n=10+10) JSON/Unmarshal/google_message1_proto3-4 7.51µs ± 6% 7.86µs ± 1% +4.66% (p=0.010 n=10+9) JSON/Unmarshal/google_message2-4 3.74ms ± 2% 3.94ms ± 2% +5.32% (p=0.000 n=10+10) JSON/Marshal/google_message1_proto2-4 9.90µs ±12% 9.95µs ± 4% ~ (p=0.315 n=9+10) JSON/Marshal/google_message1_proto3-4 7.55µs ± 4% 7.93µs ± 3% +4.98% (p=0.000 n=10+10) JSON/Marshal/google_message2-4 4.29ms ± 5% 4.49ms ± 2% +4.53% (p=0.001 n=10+10) name old alloc/op new alloc/op delta Text/Unmarshal/google_message1_proto2-4 12.5kB ± 0% 2.0kB ± 0% -83.87% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 12.2kB ± 0% 1.8kB ± 0% -85.33% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 5.35MB ± 0% 0.89MB ± 0% -83.28% (p=0.000 n=10+9) Text/Marshal/google_message1_proto2-4 12.0kB ± 0% 1.4kB ± 0% -88.15% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 12.4kB ± 0% 1.9kB ± 0% -84.91% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.64MB ± 0% 1.02MB ± 0% -81.85% (p=0.000 n=10+9) JSON/Unmarshal/google_message1_proto2-4 2.29kB ± 0% 2.29kB ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 2.08kB ± 0% 2.08kB ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 899kB ± 0% 899kB ± 0% ~ (p=1.000 n=10+10) JSON/Marshal/google_message1_proto2-4 1.46kB ± 0% 1.46kB ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 1.36kB ± 0% 1.36kB ± 0% ~ (all equal) JSON/Marshal/google_message2-4 1.19MB ± 0% 1.19MB ± 0% ~ (p=0.197 n=10+10) name old allocs/op new allocs/op delta Text/Unmarshal/google_message1_proto2-4 133 ± 0% 89 ± 0% -33.08% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 108 ± 0% 67 ± 0% -37.96% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 60.0k ± 0% 38.7k ± 0% -35.52% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 65.0 ± 0% 25.0 ± 0% -61.54% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 59.0 ± 0% 22.0 ± 0% -62.71% (p=0.000 n=10+10) Text/Marshal/google_message2-4 27.4k ± 0% 7.3k ± 0% -73.39% (p=0.000 n=10+10) JSON/Unmarshal/google_message1_proto2-4 95.0 ± 0% 95.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 74.0 ± 0% 74.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 36.3k ± 0% 36.3k ± 0% ~ (all equal) JSON/Marshal/google_message1_proto2-4 27.0 ± 0% 27.0 ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 30.0 ± 0% 30.0 ± 0% ~ (all equal) JSON/Marshal/google_message2-4 11.3k ± 0% 11.3k ± 0% ~ (p=1.000 n=10+10) Change-Id: I377925facde5535f06333b6f25e9c9b358dc062f Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/204602 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-10-31 17:10:15 -07:00
103: 0x47
104: 0xdeadbeef
encoding/textpb: add marshaling of unknown fields Change-Id: Ifa2a86b3edd51d6c53d9cf7226b6f4f8d2f88a44 Reviewed-on: https://go-review.googlesource.com/c/153757 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-11 21:08:58 -08:00
`,
}, {
desc: "unknown length-delimited",
encoding/prototext: add MarshalOptions.EmitUnknown This changes text marshaling to avoid unknown fields by default and instead adds an option so that unknown fields be emitted. This ensures that the default marshal/unknown can round-trip. Change-Id: I85c84ba6ab7916d538ec6bfd4e9d399a8fcba14e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/195778 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-14 19:14:24 -07:00
mo: prototext.MarshalOptions{EmitUnknown: true},
encoding: avoid direct access to XXX_unrecognized Use the SetUnknown API instead. Change-Id: Id9dc81581084ccf8ef5453a80c75fcfd63289636 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/184877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-06-22 13:20:09 -07:00
input: func() proto.Message {
m := new(pb2.Scalars)
testing/protopack: make package publicly available Change-Id: I342ed27df17867f18c58e60880bcac5a31a3096b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/219837 Reviewed-by: Damien Neil <dneil@google.com>
2020-02-14 18:13:14 -08:00
m.ProtoReflect().SetUnknown(protopack.Message{
protopack.Tag{101, protopack.BytesType}, protopack.LengthPrefix{protopack.Bool(true), protopack.Bool(false)},
protopack.Tag{102, protopack.BytesType}, protopack.String("hello world"),
protopack.Tag{103, protopack.BytesType}, protopack.Bytes("\xe4\xb8\x96\xe7\x95\x8c"),
encoding: avoid direct access to XXX_unrecognized Use the SetUnknown API instead. Change-Id: Id9dc81581084ccf8ef5453a80c75fcfd63289636 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/184877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-06-22 13:20:09 -07:00
}.Marshal())
return m
}(),
encoding/textpb: add marshaling of unknown fields Change-Id: Ifa2a86b3edd51d6c53d9cf7226b6f4f8d2f88a44 Reviewed-on: https://go-review.googlesource.com/c/153757 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-11 21:08:58 -08:00
want: `101: "\x01\x00"
102: "hello world"
103: "世界"
`,
}, {
desc: "unknown group type",
encoding/prototext: add MarshalOptions.EmitUnknown This changes text marshaling to avoid unknown fields by default and instead adds an option so that unknown fields be emitted. This ensures that the default marshal/unknown can round-trip. Change-Id: I85c84ba6ab7916d538ec6bfd4e9d399a8fcba14e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/195778 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-14 19:14:24 -07:00
mo: prototext.MarshalOptions{EmitUnknown: true},
encoding: avoid direct access to XXX_unrecognized Use the SetUnknown API instead. Change-Id: Id9dc81581084ccf8ef5453a80c75fcfd63289636 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/184877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-06-22 13:20:09 -07:00
input: func() proto.Message {
m := new(pb2.Scalars)
testing/protopack: make package publicly available Change-Id: I342ed27df17867f18c58e60880bcac5a31a3096b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/219837 Reviewed-by: Damien Neil <dneil@google.com>
2020-02-14 18:13:14 -08:00
m.ProtoReflect().SetUnknown(protopack.Message{
protopack.Tag{101, protopack.StartGroupType}, protopack.Tag{101, protopack.EndGroupType},
protopack.Tag{102, protopack.StartGroupType},
protopack.Tag{101, protopack.VarintType}, protopack.Bool(false),
protopack.Tag{102, protopack.BytesType}, protopack.String("inside a group"),
protopack.Tag{102, protopack.EndGroupType},
encoding: avoid direct access to XXX_unrecognized Use the SetUnknown API instead. Change-Id: Id9dc81581084ccf8ef5453a80c75fcfd63289636 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/184877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-06-22 13:20:09 -07:00
}.Marshal())
return m
}(),
encoding/textpb: add marshaling of unknown fields Change-Id: Ifa2a86b3edd51d6c53d9cf7226b6f4f8d2f88a44 Reviewed-on: https://go-review.googlesource.com/c/153757 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-11 21:08:58 -08:00
want: `101: {}
102: {
101: 0
102: "inside a group"
}
`,
}, {
desc: "unknown unpack repeated field",
encoding/prototext: add MarshalOptions.EmitUnknown This changes text marshaling to avoid unknown fields by default and instead adds an option so that unknown fields be emitted. This ensures that the default marshal/unknown can round-trip. Change-Id: I85c84ba6ab7916d538ec6bfd4e9d399a8fcba14e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/195778 Reviewed-by: Herbie Ong <herbie@google.com>
2019-09-14 19:14:24 -07:00
mo: prototext.MarshalOptions{EmitUnknown: true},
encoding: avoid direct access to XXX_unrecognized Use the SetUnknown API instead. Change-Id: Id9dc81581084ccf8ef5453a80c75fcfd63289636 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/184877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-06-22 13:20:09 -07:00
input: func() proto.Message {
m := new(pb2.Scalars)
testing/protopack: make package publicly available Change-Id: I342ed27df17867f18c58e60880bcac5a31a3096b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/219837 Reviewed-by: Damien Neil <dneil@google.com>
2020-02-14 18:13:14 -08:00
m.ProtoReflect().SetUnknown(protopack.Message{
protopack.Tag{101, protopack.BytesType}, protopack.LengthPrefix{protopack.Bool(true), protopack.Bool(false), protopack.Bool(true)},
protopack.Tag{102, protopack.BytesType}, protopack.String("hello"),
protopack.Tag{101, protopack.VarintType}, protopack.Bool(true),
protopack.Tag{102, protopack.BytesType}, protopack.String("世界"),
encoding: avoid direct access to XXX_unrecognized Use the SetUnknown API instead. Change-Id: Id9dc81581084ccf8ef5453a80c75fcfd63289636 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/184877 Reviewed-by: Herbie Ong <herbie@google.com>
2019-06-22 13:20:09 -07:00
}.Marshal())
return m
}(),
encoding/textpb: add marshaling of unknown fields Change-Id: Ifa2a86b3edd51d6c53d9cf7226b6f4f8d2f88a44 Reviewed-on: https://go-review.googlesource.com/c/153757 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-11 21:08:58 -08:00
want: `101: "\x01\x00\x01"
102: "hello"
reflect/protoreflect: add alternative message reflection API Added API: Message.Len Message.Range Message.Has Message.Clear Message.Get Message.Set Message.Mutable Message.NewMessage Message.WhichOneof Message.GetUnknown Message.SetUnknown Deprecated API (to be removed in subsequent CL): Message.KnownFields Message.UnknownFields The primary difference with the new API is that the top-level Message methods are keyed by FieldDescriptor rather than FieldNumber with the following semantics: * For known fields, the FieldDescriptor must exactly match the field descriptor known by the message. * For extension fields, the FieldDescriptor must implement ExtensionType, where ContainingMessage.FullName matches the message name, and the field number is within the message's extension range. When setting an extension field, it automatically stores the extension type information. * Extension fields are always considered nullable, implying that repeated extension fields are nullable. That is, you can distinguish between a unpopulated list and an empty list. * Message.Get always returns a valid Value even if unpopulated. The behavior is already well-defined for scalars, but for unpopulated composite types, it now returns an empty read-only version of it. Change-Id: Ia120630b4db221aeaaf743d0f64160e1a61a0f61 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/175458 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-25 23:48:08 -07:00
101: 1
encoding/textpb: add marshaling of unknown fields Change-Id: Ifa2a86b3edd51d6c53d9cf7226b6f4f8d2f88a44 Reviewed-on: https://go-review.googlesource.com/c/153757 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-11 21:08:58 -08:00
102: "世界"
`,
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}, {
desc: "extensions of non-repeated fields",
input: func() proto.Message {
m := &pb2.Extensions{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("non-extension field"),
OptBool: proto.Bool(true),
OptInt32: proto.Int32(42),
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
all: refactor extensions, add proto.GetExtension etc. Change protoiface.ExtensionDescV1 to implement protoreflect.ExtensionType. ExtensionDescV1's Name field conflicts with the Descriptor Name method, so change the protoreflect.{Message,Enum,Extension}Type types to no longer implement the corresponding Descriptor interface. This also leads to a clearer distinction between the two types. Introduce a protoreflect.ExtensionTypeDescriptor type which bridges between ExtensionType and ExtensionDescriptor. Add extension accessor functions to the proto package: proto.{Has,Clear,Get,Set}Extension. These functions take a protoreflect.ExtensionType parameter, which allows writing the same function call using either the old or new API: proto.GetExtension(message, somepb.E_ExtensionFoo) Fixes golang/protobuf#908 Change-Id: Ibc65d12a46666297849114fd3aefbc4a597d9f08 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189199 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-02 16:58:08 -07:00
proto.SetExtension(m, pb2.E_OptExtBool, true)
proto.SetExtension(m, pb2.E_OptExtString, "extension field")
proto.SetExtension(m, pb2.E_OptExtEnum, pb2.Enum_TEN)
proto.SetExtension(m, pb2.E_OptExtNested, &pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("nested in an extension"),
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
OptNested: &pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("another nested in an extension"),
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
},
})
return m
}(),
want: `opt_string: "non-extension field"
opt_bool: true
opt_int32: 42
[pb2.opt_ext_bool]: true
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
[pb2.opt_ext_enum]: TEN
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
[pb2.opt_ext_nested]: {
opt_string: "nested in an extension"
opt_nested: {
opt_string: "another nested in an extension"
}
}
[pb2.opt_ext_string]: "extension field"
encoding/textpb: clean-up code and fix error handling inside closures In marshalMap, replace Map.Range and sortMap with internal/mapsort.Range. Also, make sure to capture fatal error properly for return. In appendExtensions, capture fatal error properly for return. Added a testcase that shows this was a bug. In unmarshalAny, remove unnecessary checks and use internal/fieldnum for Any's field numbers. Change-Id: Id8574d5b4eb820ad961f6ad5e886f8ae2e9b90f0 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170627 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-03 15:42:41 -07:00
`,
encoding/textpb: add string fields UTF-8 validation Change-Id: I15aec2b90efae9366eb496dc221b9e8cacd9d8e6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171122 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-08 17:32:44 -07:00
}, {
encoding/prototext: adjust handling of invalid UTF-8 The following changes are made: * Permit invalid UTF-8 in proto2. This goes against specified behavior, but matches functional behavior in wire marshaling (not just for Go, but also in the other major language implementations as well). * The Format function is specified as ignoring errors since its intended purpose is to surface information to the human user even if it's not exactly parsible back into a message. As such, add an unexported allowInvalidUTF8 option that is specially used by Format. * Add an EmitASCII option that forces the formatting of strings and bytes to always be encoded as ASCII. This ensures that the entire output is always ASCII as well. Note that we do not replicate this behavior for protojson since: * The JSON format fundamentally has a stricter and well-specified grammar for exactly what is valid/invalid, while the text format has not had a well-specified grammar for the longest time, leading to all sorts of weird usages due to Hyrum's law. * This is to ease migration from the legacy implementation, which did permit invalid UTF-8 in proto2. * The EmitASCII option relies on the ability to always escape Unicode characters using ASCII escape sequences, but this is not possible in JSON since the grammar only has an escape sequence defined for Unicode characters \u0000 to \uffff, inclusive. However, Unicode v12.0.0 defines characters up to \U0010FFFF, which is beyond what the JSON grammar provides escape sequences for. Change-Id: I2b524a904e9ec59f9ed5500e299613bc27c31a14 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/233077 Reviewed-by: Herbie Ong <herbie@google.com>
2020-05-07 15:10:54 -07:00
desc: "proto2 extension field contains invalid UTF-8",
encoding/textpb: add string fields UTF-8 validation Change-Id: I15aec2b90efae9366eb496dc221b9e8cacd9d8e6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171122 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-08 17:32:44 -07:00
input: func() proto.Message {
m := &pb2.Extensions{}
all: refactor extensions, add proto.GetExtension etc. Change protoiface.ExtensionDescV1 to implement protoreflect.ExtensionType. ExtensionDescV1's Name field conflicts with the Descriptor Name method, so change the protoreflect.{Message,Enum,Extension}Type types to no longer implement the corresponding Descriptor interface. This also leads to a clearer distinction between the two types. Introduce a protoreflect.ExtensionTypeDescriptor type which bridges between ExtensionType and ExtensionDescriptor. Add extension accessor functions to the proto package: proto.{Has,Clear,Get,Set}Extension. These functions take a protoreflect.ExtensionType parameter, which allows writing the same function call using either the old or new API: proto.GetExtension(message, somepb.E_ExtensionFoo) Fixes golang/protobuf#908 Change-Id: Ibc65d12a46666297849114fd3aefbc4a597d9f08 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189199 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-02 16:58:08 -07:00
proto.SetExtension(m, pb2.E_OptExtString, "abc\xff")
encoding/textpb: add string fields UTF-8 validation Change-Id: I15aec2b90efae9366eb496dc221b9e8cacd9d8e6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171122 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-08 17:32:44 -07:00
return m
}(),
encoding/prototext: adjust handling of invalid UTF-8 The following changes are made: * Permit invalid UTF-8 in proto2. This goes against specified behavior, but matches functional behavior in wire marshaling (not just for Go, but also in the other major language implementations as well). * The Format function is specified as ignoring errors since its intended purpose is to surface information to the human user even if it's not exactly parsible back into a message. As such, add an unexported allowInvalidUTF8 option that is specially used by Format. * Add an EmitASCII option that forces the formatting of strings and bytes to always be encoded as ASCII. This ensures that the entire output is always ASCII as well. Note that we do not replicate this behavior for protojson since: * The JSON format fundamentally has a stricter and well-specified grammar for exactly what is valid/invalid, while the text format has not had a well-specified grammar for the longest time, leading to all sorts of weird usages due to Hyrum's law. * This is to ease migration from the legacy implementation, which did permit invalid UTF-8 in proto2. * The EmitASCII option relies on the ability to always escape Unicode characters using ASCII escape sequences, but this is not possible in JSON since the grammar only has an escape sequence defined for Unicode characters \u0000 to \uffff, inclusive. However, Unicode v12.0.0 defines characters up to \U0010FFFF, which is beyond what the JSON grammar provides escape sequences for. Change-Id: I2b524a904e9ec59f9ed5500e299613bc27c31a14 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/233077 Reviewed-by: Herbie Ong <herbie@google.com>
2020-05-07 15:10:54 -07:00
want: `[pb2.opt_ext_string]: "abc\xff"
`,
encoding/textpb: clean-up code and fix error handling inside closures In marshalMap, replace Map.Range and sortMap with internal/mapsort.Range. Also, make sure to capture fatal error properly for return. In appendExtensions, capture fatal error properly for return. Added a testcase that shows this was a bug. In unmarshalAny, remove unnecessary checks and use internal/fieldnum for Any's field numbers. Change-Id: Id8574d5b4eb820ad961f6ad5e886f8ae2e9b90f0 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170627 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-03 15:42:41 -07:00
}, {
desc: "extension partial returns error",
input: func() proto.Message {
m := &pb2.Extensions{}
all: refactor extensions, add proto.GetExtension etc. Change protoiface.ExtensionDescV1 to implement protoreflect.ExtensionType. ExtensionDescV1's Name field conflicts with the Descriptor Name method, so change the protoreflect.{Message,Enum,Extension}Type types to no longer implement the corresponding Descriptor interface. This also leads to a clearer distinction between the two types. Introduce a protoreflect.ExtensionTypeDescriptor type which bridges between ExtensionType and ExtensionDescriptor. Add extension accessor functions to the proto package: proto.{Has,Clear,Get,Set}Extension. These functions take a protoreflect.ExtensionType parameter, which allows writing the same function call using either the old or new API: proto.GetExtension(message, somepb.E_ExtensionFoo) Fixes golang/protobuf#908 Change-Id: Ibc65d12a46666297849114fd3aefbc4a597d9f08 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189199 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-02 16:58:08 -07:00
proto.SetExtension(m, pb2.E_OptExtPartial, &pb2.PartialRequired{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("partial1"),
encoding/textpb: clean-up code and fix error handling inside closures In marshalMap, replace Map.Range and sortMap with internal/mapsort.Range. Also, make sure to capture fatal error properly for return. In appendExtensions, capture fatal error properly for return. Added a testcase that shows this was a bug. In unmarshalAny, remove unnecessary checks and use internal/fieldnum for Any's field numbers. Change-Id: Id8574d5b4eb820ad961f6ad5e886f8ae2e9b90f0 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170627 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-03 15:42:41 -07:00
})
all: refactor extensions, add proto.GetExtension etc. Change protoiface.ExtensionDescV1 to implement protoreflect.ExtensionType. ExtensionDescV1's Name field conflicts with the Descriptor Name method, so change the protoreflect.{Message,Enum,Extension}Type types to no longer implement the corresponding Descriptor interface. This also leads to a clearer distinction between the two types. Introduce a protoreflect.ExtensionTypeDescriptor type which bridges between ExtensionType and ExtensionDescriptor. Add extension accessor functions to the proto package: proto.{Has,Clear,Get,Set}Extension. These functions take a protoreflect.ExtensionType parameter, which allows writing the same function call using either the old or new API: proto.GetExtension(message, somepb.E_ExtensionFoo) Fixes golang/protobuf#908 Change-Id: Ibc65d12a46666297849114fd3aefbc4a597d9f08 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189199 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-02 16:58:08 -07:00
proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtPartial, &pb2.PartialRequired{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("partial2"),
encoding/textpb: clean-up code and fix error handling inside closures In marshalMap, replace Map.Range and sortMap with internal/mapsort.Range. Also, make sure to capture fatal error properly for return. In appendExtensions, capture fatal error properly for return. Added a testcase that shows this was a bug. In unmarshalAny, remove unnecessary checks and use internal/fieldnum for Any's field numbers. Change-Id: Id8574d5b4eb820ad961f6ad5e886f8ae2e9b90f0 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170627 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-03 15:42:41 -07:00
})
return m
}(),
want: `[pb2.ExtensionsContainer.opt_ext_partial]: {
opt_string: "partial2"
}
[pb2.opt_ext_partial]: {
opt_string: "partial1"
}
`,
wantErr: true,
}, {
desc: "extension partial with AllowPartial",
protogen, encoding/jsonpb, encoding/textpb: rename packages Rename encoding/*pb to follow the convention of prefixing package names with 'proto': google.golang.org/protobuf/encoding/protojson google.golang.org/protobuf/encoding/prototext Move protogen under a compiler/ directory, just in case we ever do add more compiler-related packages. google.golang.org/protobuf/compiler/protogen Change-Id: I31010cb5cabcea8274fffcac468477b58b56e8eb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177178 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-14 12:44:37 -07:00
mo: prototext.MarshalOptions{AllowPartial: true},
encoding/textpb: clean-up code and fix error handling inside closures In marshalMap, replace Map.Range and sortMap with internal/mapsort.Range. Also, make sure to capture fatal error properly for return. In appendExtensions, capture fatal error properly for return. Added a testcase that shows this was a bug. In unmarshalAny, remove unnecessary checks and use internal/fieldnum for Any's field numbers. Change-Id: Id8574d5b4eb820ad961f6ad5e886f8ae2e9b90f0 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170627 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-03 15:42:41 -07:00
input: func() proto.Message {
m := &pb2.Extensions{}
all: refactor extensions, add proto.GetExtension etc. Change protoiface.ExtensionDescV1 to implement protoreflect.ExtensionType. ExtensionDescV1's Name field conflicts with the Descriptor Name method, so change the protoreflect.{Message,Enum,Extension}Type types to no longer implement the corresponding Descriptor interface. This also leads to a clearer distinction between the two types. Introduce a protoreflect.ExtensionTypeDescriptor type which bridges between ExtensionType and ExtensionDescriptor. Add extension accessor functions to the proto package: proto.{Has,Clear,Get,Set}Extension. These functions take a protoreflect.ExtensionType parameter, which allows writing the same function call using either the old or new API: proto.GetExtension(message, somepb.E_ExtensionFoo) Fixes golang/protobuf#908 Change-Id: Ibc65d12a46666297849114fd3aefbc4a597d9f08 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189199 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-02 16:58:08 -07:00
proto.SetExtension(m, pb2.E_OptExtPartial, &pb2.PartialRequired{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("partial1"),
encoding/textpb: clean-up code and fix error handling inside closures In marshalMap, replace Map.Range and sortMap with internal/mapsort.Range. Also, make sure to capture fatal error properly for return. In appendExtensions, capture fatal error properly for return. Added a testcase that shows this was a bug. In unmarshalAny, remove unnecessary checks and use internal/fieldnum for Any's field numbers. Change-Id: Id8574d5b4eb820ad961f6ad5e886f8ae2e9b90f0 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170627 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-03 15:42:41 -07:00
})
return m
}(),
want: `[pb2.opt_ext_partial]: {
opt_string: "partial1"
}
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
`,
}, {
desc: "extensions of repeated fields",
input: func() proto.Message {
m := &pb2.Extensions{}
internal/impl: change Go representation of extension lists to []T Change-Id: Iebcefe0330c8f858c7735f9362abfd87043ee39d Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/192458 Reviewed-by: Joe Tsai <joetsai@google.com>
2019-08-29 11:42:57 -07:00
proto.SetExtension(m, pb2.E_RptExtEnum, []pb2.Enum{pb2.Enum_TEN, 101, pb2.Enum_ONE})
proto.SetExtension(m, pb2.E_RptExtFixed32, []uint32{42, 47})
proto.SetExtension(m, pb2.E_RptExtNested, []*pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
&pb2.Nested{OptString: proto.String("one")},
&pb2.Nested{OptString: proto.String("two")},
&pb2.Nested{OptString: proto.String("three")},
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
})
return m
}(),
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
want: `[pb2.rpt_ext_enum]: TEN
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
[pb2.rpt_ext_enum]: 101
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
[pb2.rpt_ext_enum]: ONE
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
[pb2.rpt_ext_fixed32]: 42
[pb2.rpt_ext_fixed32]: 47
[pb2.rpt_ext_nested]: {
opt_string: "one"
}
[pb2.rpt_ext_nested]: {
opt_string: "two"
}
[pb2.rpt_ext_nested]: {
opt_string: "three"
}
`,
}, {
desc: "extensions of non-repeated fields in another message",
input: func() proto.Message {
m := &pb2.Extensions{}
all: refactor extensions, add proto.GetExtension etc. Change protoiface.ExtensionDescV1 to implement protoreflect.ExtensionType. ExtensionDescV1's Name field conflicts with the Descriptor Name method, so change the protoreflect.{Message,Enum,Extension}Type types to no longer implement the corresponding Descriptor interface. This also leads to a clearer distinction between the two types. Introduce a protoreflect.ExtensionTypeDescriptor type which bridges between ExtensionType and ExtensionDescriptor. Add extension accessor functions to the proto package: proto.{Has,Clear,Get,Set}Extension. These functions take a protoreflect.ExtensionType parameter, which allows writing the same function call using either the old or new API: proto.GetExtension(message, somepb.E_ExtensionFoo) Fixes golang/protobuf#908 Change-Id: Ibc65d12a46666297849114fd3aefbc4a597d9f08 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189199 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-02 16:58:08 -07:00
proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtBool, true)
proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtString, "extension field")
proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtEnum, pb2.Enum_TEN)
proto.SetExtension(m, pb2.E_ExtensionsContainer_OptExtNested, &pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("nested in an extension"),
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
OptNested: &pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("another nested in an extension"),
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
},
})
return m
}(),
want: `[pb2.ExtensionsContainer.opt_ext_bool]: true
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
[pb2.ExtensionsContainer.opt_ext_enum]: TEN
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
[pb2.ExtensionsContainer.opt_ext_nested]: {
opt_string: "nested in an extension"
opt_nested: {
opt_string: "another nested in an extension"
}
}
[pb2.ExtensionsContainer.opt_ext_string]: "extension field"
`,
}, {
desc: "extensions of repeated fields in another message",
input: func() proto.Message {
m := &pb2.Extensions{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("non-extension field"),
OptBool: proto.Bool(true),
OptInt32: proto.Int32(42),
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
}
internal/impl: change Go representation of extension lists to []T Change-Id: Iebcefe0330c8f858c7735f9362abfd87043ee39d Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/192458 Reviewed-by: Joe Tsai <joetsai@google.com>
2019-08-29 11:42:57 -07:00
proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtEnum, []pb2.Enum{pb2.Enum_TEN, 101, pb2.Enum_ONE})
proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtString, []string{"hello", "world"})
proto.SetExtension(m, pb2.E_ExtensionsContainer_RptExtNested, []*pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
&pb2.Nested{OptString: proto.String("one")},
&pb2.Nested{OptString: proto.String("two")},
&pb2.Nested{OptString: proto.String("three")},
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
})
return m
}(),
want: `opt_string: "non-extension field"
opt_bool: true
opt_int32: 42
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
[pb2.ExtensionsContainer.rpt_ext_enum]: TEN
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
[pb2.ExtensionsContainer.rpt_ext_enum]: 101
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
[pb2.ExtensionsContainer.rpt_ext_enum]: ONE
encoding/text: marshal extensions Change-Id: Ic4a0c5909fb6eca76d22053b143be58c60b67b34 Reviewed-on: https://go-review.googlesource.com/c/154657 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-17 17:13:07 -08:00
[pb2.ExtensionsContainer.rpt_ext_nested]: {
opt_string: "one"
}
[pb2.ExtensionsContainer.rpt_ext_nested]: {
opt_string: "two"
}
[pb2.ExtensionsContainer.rpt_ext_nested]: {
opt_string: "three"
}
[pb2.ExtensionsContainer.rpt_ext_string]: "hello"
[pb2.ExtensionsContainer.rpt_ext_string]: "world"
`,
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
}, {
desc: "MessageSet",
input: func() proto.Message {
m := &pb2.MessageSet{}
all: refactor extensions, add proto.GetExtension etc. Change protoiface.ExtensionDescV1 to implement protoreflect.ExtensionType. ExtensionDescV1's Name field conflicts with the Descriptor Name method, so change the protoreflect.{Message,Enum,Extension}Type types to no longer implement the corresponding Descriptor interface. This also leads to a clearer distinction between the two types. Introduce a protoreflect.ExtensionTypeDescriptor type which bridges between ExtensionType and ExtensionDescriptor. Add extension accessor functions to the proto package: proto.{Has,Clear,Get,Set}Extension. These functions take a protoreflect.ExtensionType parameter, which allows writing the same function call using either the old or new API: proto.GetExtension(message, somepb.E_ExtensionFoo) Fixes golang/protobuf#908 Change-Id: Ibc65d12a46666297849114fd3aefbc4a597d9f08 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189199 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-02 16:58:08 -07:00
proto.SetExtension(m, pb2.E_MessageSetExtension_MessageSetExtension, &pb2.MessageSetExtension{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("a messageset extension"),
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
})
all: refactor extensions, add proto.GetExtension etc. Change protoiface.ExtensionDescV1 to implement protoreflect.ExtensionType. ExtensionDescV1's Name field conflicts with the Descriptor Name method, so change the protoreflect.{Message,Enum,Extension}Type types to no longer implement the corresponding Descriptor interface. This also leads to a clearer distinction between the two types. Introduce a protoreflect.ExtensionTypeDescriptor type which bridges between ExtensionType and ExtensionDescriptor. Add extension accessor functions to the proto package: proto.{Has,Clear,Get,Set}Extension. These functions take a protoreflect.ExtensionType parameter, which allows writing the same function call using either the old or new API: proto.GetExtension(message, somepb.E_ExtensionFoo) Fixes golang/protobuf#908 Change-Id: Ibc65d12a46666297849114fd3aefbc4a597d9f08 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189199 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-02 16:58:08 -07:00
proto.SetExtension(m, pb2.E_MessageSetExtension_NotMessageSetExtension, &pb2.MessageSetExtension{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("not a messageset extension"),
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
})
all: refactor extensions, add proto.GetExtension etc. Change protoiface.ExtensionDescV1 to implement protoreflect.ExtensionType. ExtensionDescV1's Name field conflicts with the Descriptor Name method, so change the protoreflect.{Message,Enum,Extension}Type types to no longer implement the corresponding Descriptor interface. This also leads to a clearer distinction between the two types. Introduce a protoreflect.ExtensionTypeDescriptor type which bridges between ExtensionType and ExtensionDescriptor. Add extension accessor functions to the proto package: proto.{Has,Clear,Get,Set}Extension. These functions take a protoreflect.ExtensionType parameter, which allows writing the same function call using either the old or new API: proto.GetExtension(message, somepb.E_ExtensionFoo) Fixes golang/protobuf#908 Change-Id: Ibc65d12a46666297849114fd3aefbc4a597d9f08 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189199 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-02 16:58:08 -07:00
proto.SetExtension(m, pb2.E_MessageSetExtension_ExtNested, &pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("just a regular extension"),
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
})
return m
}(),
internal/order: add a package for ordered iteration over messages and maps The order package replaces the mapsort and fieldsort packages. It presents a common API for ordered iteration over message fields and map fields. It has a number of pre-defined orderings. Change-Id: Ie6cd423da30b4757864c352cb04454f21fe07ee2 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/239837 Reviewed-by: Herbie Ong <herbie@google.com>
2020-06-24 14:28:07 -07:00
want: `[pb2.MessageSetExtension.ext_nested]: {
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
opt_string: "just a regular extension"
}
internal/order: add a package for ordered iteration over messages and maps The order package replaces the mapsort and fieldsort packages. It presents a common API for ordered iteration over message fields and map fields. It has a number of pre-defined orderings. Change-Id: Ie6cd423da30b4757864c352cb04454f21fe07ee2 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/239837 Reviewed-by: Herbie Ong <herbie@google.com>
2020-06-24 14:28:07 -07:00
[pb2.MessageSetExtension]: {
opt_string: "a messageset extension"
}
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
[pb2.MessageSetExtension.not_message_set_extension]: {
opt_string: "not a messageset extension"
}
`,
all: rename tag and flags for legacy support Rename build tag "proto1_legacy" -> "protolegacy" to be consistent with the "protoreflect" tag. Rename flag constant "Proto1Legacy" -> "ProtoLegacy" since it covers more than simply proto1 legacy features. For example, it covers alpha-features of proto3 that were eventually removed from the final proto3 release. Change-Id: I0f4fcbadd4b5a61c87645e2e5be11d187e59157c Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189345 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-08 13:31:59 -07:00
skip: !flags.ProtoLegacy,
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
}, {
desc: "not real MessageSet 1",
input: func() proto.Message {
m := &pb2.FakeMessageSet{}
all: refactor extensions, add proto.GetExtension etc. Change protoiface.ExtensionDescV1 to implement protoreflect.ExtensionType. ExtensionDescV1's Name field conflicts with the Descriptor Name method, so change the protoreflect.{Message,Enum,Extension}Type types to no longer implement the corresponding Descriptor interface. This also leads to a clearer distinction between the two types. Introduce a protoreflect.ExtensionTypeDescriptor type which bridges between ExtensionType and ExtensionDescriptor. Add extension accessor functions to the proto package: proto.{Has,Clear,Get,Set}Extension. These functions take a protoreflect.ExtensionType parameter, which allows writing the same function call using either the old or new API: proto.GetExtension(message, somepb.E_ExtensionFoo) Fixes golang/protobuf#908 Change-Id: Ibc65d12a46666297849114fd3aefbc4a597d9f08 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189199 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-02 16:58:08 -07:00
proto.SetExtension(m, pb2.E_FakeMessageSetExtension_MessageSetExtension, &pb2.FakeMessageSetExtension{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("not a messageset extension"),
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
})
return m
}(),
want: `[pb2.FakeMessageSetExtension.message_set_extension]: {
opt_string: "not a messageset extension"
}
`,
all: rename tag and flags for legacy support Rename build tag "proto1_legacy" -> "protolegacy" to be consistent with the "protoreflect" tag. Rename flag constant "Proto1Legacy" -> "ProtoLegacy" since it covers more than simply proto1 legacy features. For example, it covers alpha-features of proto3 that were eventually removed from the final proto3 release. Change-Id: I0f4fcbadd4b5a61c87645e2e5be11d187e59157c Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189345 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-08 13:31:59 -07:00
skip: !flags.ProtoLegacy,
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
}, {
desc: "not real MessageSet 2",
input: func() proto.Message {
m := &pb2.MessageSet{}
all: refactor extensions, add proto.GetExtension etc. Change protoiface.ExtensionDescV1 to implement protoreflect.ExtensionType. ExtensionDescV1's Name field conflicts with the Descriptor Name method, so change the protoreflect.{Message,Enum,Extension}Type types to no longer implement the corresponding Descriptor interface. This also leads to a clearer distinction between the two types. Introduce a protoreflect.ExtensionTypeDescriptor type which bridges between ExtensionType and ExtensionDescriptor. Add extension accessor functions to the proto package: proto.{Has,Clear,Get,Set}Extension. These functions take a protoreflect.ExtensionType parameter, which allows writing the same function call using either the old or new API: proto.GetExtension(message, somepb.E_ExtensionFoo) Fixes golang/protobuf#908 Change-Id: Ibc65d12a46666297849114fd3aefbc4a597d9f08 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189199 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-08-02 16:58:08 -07:00
proto.SetExtension(m, pb2.E_MessageSetExtension, &pb2.FakeMessageSetExtension{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("another not a messageset extension"),
encoding/textpb: add support for MessageSet This only handles compliant MessageSet extension fields where the field name has to be message_set_extension. Current C++ lib allows for different message field names, which is a possible bug as it makes marshal output possibly contain duplicate names when more than one field extends the same MessageSet, and makes unmarshaling confusing as to which field to populate. Change-Id: Ifda828ba794fe7e058ee6004f03001b1031f6d1e Reviewed-on: https://go-review.googlesource.com/c/156758 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-07 18:56:57 -08:00
})
return m
}(),
want: `[pb2.message_set_extension]: {
opt_string: "another not a messageset extension"
}
`,
all: rename tag and flags for legacy support Rename build tag "proto1_legacy" -> "protolegacy" to be consistent with the "protoreflect" tag. Rename flag constant "Proto1Legacy" -> "ProtoLegacy" since it covers more than simply proto1 legacy features. For example, it covers alpha-features of proto3 that were eventually removed from the final proto3 release. Change-Id: I0f4fcbadd4b5a61c87645e2e5be11d187e59157c Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/189345 Reviewed-by: Damien Neil <dneil@google.com>
2019-08-08 13:31:59 -07:00
skip: !flags.ProtoLegacy,
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "Any not expanded",
protogen, encoding/jsonpb, encoding/textpb: rename packages Rename encoding/*pb to follow the convention of prefixing package names with 'proto': google.golang.org/protobuf/encoding/protojson google.golang.org/protobuf/encoding/prototext Move protogen under a compiler/ directory, just in case we ever do add more compiler-related packages. google.golang.org/protobuf/compiler/protogen Change-Id: I31010cb5cabcea8274fffcac468477b58b56e8eb Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177178 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-05-14 12:44:37 -07:00
mo: prototext.MarshalOptions{
all: remove shorthand import aliases Change-Id: I62ec79419354a2c65ac69e4bcc1cc864a6a40a1a Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/407934 Reviewed-by: Lasse Folger <lassefolger@google.com> Reviewed-by: Damien Neil <dneil@google.com>
2022-05-24 05:12:23 +09:00
Resolver: new(protoregistry.Types),
encoding/textpb: unmarshal Any Also fix marshaling Any in expanded form to contain the correct type_url value. Change-Id: I4b467e74bb1d73255effd9cc4cfff9cf4558940f Reviewed-on: https://go-review.googlesource.com/c/156342 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-04 14:08:41 -08:00
},
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
input: func() proto.Message {
m := &pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("embedded inside Any"),
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
OptNested: &pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("inception"),
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
},
}
encoding/textpb: reduce dependency on proto v1 package Substitute protoV1.Marshal calls to use proto v2. A few tests still need to use v1 due to missing required field checks in v2. Change-Id: I97ee208b81afc85c81142e70c1d7bdc47db76ce4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167774 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-15 18:22:36 -07:00
b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
return &anypb.Any{
encoding/textpb: unmarshal Any Also fix marshaling Any in expanded form to contain the correct type_url value. Change-Id: I4b467e74bb1d73255effd9cc4cfff9cf4558940f Reviewed-on: https://go-review.googlesource.com/c/156342 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-04 14:08:41 -08:00
TypeUrl: "pb2.Nested",
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
Value: b,
encoding/textpb: clean up tests on Any Remove unnecessary v1 wrapping. Change most tests to operate on message Any directly. Change-Id: I19bbca6c1af72894f6a292aab8ebd09e0301a260 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168517 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-20 18:05:16 -07:00
}
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
}(),
want: `type_url: "pb2.Nested"
value: "\n\x13embedded inside Any\x12\x0b\n\tinception"
`,
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "Any expanded",
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
input: func() proto.Message {
m := &pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("embedded inside Any"),
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
OptNested: &pb2.Nested{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("inception"),
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
},
}
encoding/textpb: reduce dependency on proto v1 package Substitute protoV1.Marshal calls to use proto v2. A few tests still need to use v1 due to missing required field checks in v2. Change-Id: I97ee208b81afc85c81142e70c1d7bdc47db76ce4 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167774 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-15 18:22:36 -07:00
b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
return &anypb.Any{
encoding/textpb: unmarshal Any Also fix marshaling Any in expanded form to contain the correct type_url value. Change-Id: I4b467e74bb1d73255effd9cc4cfff9cf4558940f Reviewed-on: https://go-review.googlesource.com/c/156342 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-04 14:08:41 -08:00
TypeUrl: "foo/pb2.Nested",
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
Value: b,
encoding/textpb: clean up tests on Any Remove unnecessary v1 wrapping. Change most tests to operate on message Any directly. Change-Id: I19bbca6c1af72894f6a292aab8ebd09e0301a260 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168517 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-20 18:05:16 -07:00
}
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
}(),
encoding/textpb: unmarshal Any Also fix marshaling Any in expanded form to contain the correct type_url value. Change-Id: I4b467e74bb1d73255effd9cc4cfff9cf4558940f Reviewed-on: https://go-review.googlesource.com/c/156342 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-04 14:08:41 -08:00
want: `[foo/pb2.Nested]: {
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
opt_string: "embedded inside Any"
opt_nested: {
opt_string: "inception"
}
}
`,
}, {
encoding/protojson, encoding/prototext: always allow partial Any The wire representation of the contents of an Any is a `bytes` field containing the the wire encoding of the contained message. The in-memory representation is just these bytes. The wire (un)marshaler has no special handling for Any values, and happily accepts whatever bytes are present. The text and JSON marshalers will unmarshal the bytes in an Any, and the unmarshalers will marshal the Any to produce the in-memory representation. This makes them stricter than the wire (un)marshaler: Marshaling an Any which contains invalid data to text/JSON fails, while marshaling it to wire format does not. This does make some sense, since the Any already contains wire-format data; validation is performed at an earlier time when producing that data. This change brings the text and JSON (un)marshal functions a bit more into alignment with the wire format by never performing checks for required fields on the contents of an Any. This has the advantage of consistently performing checks for required fields exactly once per marshal/unmarshal operation, and over the same data no matter which encoding is used. It also eliminates the one case where a required field check is considered "non-fatal", generating an error but not terminating the (un)marshal operation. Change-Id: I70c62419d37ea0a07cb73c3ee2d26c0b0bec724b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/182982 Reviewed-by: Herbie Ong <herbie@google.com>
2019-06-19 10:41:09 -07:00
desc: "Any expanded with missing required",
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
input: func() proto.Message {
m := &pb2.PartialRequired{
proto: move T->*T wrappers from internal/scalar to proto Usage of these is pervasive in code which works with proto2, and proto2 will be with us for a long, long time to come. Move them to the proto package. Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-07-10 16:17:16 -07:00
OptString: proto.String("embedded inside Any"),
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
}
proto: check for required fields in encoding/decoding Change-Id: I0555a92e0399782f075b1dcd248e880dd48c7d6d Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/170579 Reviewed-by: Herbie Ong <herbie@google.com>
2019-04-03 12:17:24 -07:00
b, err := proto.MarshalOptions{
AllowPartial: true,
Deterministic: true,
}.Marshal(m)
encoding/textpb: clean up tests on Any Remove unnecessary v1 wrapping. Change most tests to operate on message Any directly. Change-Id: I19bbca6c1af72894f6a292aab8ebd09e0301a260 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168517 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-20 18:05:16 -07:00
if err != nil {
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
return &anypb.Any{
reflect/protoreflect: add Descriptor specific methods Added methods: Enum.Descriptor Message.Descriptor EnumType.Descriptor MessageType.Descriptor ExtensionType.Descriptor Message.New All functionality is switched over to use those methods instead of implicitly relying on the fact that {Enum,Message}Type implicitly implement the associated descriptor interface. This CL does not yet remove {Enum,Message}.Type or prevent {Enum,Message,Extension}Type from implementating a descriptor. That is a subsequent CL. The Message.New method is also added to replace functionality that will be lost when the Type methods are removed. Change-Id: I7fefde1673bbd40bfdac489aca05cec9a6c98eb1 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/174918 Reviewed-by: Damien Neil <dneil@google.com> Reviewed-by: Herbie Ong <herbie@google.com>
2019-05-01 12:29:25 -07:00
TypeUrl: string(m.ProtoReflect().Descriptor().FullName()),
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
Value: b,
encoding/textpb: clean up tests on Any Remove unnecessary v1 wrapping. Change most tests to operate on message Any directly. Change-Id: I19bbca6c1af72894f6a292aab8ebd09e0301a260 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168517 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-20 18:05:16 -07:00
}
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
}(),
want: `[pb2.PartialRequired]: {
opt_string: "embedded inside Any"
}
encoding/textpb: add string fields UTF-8 validation Change-Id: I15aec2b90efae9366eb496dc221b9e8cacd9d8e6 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/171122 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-04-08 17:32:44 -07:00
`,
encoding/textpb: marshal Any as regular message if unable to expand If there are any kind of errors in trying to expand the Any message, always fallback to marshaling it as regular message. This makes it consistent with V1 and C++ libs. Change-Id: I007414c1767e682623c45d4dd8c82b9998f61781 Reviewed-on: https://go-review.googlesource.com/c/156257 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-03 15:39:58 -08:00
}, {
encoding/textpb: move test protos under encoding/testprotos These test proto definitions will be reused for encoding/jsonpb package and hence move these one directory up. Also, add and simplify some tests. Change-Id: I5297546fd9b853a7fd3e72dfab2fdc7237332c9c Reviewed-on: https://go-review.googlesource.com/c/162537 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-13 14:13:21 -08:00
desc: "Any with invalid value",
types: consistently name generated protos Rename each generated protobuf package such that the base of the Go package path is always equal to the Go package name to follow proper Go package naming conventions. The Go package name is derived from the .proto source file name by replacing ".proto" with "pb" and stripping all underscores. Change-Id: Iea05d1b5d94b1b2821ae10276ab771bb2df93c0e Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177380 Reviewed-by: Damien Neil <dneil@google.com>
2019-05-16 12:47:20 -07:00
input: &anypb.Any{
encoding/textpb: unmarshal Any Also fix marshaling Any in expanded form to contain the correct type_url value. Change-Id: I4b467e74bb1d73255effd9cc4cfff9cf4558940f Reviewed-on: https://go-review.googlesource.com/c/156342 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-04 14:08:41 -08:00
TypeUrl: "foo/pb2.Nested",
encoding: cleanup some tests Change-Id: I07b8cd5e9b71fea6a162ca423186b4df7fd49355 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185458 Reviewed-by: Herbie Ong <herbie@google.com>
2019-07-09 23:11:13 -07:00
Value: []byte("\x80"),
encoding/textpb: clean up tests on Any Remove unnecessary v1 wrapping. Change most tests to operate on message Any directly. Change-Id: I19bbca6c1af72894f6a292aab8ebd09e0301a260 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168517 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-20 18:05:16 -07:00
},
encoding/textpb: unmarshal Any Also fix marshaling Any in expanded form to contain the correct type_url value. Change-Id: I4b467e74bb1d73255effd9cc4cfff9cf4558940f Reviewed-on: https://go-review.googlesource.com/c/156342 Reviewed-by: Damien Neil <dneil@google.com>
2019-01-04 14:08:41 -08:00
want: `type_url: "foo/pb2.Nested"
encoding/textpb: marshal Any as regular message if unable to expand If there are any kind of errors in trying to expand the Any message, always fallback to marshaling it as regular message. This makes it consistent with V1 and C++ libs. Change-Id: I007414c1767e682623c45d4dd8c82b9998f61781 Reviewed-on: https://go-review.googlesource.com/c/156257 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-03 15:39:58 -08:00
value: "\x80"
encoding/prototext: rewrite of internal/encoding/text * Fixes golang/protobuf#842. Unmarshal can now parse singular or repeated message fields without the field separator. * Fixes golang/protobuf#1011. Handles negative 0 properly. * For unknown fields with fixed 32-bit and 64-bit wire types, output is now in hex format with 0x prefix similar to C++ lib output. Previous Go implementation simply outputs these as decimal numbers %d. * All parsing errors, except for unexpected EOF should now contain line and column number info. * Fixed following conformance-related features: * Parse nan,inf,-inf,infinity,-infinity as case-insensitive. * Interpret float32 overflows as inf or -inf. * Parse large int-like number as proto float. * Discard unknown map field if DiscardUnknown=true. * Allow whitespaces/comments in Any type URL and extension field names per spec. * Improves performance and memory usage. It is now as fast and efficient as protojson, if not better on most benchmarks. name old time/op new time/op delta Text/Unmarshal/google_message1_proto2-4 14.1µs ±43% 8.7µs ±12% -38.27% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 11.6µs ±18% 7.7µs ± 9% -33.69% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 6.20ms ±27% 4.10ms ± 5% -33.95% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 12.8µs ± 6% 10.3µs ±23% -19.54% (p=0.000 n=9+10) Text/Marshal/google_message1_proto3-4 11.9µs ±16% 8.6µs ±10% -27.45% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.59ms ± 5% 5.30ms ±22% ~ (p=0.356 n=9+10) JSON/Unmarshal/google_message1_proto2-4 12.3µs ±61% 13.9µs ±26% ~ (p=0.190 n=10+10) JSON/Unmarshal/google_message1_proto3-4 7.51µs ± 6% 7.86µs ± 1% +4.66% (p=0.010 n=10+9) JSON/Unmarshal/google_message2-4 3.74ms ± 2% 3.94ms ± 2% +5.32% (p=0.000 n=10+10) JSON/Marshal/google_message1_proto2-4 9.90µs ±12% 9.95µs ± 4% ~ (p=0.315 n=9+10) JSON/Marshal/google_message1_proto3-4 7.55µs ± 4% 7.93µs ± 3% +4.98% (p=0.000 n=10+10) JSON/Marshal/google_message2-4 4.29ms ± 5% 4.49ms ± 2% +4.53% (p=0.001 n=10+10) name old alloc/op new alloc/op delta Text/Unmarshal/google_message1_proto2-4 12.5kB ± 0% 2.0kB ± 0% -83.87% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 12.2kB ± 0% 1.8kB ± 0% -85.33% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 5.35MB ± 0% 0.89MB ± 0% -83.28% (p=0.000 n=10+9) Text/Marshal/google_message1_proto2-4 12.0kB ± 0% 1.4kB ± 0% -88.15% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 12.4kB ± 0% 1.9kB ± 0% -84.91% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.64MB ± 0% 1.02MB ± 0% -81.85% (p=0.000 n=10+9) JSON/Unmarshal/google_message1_proto2-4 2.29kB ± 0% 2.29kB ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 2.08kB ± 0% 2.08kB ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 899kB ± 0% 899kB ± 0% ~ (p=1.000 n=10+10) JSON/Marshal/google_message1_proto2-4 1.46kB ± 0% 1.46kB ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 1.36kB ± 0% 1.36kB ± 0% ~ (all equal) JSON/Marshal/google_message2-4 1.19MB ± 0% 1.19MB ± 0% ~ (p=0.197 n=10+10) name old allocs/op new allocs/op delta Text/Unmarshal/google_message1_proto2-4 133 ± 0% 89 ± 0% -33.08% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 108 ± 0% 67 ± 0% -37.96% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 60.0k ± 0% 38.7k ± 0% -35.52% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 65.0 ± 0% 25.0 ± 0% -61.54% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 59.0 ± 0% 22.0 ± 0% -62.71% (p=0.000 n=10+10) Text/Marshal/google_message2-4 27.4k ± 0% 7.3k ± 0% -73.39% (p=0.000 n=10+10) JSON/Unmarshal/google_message1_proto2-4 95.0 ± 0% 95.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 74.0 ± 0% 74.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 36.3k ± 0% 36.3k ± 0% ~ (all equal) JSON/Marshal/google_message1_proto2-4 27.0 ± 0% 27.0 ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 30.0 ± 0% 30.0 ± 0% ~ (all equal) JSON/Marshal/google_message2-4 11.3k ± 0% 11.3k ± 0% ~ (p=1.000 n=10+10) Change-Id: I377925facde5535f06333b6f25e9c9b358dc062f Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/204602 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-10-31 17:10:15 -07:00
`,
}, {
desc: "Any expanded in another message",
input: func() *pb2.KnownTypes {
m1 := &pb2.Nested{
OptString: proto.String("message inside Any of another Any field"),
}
b1, err := proto.MarshalOptions{Deterministic: true}.Marshal(m1)
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
m2 := &anypb.Any{
TypeUrl: "pb2.Nested",
Value: b1,
}
b2, err := proto.MarshalOptions{Deterministic: true}.Marshal(m2)
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
return &pb2.KnownTypes{
OptAny: &anypb.Any{
TypeUrl: "google.protobuf.Any",
Value: b2,
},
}
}(),
want: `opt_any: {
[google.protobuf.Any]: {
[pb2.Nested]: {
opt_string: "message inside Any of another Any field"
}
}
}
`,
}, {
encoding/prototext: adjust handling of invalid UTF-8 The following changes are made: * Permit invalid UTF-8 in proto2. This goes against specified behavior, but matches functional behavior in wire marshaling (not just for Go, but also in the other major language implementations as well). * The Format function is specified as ignoring errors since its intended purpose is to surface information to the human user even if it's not exactly parsible back into a message. As such, add an unexported allowInvalidUTF8 option that is specially used by Format. * Add an EmitASCII option that forces the formatting of strings and bytes to always be encoded as ASCII. This ensures that the entire output is always ASCII as well. Note that we do not replicate this behavior for protojson since: * The JSON format fundamentally has a stricter and well-specified grammar for exactly what is valid/invalid, while the text format has not had a well-specified grammar for the longest time, leading to all sorts of weird usages due to Hyrum's law. * This is to ease migration from the legacy implementation, which did permit invalid UTF-8 in proto2. * The EmitASCII option relies on the ability to always escape Unicode characters using ASCII escape sequences, but this is not possible in JSON since the grammar only has an escape sequence defined for Unicode characters \u0000 to \uffff, inclusive. However, Unicode v12.0.0 defines characters up to \U0010FFFF, which is beyond what the JSON grammar provides escape sequences for. Change-Id: I2b524a904e9ec59f9ed5500e299613bc27c31a14 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/233077 Reviewed-by: Herbie Ong <herbie@google.com>
2020-05-07 15:10:54 -07:00
desc: "Any expanded with invalid UTF-8 in proto2",
encoding/prototext: rewrite of internal/encoding/text * Fixes golang/protobuf#842. Unmarshal can now parse singular or repeated message fields without the field separator. * Fixes golang/protobuf#1011. Handles negative 0 properly. * For unknown fields with fixed 32-bit and 64-bit wire types, output is now in hex format with 0x prefix similar to C++ lib output. Previous Go implementation simply outputs these as decimal numbers %d. * All parsing errors, except for unexpected EOF should now contain line and column number info. * Fixed following conformance-related features: * Parse nan,inf,-inf,infinity,-infinity as case-insensitive. * Interpret float32 overflows as inf or -inf. * Parse large int-like number as proto float. * Discard unknown map field if DiscardUnknown=true. * Allow whitespaces/comments in Any type URL and extension field names per spec. * Improves performance and memory usage. It is now as fast and efficient as protojson, if not better on most benchmarks. name old time/op new time/op delta Text/Unmarshal/google_message1_proto2-4 14.1µs ±43% 8.7µs ±12% -38.27% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 11.6µs ±18% 7.7µs ± 9% -33.69% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 6.20ms ±27% 4.10ms ± 5% -33.95% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 12.8µs ± 6% 10.3µs ±23% -19.54% (p=0.000 n=9+10) Text/Marshal/google_message1_proto3-4 11.9µs ±16% 8.6µs ±10% -27.45% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.59ms ± 5% 5.30ms ±22% ~ (p=0.356 n=9+10) JSON/Unmarshal/google_message1_proto2-4 12.3µs ±61% 13.9µs ±26% ~ (p=0.190 n=10+10) JSON/Unmarshal/google_message1_proto3-4 7.51µs ± 6% 7.86µs ± 1% +4.66% (p=0.010 n=10+9) JSON/Unmarshal/google_message2-4 3.74ms ± 2% 3.94ms ± 2% +5.32% (p=0.000 n=10+10) JSON/Marshal/google_message1_proto2-4 9.90µs ±12% 9.95µs ± 4% ~ (p=0.315 n=9+10) JSON/Marshal/google_message1_proto3-4 7.55µs ± 4% 7.93µs ± 3% +4.98% (p=0.000 n=10+10) JSON/Marshal/google_message2-4 4.29ms ± 5% 4.49ms ± 2% +4.53% (p=0.001 n=10+10) name old alloc/op new alloc/op delta Text/Unmarshal/google_message1_proto2-4 12.5kB ± 0% 2.0kB ± 0% -83.87% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 12.2kB ± 0% 1.8kB ± 0% -85.33% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 5.35MB ± 0% 0.89MB ± 0% -83.28% (p=0.000 n=10+9) Text/Marshal/google_message1_proto2-4 12.0kB ± 0% 1.4kB ± 0% -88.15% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 12.4kB ± 0% 1.9kB ± 0% -84.91% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.64MB ± 0% 1.02MB ± 0% -81.85% (p=0.000 n=10+9) JSON/Unmarshal/google_message1_proto2-4 2.29kB ± 0% 2.29kB ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 2.08kB ± 0% 2.08kB ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 899kB ± 0% 899kB ± 0% ~ (p=1.000 n=10+10) JSON/Marshal/google_message1_proto2-4 1.46kB ± 0% 1.46kB ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 1.36kB ± 0% 1.36kB ± 0% ~ (all equal) JSON/Marshal/google_message2-4 1.19MB ± 0% 1.19MB ± 0% ~ (p=0.197 n=10+10) name old allocs/op new allocs/op delta Text/Unmarshal/google_message1_proto2-4 133 ± 0% 89 ± 0% -33.08% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 108 ± 0% 67 ± 0% -37.96% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 60.0k ± 0% 38.7k ± 0% -35.52% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 65.0 ± 0% 25.0 ± 0% -61.54% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 59.0 ± 0% 22.0 ± 0% -62.71% (p=0.000 n=10+10) Text/Marshal/google_message2-4 27.4k ± 0% 7.3k ± 0% -73.39% (p=0.000 n=10+10) JSON/Unmarshal/google_message1_proto2-4 95.0 ± 0% 95.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 74.0 ± 0% 74.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 36.3k ± 0% 36.3k ± 0% ~ (all equal) JSON/Marshal/google_message1_proto2-4 27.0 ± 0% 27.0 ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 30.0 ± 0% 30.0 ± 0% ~ (all equal) JSON/Marshal/google_message2-4 11.3k ± 0% 11.3k ± 0% ~ (p=1.000 n=10+10) Change-Id: I377925facde5535f06333b6f25e9c9b358dc062f Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/204602 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-10-31 17:10:15 -07:00
input: func() *pb2.KnownTypes {
m := &pb2.Nested{
OptString: proto.String("invalid UTF-8 abc\xff"),
}
b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
return &pb2.KnownTypes{
OptAny: &anypb.Any{
TypeUrl: "pb2.Nested",
Value: b,
},
}
}(),
want: `opt_any: {
encoding/prototext: adjust handling of invalid UTF-8 The following changes are made: * Permit invalid UTF-8 in proto2. This goes against specified behavior, but matches functional behavior in wire marshaling (not just for Go, but also in the other major language implementations as well). * The Format function is specified as ignoring errors since its intended purpose is to surface information to the human user even if it's not exactly parsible back into a message. As such, add an unexported allowInvalidUTF8 option that is specially used by Format. * Add an EmitASCII option that forces the formatting of strings and bytes to always be encoded as ASCII. This ensures that the entire output is always ASCII as well. Note that we do not replicate this behavior for protojson since: * The JSON format fundamentally has a stricter and well-specified grammar for exactly what is valid/invalid, while the text format has not had a well-specified grammar for the longest time, leading to all sorts of weird usages due to Hyrum's law. * This is to ease migration from the legacy implementation, which did permit invalid UTF-8 in proto2. * The EmitASCII option relies on the ability to always escape Unicode characters using ASCII escape sequences, but this is not possible in JSON since the grammar only has an escape sequence defined for Unicode characters \u0000 to \uffff, inclusive. However, Unicode v12.0.0 defines characters up to \U0010FFFF, which is beyond what the JSON grammar provides escape sequences for. Change-Id: I2b524a904e9ec59f9ed5500e299613bc27c31a14 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/233077 Reviewed-by: Herbie Ong <herbie@google.com>
2020-05-07 15:10:54 -07:00
[pb2.Nested]: {
opt_string: "invalid UTF-8 abc\xff"
}
encoding/prototext: rewrite of internal/encoding/text * Fixes golang/protobuf#842. Unmarshal can now parse singular or repeated message fields without the field separator. * Fixes golang/protobuf#1011. Handles negative 0 properly. * For unknown fields with fixed 32-bit and 64-bit wire types, output is now in hex format with 0x prefix similar to C++ lib output. Previous Go implementation simply outputs these as decimal numbers %d. * All parsing errors, except for unexpected EOF should now contain line and column number info. * Fixed following conformance-related features: * Parse nan,inf,-inf,infinity,-infinity as case-insensitive. * Interpret float32 overflows as inf or -inf. * Parse large int-like number as proto float. * Discard unknown map field if DiscardUnknown=true. * Allow whitespaces/comments in Any type URL and extension field names per spec. * Improves performance and memory usage. It is now as fast and efficient as protojson, if not better on most benchmarks. name old time/op new time/op delta Text/Unmarshal/google_message1_proto2-4 14.1µs ±43% 8.7µs ±12% -38.27% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 11.6µs ±18% 7.7µs ± 9% -33.69% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 6.20ms ±27% 4.10ms ± 5% -33.95% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 12.8µs ± 6% 10.3µs ±23% -19.54% (p=0.000 n=9+10) Text/Marshal/google_message1_proto3-4 11.9µs ±16% 8.6µs ±10% -27.45% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.59ms ± 5% 5.30ms ±22% ~ (p=0.356 n=9+10) JSON/Unmarshal/google_message1_proto2-4 12.3µs ±61% 13.9µs ±26% ~ (p=0.190 n=10+10) JSON/Unmarshal/google_message1_proto3-4 7.51µs ± 6% 7.86µs ± 1% +4.66% (p=0.010 n=10+9) JSON/Unmarshal/google_message2-4 3.74ms ± 2% 3.94ms ± 2% +5.32% (p=0.000 n=10+10) JSON/Marshal/google_message1_proto2-4 9.90µs ±12% 9.95µs ± 4% ~ (p=0.315 n=9+10) JSON/Marshal/google_message1_proto3-4 7.55µs ± 4% 7.93µs ± 3% +4.98% (p=0.000 n=10+10) JSON/Marshal/google_message2-4 4.29ms ± 5% 4.49ms ± 2% +4.53% (p=0.001 n=10+10) name old alloc/op new alloc/op delta Text/Unmarshal/google_message1_proto2-4 12.5kB ± 0% 2.0kB ± 0% -83.87% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 12.2kB ± 0% 1.8kB ± 0% -85.33% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 5.35MB ± 0% 0.89MB ± 0% -83.28% (p=0.000 n=10+9) Text/Marshal/google_message1_proto2-4 12.0kB ± 0% 1.4kB ± 0% -88.15% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 12.4kB ± 0% 1.9kB ± 0% -84.91% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.64MB ± 0% 1.02MB ± 0% -81.85% (p=0.000 n=10+9) JSON/Unmarshal/google_message1_proto2-4 2.29kB ± 0% 2.29kB ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 2.08kB ± 0% 2.08kB ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 899kB ± 0% 899kB ± 0% ~ (p=1.000 n=10+10) JSON/Marshal/google_message1_proto2-4 1.46kB ± 0% 1.46kB ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 1.36kB ± 0% 1.36kB ± 0% ~ (all equal) JSON/Marshal/google_message2-4 1.19MB ± 0% 1.19MB ± 0% ~ (p=0.197 n=10+10) name old allocs/op new allocs/op delta Text/Unmarshal/google_message1_proto2-4 133 ± 0% 89 ± 0% -33.08% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 108 ± 0% 67 ± 0% -37.96% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 60.0k ± 0% 38.7k ± 0% -35.52% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 65.0 ± 0% 25.0 ± 0% -61.54% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 59.0 ± 0% 22.0 ± 0% -62.71% (p=0.000 n=10+10) Text/Marshal/google_message2-4 27.4k ± 0% 7.3k ± 0% -73.39% (p=0.000 n=10+10) JSON/Unmarshal/google_message1_proto2-4 95.0 ± 0% 95.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 74.0 ± 0% 74.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 36.3k ± 0% 36.3k ± 0% ~ (all equal) JSON/Marshal/google_message1_proto2-4 27.0 ± 0% 27.0 ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 30.0 ± 0% 30.0 ± 0% ~ (all equal) JSON/Marshal/google_message2-4 11.3k ± 0% 11.3k ± 0% ~ (p=1.000 n=10+10) Change-Id: I377925facde5535f06333b6f25e9c9b358dc062f Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/204602 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-10-31 17:10:15 -07:00
}
`,
}, {
encoding/prototext: adjust handling of invalid UTF-8 The following changes are made: * Permit invalid UTF-8 in proto2. This goes against specified behavior, but matches functional behavior in wire marshaling (not just for Go, but also in the other major language implementations as well). * The Format function is specified as ignoring errors since its intended purpose is to surface information to the human user even if it's not exactly parsible back into a message. As such, add an unexported allowInvalidUTF8 option that is specially used by Format. * Add an EmitASCII option that forces the formatting of strings and bytes to always be encoded as ASCII. This ensures that the entire output is always ASCII as well. Note that we do not replicate this behavior for protojson since: * The JSON format fundamentally has a stricter and well-specified grammar for exactly what is valid/invalid, while the text format has not had a well-specified grammar for the longest time, leading to all sorts of weird usages due to Hyrum's law. * This is to ease migration from the legacy implementation, which did permit invalid UTF-8 in proto2. * The EmitASCII option relies on the ability to always escape Unicode characters using ASCII escape sequences, but this is not possible in JSON since the grammar only has an escape sequence defined for Unicode characters \u0000 to \uffff, inclusive. However, Unicode v12.0.0 defines characters up to \U0010FFFF, which is beyond what the JSON grammar provides escape sequences for. Change-Id: I2b524a904e9ec59f9ed5500e299613bc27c31a14 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/233077 Reviewed-by: Herbie Ong <herbie@google.com>
2020-05-07 15:10:54 -07:00
desc: "Any not expanded due to invalid data",
mo: prototext.MarshalOptions{EmitASCII: true},
input: func() *pb2.KnownTypes {
return &pb2.KnownTypes{
OptAny: &anypb.Any{
TypeUrl: "pb3.Scalar",
Value: []byte("\xde\xad\xbe\xef"),
},
}
}(),
want: `opt_any: {
type_url: "pb3.Scalar"
value: "\u07ad\xbe\xef"
}
`,
}, {
desc: "Any inside Any expanded",
encoding/prototext: rewrite of internal/encoding/text * Fixes golang/protobuf#842. Unmarshal can now parse singular or repeated message fields without the field separator. * Fixes golang/protobuf#1011. Handles negative 0 properly. * For unknown fields with fixed 32-bit and 64-bit wire types, output is now in hex format with 0x prefix similar to C++ lib output. Previous Go implementation simply outputs these as decimal numbers %d. * All parsing errors, except for unexpected EOF should now contain line and column number info. * Fixed following conformance-related features: * Parse nan,inf,-inf,infinity,-infinity as case-insensitive. * Interpret float32 overflows as inf or -inf. * Parse large int-like number as proto float. * Discard unknown map field if DiscardUnknown=true. * Allow whitespaces/comments in Any type URL and extension field names per spec. * Improves performance and memory usage. It is now as fast and efficient as protojson, if not better on most benchmarks. name old time/op new time/op delta Text/Unmarshal/google_message1_proto2-4 14.1µs ±43% 8.7µs ±12% -38.27% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 11.6µs ±18% 7.7µs ± 9% -33.69% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 6.20ms ±27% 4.10ms ± 5% -33.95% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 12.8µs ± 6% 10.3µs ±23% -19.54% (p=0.000 n=9+10) Text/Marshal/google_message1_proto3-4 11.9µs ±16% 8.6µs ±10% -27.45% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.59ms ± 5% 5.30ms ±22% ~ (p=0.356 n=9+10) JSON/Unmarshal/google_message1_proto2-4 12.3µs ±61% 13.9µs ±26% ~ (p=0.190 n=10+10) JSON/Unmarshal/google_message1_proto3-4 7.51µs ± 6% 7.86µs ± 1% +4.66% (p=0.010 n=10+9) JSON/Unmarshal/google_message2-4 3.74ms ± 2% 3.94ms ± 2% +5.32% (p=0.000 n=10+10) JSON/Marshal/google_message1_proto2-4 9.90µs ±12% 9.95µs ± 4% ~ (p=0.315 n=9+10) JSON/Marshal/google_message1_proto3-4 7.55µs ± 4% 7.93µs ± 3% +4.98% (p=0.000 n=10+10) JSON/Marshal/google_message2-4 4.29ms ± 5% 4.49ms ± 2% +4.53% (p=0.001 n=10+10) name old alloc/op new alloc/op delta Text/Unmarshal/google_message1_proto2-4 12.5kB ± 0% 2.0kB ± 0% -83.87% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 12.2kB ± 0% 1.8kB ± 0% -85.33% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 5.35MB ± 0% 0.89MB ± 0% -83.28% (p=0.000 n=10+9) Text/Marshal/google_message1_proto2-4 12.0kB ± 0% 1.4kB ± 0% -88.15% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 12.4kB ± 0% 1.9kB ± 0% -84.91% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.64MB ± 0% 1.02MB ± 0% -81.85% (p=0.000 n=10+9) JSON/Unmarshal/google_message1_proto2-4 2.29kB ± 0% 2.29kB ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 2.08kB ± 0% 2.08kB ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 899kB ± 0% 899kB ± 0% ~ (p=1.000 n=10+10) JSON/Marshal/google_message1_proto2-4 1.46kB ± 0% 1.46kB ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 1.36kB ± 0% 1.36kB ± 0% ~ (all equal) JSON/Marshal/google_message2-4 1.19MB ± 0% 1.19MB ± 0% ~ (p=0.197 n=10+10) name old allocs/op new allocs/op delta Text/Unmarshal/google_message1_proto2-4 133 ± 0% 89 ± 0% -33.08% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 108 ± 0% 67 ± 0% -37.96% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 60.0k ± 0% 38.7k ± 0% -35.52% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 65.0 ± 0% 25.0 ± 0% -61.54% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 59.0 ± 0% 22.0 ± 0% -62.71% (p=0.000 n=10+10) Text/Marshal/google_message2-4 27.4k ± 0% 7.3k ± 0% -73.39% (p=0.000 n=10+10) JSON/Unmarshal/google_message1_proto2-4 95.0 ± 0% 95.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 74.0 ± 0% 74.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 36.3k ± 0% 36.3k ± 0% ~ (all equal) JSON/Marshal/google_message1_proto2-4 27.0 ± 0% 27.0 ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 30.0 ± 0% 30.0 ± 0% ~ (all equal) JSON/Marshal/google_message2-4 11.3k ± 0% 11.3k ± 0% ~ (p=1.000 n=10+10) Change-Id: I377925facde5535f06333b6f25e9c9b358dc062f Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/204602 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-10-31 17:10:15 -07:00
input: func() *pb2.KnownTypes {
m1 := &pb2.Nested{
OptString: proto.String("invalid UTF-8 abc\xff"),
}
b1, err := proto.MarshalOptions{Deterministic: true}.Marshal(m1)
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
m2 := &anypb.Any{
TypeUrl: "pb2.Nested",
Value: b1,
}
b2, err := proto.MarshalOptions{Deterministic: true}.Marshal(m2)
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
return &pb2.KnownTypes{
OptAny: &anypb.Any{
TypeUrl: "google.protobuf.Any",
Value: b2,
},
}
}(),
want: `opt_any: {
encoding/prototext: adjust handling of invalid UTF-8 The following changes are made: * Permit invalid UTF-8 in proto2. This goes against specified behavior, but matches functional behavior in wire marshaling (not just for Go, but also in the other major language implementations as well). * The Format function is specified as ignoring errors since its intended purpose is to surface information to the human user even if it's not exactly parsible back into a message. As such, add an unexported allowInvalidUTF8 option that is specially used by Format. * Add an EmitASCII option that forces the formatting of strings and bytes to always be encoded as ASCII. This ensures that the entire output is always ASCII as well. Note that we do not replicate this behavior for protojson since: * The JSON format fundamentally has a stricter and well-specified grammar for exactly what is valid/invalid, while the text format has not had a well-specified grammar for the longest time, leading to all sorts of weird usages due to Hyrum's law. * This is to ease migration from the legacy implementation, which did permit invalid UTF-8 in proto2. * The EmitASCII option relies on the ability to always escape Unicode characters using ASCII escape sequences, but this is not possible in JSON since the grammar only has an escape sequence defined for Unicode characters \u0000 to \uffff, inclusive. However, Unicode v12.0.0 defines characters up to \U0010FFFF, which is beyond what the JSON grammar provides escape sequences for. Change-Id: I2b524a904e9ec59f9ed5500e299613bc27c31a14 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/233077 Reviewed-by: Herbie Ong <herbie@google.com>
2020-05-07 15:10:54 -07:00
[google.protobuf.Any]: {
[pb2.Nested]: {
opt_string: "invalid UTF-8 abc\xff"
}
}
}
`,
}, {
desc: "Any inside Any not expanded due to invalid data",
mo: prototext.MarshalOptions{EmitASCII: true},
input: func() *pb2.KnownTypes {
m := &anypb.Any{
TypeUrl: "pb2.Nested",
Value: []byte("\xde\xad\xbe\xef"),
}
b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
if err != nil {
t.Fatalf("error in binary marshaling message for Any.value: %v", err)
}
return &pb2.KnownTypes{
OptAny: &anypb.Any{
TypeUrl: "google.protobuf.Any",
Value: b,
},
}
}(),
want: `opt_any: {
encoding/prototext: rewrite of internal/encoding/text * Fixes golang/protobuf#842. Unmarshal can now parse singular or repeated message fields without the field separator. * Fixes golang/protobuf#1011. Handles negative 0 properly. * For unknown fields with fixed 32-bit and 64-bit wire types, output is now in hex format with 0x prefix similar to C++ lib output. Previous Go implementation simply outputs these as decimal numbers %d. * All parsing errors, except for unexpected EOF should now contain line and column number info. * Fixed following conformance-related features: * Parse nan,inf,-inf,infinity,-infinity as case-insensitive. * Interpret float32 overflows as inf or -inf. * Parse large int-like number as proto float. * Discard unknown map field if DiscardUnknown=true. * Allow whitespaces/comments in Any type URL and extension field names per spec. * Improves performance and memory usage. It is now as fast and efficient as protojson, if not better on most benchmarks. name old time/op new time/op delta Text/Unmarshal/google_message1_proto2-4 14.1µs ±43% 8.7µs ±12% -38.27% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 11.6µs ±18% 7.7µs ± 9% -33.69% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 6.20ms ±27% 4.10ms ± 5% -33.95% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 12.8µs ± 6% 10.3µs ±23% -19.54% (p=0.000 n=9+10) Text/Marshal/google_message1_proto3-4 11.9µs ±16% 8.6µs ±10% -27.45% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.59ms ± 5% 5.30ms ±22% ~ (p=0.356 n=9+10) JSON/Unmarshal/google_message1_proto2-4 12.3µs ±61% 13.9µs ±26% ~ (p=0.190 n=10+10) JSON/Unmarshal/google_message1_proto3-4 7.51µs ± 6% 7.86µs ± 1% +4.66% (p=0.010 n=10+9) JSON/Unmarshal/google_message2-4 3.74ms ± 2% 3.94ms ± 2% +5.32% (p=0.000 n=10+10) JSON/Marshal/google_message1_proto2-4 9.90µs ±12% 9.95µs ± 4% ~ (p=0.315 n=9+10) JSON/Marshal/google_message1_proto3-4 7.55µs ± 4% 7.93µs ± 3% +4.98% (p=0.000 n=10+10) JSON/Marshal/google_message2-4 4.29ms ± 5% 4.49ms ± 2% +4.53% (p=0.001 n=10+10) name old alloc/op new alloc/op delta Text/Unmarshal/google_message1_proto2-4 12.5kB ± 0% 2.0kB ± 0% -83.87% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 12.2kB ± 0% 1.8kB ± 0% -85.33% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 5.35MB ± 0% 0.89MB ± 0% -83.28% (p=0.000 n=10+9) Text/Marshal/google_message1_proto2-4 12.0kB ± 0% 1.4kB ± 0% -88.15% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 12.4kB ± 0% 1.9kB ± 0% -84.91% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.64MB ± 0% 1.02MB ± 0% -81.85% (p=0.000 n=10+9) JSON/Unmarshal/google_message1_proto2-4 2.29kB ± 0% 2.29kB ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 2.08kB ± 0% 2.08kB ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 899kB ± 0% 899kB ± 0% ~ (p=1.000 n=10+10) JSON/Marshal/google_message1_proto2-4 1.46kB ± 0% 1.46kB ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 1.36kB ± 0% 1.36kB ± 0% ~ (all equal) JSON/Marshal/google_message2-4 1.19MB ± 0% 1.19MB ± 0% ~ (p=0.197 n=10+10) name old allocs/op new allocs/op delta Text/Unmarshal/google_message1_proto2-4 133 ± 0% 89 ± 0% -33.08% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 108 ± 0% 67 ± 0% -37.96% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 60.0k ± 0% 38.7k ± 0% -35.52% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 65.0 ± 0% 25.0 ± 0% -61.54% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 59.0 ± 0% 22.0 ± 0% -62.71% (p=0.000 n=10+10) Text/Marshal/google_message2-4 27.4k ± 0% 7.3k ± 0% -73.39% (p=0.000 n=10+10) JSON/Unmarshal/google_message1_proto2-4 95.0 ± 0% 95.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 74.0 ± 0% 74.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 36.3k ± 0% 36.3k ± 0% ~ (all equal) JSON/Marshal/google_message1_proto2-4 27.0 ± 0% 27.0 ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 30.0 ± 0% 30.0 ± 0% ~ (all equal) JSON/Marshal/google_message2-4 11.3k ± 0% 11.3k ± 0% ~ (p=1.000 n=10+10) Change-Id: I377925facde5535f06333b6f25e9c9b358dc062f Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/204602 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-10-31 17:10:15 -07:00
[google.protobuf.Any]: {
type_url: "pb2.Nested"
encoding/prototext: adjust handling of invalid UTF-8 The following changes are made: * Permit invalid UTF-8 in proto2. This goes against specified behavior, but matches functional behavior in wire marshaling (not just for Go, but also in the other major language implementations as well). * The Format function is specified as ignoring errors since its intended purpose is to surface information to the human user even if it's not exactly parsible back into a message. As such, add an unexported allowInvalidUTF8 option that is specially used by Format. * Add an EmitASCII option that forces the formatting of strings and bytes to always be encoded as ASCII. This ensures that the entire output is always ASCII as well. Note that we do not replicate this behavior for protojson since: * The JSON format fundamentally has a stricter and well-specified grammar for exactly what is valid/invalid, while the text format has not had a well-specified grammar for the longest time, leading to all sorts of weird usages due to Hyrum's law. * This is to ease migration from the legacy implementation, which did permit invalid UTF-8 in proto2. * The EmitASCII option relies on the ability to always escape Unicode characters using ASCII escape sequences, but this is not possible in JSON since the grammar only has an escape sequence defined for Unicode characters \u0000 to \uffff, inclusive. However, Unicode v12.0.0 defines characters up to \U0010FFFF, which is beyond what the JSON grammar provides escape sequences for. Change-Id: I2b524a904e9ec59f9ed5500e299613bc27c31a14 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/233077 Reviewed-by: Herbie Ong <herbie@google.com>
2020-05-07 15:10:54 -07:00
value: "\u07ad\xbe\xef"
encoding/prototext: rewrite of internal/encoding/text * Fixes golang/protobuf#842. Unmarshal can now parse singular or repeated message fields without the field separator. * Fixes golang/protobuf#1011. Handles negative 0 properly. * For unknown fields with fixed 32-bit and 64-bit wire types, output is now in hex format with 0x prefix similar to C++ lib output. Previous Go implementation simply outputs these as decimal numbers %d. * All parsing errors, except for unexpected EOF should now contain line and column number info. * Fixed following conformance-related features: * Parse nan,inf,-inf,infinity,-infinity as case-insensitive. * Interpret float32 overflows as inf or -inf. * Parse large int-like number as proto float. * Discard unknown map field if DiscardUnknown=true. * Allow whitespaces/comments in Any type URL and extension field names per spec. * Improves performance and memory usage. It is now as fast and efficient as protojson, if not better on most benchmarks. name old time/op new time/op delta Text/Unmarshal/google_message1_proto2-4 14.1µs ±43% 8.7µs ±12% -38.27% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 11.6µs ±18% 7.7µs ± 9% -33.69% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 6.20ms ±27% 4.10ms ± 5% -33.95% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 12.8µs ± 6% 10.3µs ±23% -19.54% (p=0.000 n=9+10) Text/Marshal/google_message1_proto3-4 11.9µs ±16% 8.6µs ±10% -27.45% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.59ms ± 5% 5.30ms ±22% ~ (p=0.356 n=9+10) JSON/Unmarshal/google_message1_proto2-4 12.3µs ±61% 13.9µs ±26% ~ (p=0.190 n=10+10) JSON/Unmarshal/google_message1_proto3-4 7.51µs ± 6% 7.86µs ± 1% +4.66% (p=0.010 n=10+9) JSON/Unmarshal/google_message2-4 3.74ms ± 2% 3.94ms ± 2% +5.32% (p=0.000 n=10+10) JSON/Marshal/google_message1_proto2-4 9.90µs ±12% 9.95µs ± 4% ~ (p=0.315 n=9+10) JSON/Marshal/google_message1_proto3-4 7.55µs ± 4% 7.93µs ± 3% +4.98% (p=0.000 n=10+10) JSON/Marshal/google_message2-4 4.29ms ± 5% 4.49ms ± 2% +4.53% (p=0.001 n=10+10) name old alloc/op new alloc/op delta Text/Unmarshal/google_message1_proto2-4 12.5kB ± 0% 2.0kB ± 0% -83.87% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 12.2kB ± 0% 1.8kB ± 0% -85.33% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 5.35MB ± 0% 0.89MB ± 0% -83.28% (p=0.000 n=10+9) Text/Marshal/google_message1_proto2-4 12.0kB ± 0% 1.4kB ± 0% -88.15% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 12.4kB ± 0% 1.9kB ± 0% -84.91% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.64MB ± 0% 1.02MB ± 0% -81.85% (p=0.000 n=10+9) JSON/Unmarshal/google_message1_proto2-4 2.29kB ± 0% 2.29kB ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 2.08kB ± 0% 2.08kB ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 899kB ± 0% 899kB ± 0% ~ (p=1.000 n=10+10) JSON/Marshal/google_message1_proto2-4 1.46kB ± 0% 1.46kB ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 1.36kB ± 0% 1.36kB ± 0% ~ (all equal) JSON/Marshal/google_message2-4 1.19MB ± 0% 1.19MB ± 0% ~ (p=0.197 n=10+10) name old allocs/op new allocs/op delta Text/Unmarshal/google_message1_proto2-4 133 ± 0% 89 ± 0% -33.08% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 108 ± 0% 67 ± 0% -37.96% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 60.0k ± 0% 38.7k ± 0% -35.52% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 65.0 ± 0% 25.0 ± 0% -61.54% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 59.0 ± 0% 22.0 ± 0% -62.71% (p=0.000 n=10+10) Text/Marshal/google_message2-4 27.4k ± 0% 7.3k ± 0% -73.39% (p=0.000 n=10+10) JSON/Unmarshal/google_message1_proto2-4 95.0 ± 0% 95.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 74.0 ± 0% 74.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 36.3k ± 0% 36.3k ± 0% ~ (all equal) JSON/Marshal/google_message1_proto2-4 27.0 ± 0% 27.0 ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 30.0 ± 0% 30.0 ± 0% ~ (all equal) JSON/Marshal/google_message2-4 11.3k ± 0% 11.3k ± 0% ~ (p=1.000 n=10+10) Change-Id: I377925facde5535f06333b6f25e9c9b358dc062f Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/204602 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-10-31 17:10:15 -07:00
}
}
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
`,
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}}
for _, tt := range tests {
tt := tt
encoding: unify MessageSet extension handling logic This CL unifies common MessageSet logic in prototext and protojson into the messageset package. While we are at it, also enable MessageSet support only if the proto1_legacy build flag is enabled. Change-Id: I1a7d475e8bb1dad61ecd286df45e4239e5bef072 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185898 Reviewed-by: Damien Neil <dneil@google.com>
2019-07-11 18:23:08 -07:00
if tt.skip {
continue
}
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
t.Run(tt.desc, func(t *testing.T) {
encoding/jsonpb: change MarshalOptions.Compact option to Indent This makes it consistent with jsonpb.MarshalOptions. This does change the default to be in compact form. Change-Id: I1b07f06f282c019b30f3f1cbb43f6c8cba18f385 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168405 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-03-20 14:04:24 -07:00
// Use 2-space indentation on all MarshalOptions.
tt.mo.Indent = " "
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
b, err := tt.mo.Marshal(tt.input)
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
if err != nil && !tt.wantErr {
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
t.Errorf("Marshal() returned error: %v\n", err)
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
if err == nil && tt.wantErr {
encoding/textpb: marshal google.protobuf.Any in expanded form Marshal well-known type Any in expanded form by default, else fallback to marshaling it as a regular message. Change-Id: Ic7e9e37b47042a163941f8849dc366ffe48103ca Reviewed-on: https://go-review.googlesource.com/c/156097 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2019-01-02 15:46:07 -08:00
t.Error("Marshal() got nil error, want error\n")
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
}
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
got := string(b)
encoding/prototext: add proto editions and fuzz tests Change-Id: I2afc5ae83bf68600def3568e1d3ad51ef00e7671 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/566395 Auto-Submit: Lasse Folger <lassefolger@google.com> Reviewed-by: Michael Stapelberg <stapelberg@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
2024-02-23 13:03:15 +01:00
if got != tt.want {
encoding/textpb: initial textproto unmarshaling This initial textproto unmarshaling implementation covers messages without the use of extensions, Any expansion, nor weak. Updated encoding tests. Split some testcases to keep each simpler. Added TestRoundTrip for example messages like the well-known types. Change-Id: Icffab02834aa004fa8409a9da70624f687f604fb Reviewed-on: https://go-review.googlesource.com/c/153020 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-12-06 15:28:53 -08:00
t.Errorf("Marshal()\n<got>\n%v\n<want>\n%v\n", got, tt.want)
reflect/protoreflect: add alternative message reflection API Added API: Message.Len Message.Range Message.Has Message.Clear Message.Get Message.Set Message.Mutable Message.NewMessage Message.WhichOneof Message.GetUnknown Message.SetUnknown Deprecated API (to be removed in subsequent CL): Message.KnownFields Message.UnknownFields The primary difference with the new API is that the top-level Message methods are keyed by FieldDescriptor rather than FieldNumber with the following semantics: * For known fields, the FieldDescriptor must exactly match the field descriptor known by the message. * For extension fields, the FieldDescriptor must implement ExtensionType, where ContainingMessage.FullName matches the message name, and the field number is within the message's extension range. When setting an extension field, it automatically stores the extension type information. * Extension fields are always considered nullable, implying that repeated extension fields are nullable. That is, you can distinguish between a unpopulated list and an empty list. * Message.Get always returns a valid Value even if unpopulated. The behavior is already well-defined for scalars, but for unpopulated composite types, it now returns an empty read-only version of it. Change-Id: Ia120630b4db221aeaaf743d0f64160e1a61a0f61 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/175458 Reviewed-by: Damien Neil <dneil@google.com>
2019-04-25 23:48:08 -07:00
if diff := cmp.Diff(tt.want, got); diff != "" {
encoding/textpb: initial implementation of textproto marshaling This initial implementation covers marshaling Message without use of extensions, Any expansion, weak yet. Change-Id: Ic787939c1d2a4e70e40c3a1654c6e7073052b7d3 Reviewed-on: https://go-review.googlesource.com/c/151677 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
2018-11-28 18:25:20 -08:00
t.Errorf("Marshal() diff -want +got\n%v\n", diff)
}
}
})
}
}
encoding: add MarshalAppend to protojson and prototext Adds MarshalAppend methods to allow for byte slices to be reused. Copies signature from the binary encoding. Small changes to internal json and text libraries to use strconv AppendInt and AppendUint for number encoding. Change-Id: Ife7c8979c1c153a0a0bf9b70b296b8158d38dffc Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/489615 Reviewed-by: Edward McFarlane <emcfarlane000@gmail.com> Reviewed-by: Joseph Tsai <joetsai@digital-static.net> Reviewed-by: Lasse Folger <lassefolger@google.com> Reviewed-by: Damien Neil <dneil@google.com>
2023-04-27 11:07:10 +01:00
func TestEncodeAppend(t *testing.T) {
want := []byte("prefix")
got := append([]byte(nil), want...)
got, err := prototext.MarshalOptions{}.MarshalAppend(got, &pb3.Scalars{
SString: "value",
})
if err != nil {
t.Fatal(err)
}
if !bytes.HasPrefix(got, want) {
t.Fatalf("MarshalAppend modified prefix: got %v, want prefix %v", got, want)
}
}
func TestMarshalAppendAllocations(t *testing.T) {
m := &pb3.Scalars{SInt32: 1}
const count = 1000
size := 9
b := make([]byte, size)
// AllocsPerRun returns an integral value.
marshalAllocs := testing.AllocsPerRun(count, func() {
_, err := prototext.MarshalOptions{}.MarshalAppend(b[:0], m)
if err != nil {
t.Fatal(err)
}
})
b = nil
marshalAppendAllocs := testing.AllocsPerRun(count, func() {
var err error
b, err = prototext.MarshalOptions{}.MarshalAppend(b, m)
if err != nil {
t.Fatal(err)
}
})
if marshalAllocs != marshalAppendAllocs {
t.Errorf("%v allocs/op when writing to a preallocated buffer", marshalAllocs)
t.Errorf("%v allocs/op when repeatedly appending to a slice", marshalAppendAllocs)
t.Errorf("expect amortized allocs/op to be identical")
}
}
Reference in New Issue Copy Permalink