mirror/protobuf-go
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf-go.git synced 2025-01-30 12:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
protobuf-go/encoding/textpb/encode_test.go

1181 lines
28 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.
package textpb_test
import (
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/hex"
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"
"strings"
"testing"
"github.com/golang/protobuf/v2/encoding/textpb"
"github.com/golang/protobuf/v2/internal/detrand"
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
"github.com/golang/protobuf/v2/internal/encoding/pack"
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
"github.com/golang/protobuf/v2/internal/encoding/wire"
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
"github.com/golang/protobuf/v2/internal/scalar"
"github.com/golang/protobuf/v2/proto"
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
preg "github.com/golang/protobuf/v2/reflect/protoregistry"
all: move v1 types over to the v2 repository As a goal, v2 should not depend on v1. As another step towards that end, we move all the types that used to be in the v1 protoapi package over to v2. For now, we place MessageV1, ExtensionRangeV1, and ExtensionDescV1 in runtime/protoiface since these are types that generated messages will probably have to reference forever. An alternative location could be reflect/protoreflect, but it seems unfortunate to have to dirty the namespace of that package with these types. We move ExtensionFieldV1, ExtensionFieldsV1, and ExtensionFieldsOf to internal/impl, since these are related to the implementation of a generated message. Since moving these types from v1 to v2 implies that the v1 protoapi package is useless, we update all usages of v1 protoapi in the v2 repository to point to the relevant v2 type or functionality. CL/168538 is the corresponding change to alter v1. There will be a temporary build failure as it is not possible to submit CL/168519 and CL/168538 atomically. Change-Id: Ide4025c1b6af5b7f0696f4b65b988b4d10a50f0b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168519 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-20 18:29:32 -07:00
"github.com/golang/protobuf/v2/runtime/protoiface"
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
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
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
"github.com/golang/protobuf/v2/encoding/testprotos/pb2"
"github.com/golang/protobuf/v2/encoding/testprotos/pb3"
internal/cmd/generate-protos: initial commit Create a single binary for handling generation of protos. This replaces previous logic spread throughout the repo in: * regenerate.bash * cmd/protoc-gen-go/golden_test.go * cmd/protoc-gen-go-grpc/golden_test.go * (indirectly) internal/protogen/goldentest One of the problems with the former approaches is that they relied on a version of protoc that was specific to a developer's workstation. This meant that the result of generation was not hermetic. To address this, we rely on the hard-coded version of protobuf specified in the test.bash script. A summary of changes in this CL are: * The internal_gengo.GenerateFile and internal_gengogrpc.GenerateFile functions are unified to have consistent signatures. It seems that the former accepted a *protogen.GeneratedFile to support v1 where gRPC code was generated into the same file as the base .pb.go file. However, the same functionality can be achieved by having the function return the generated file object. * The test.bash script patches the protobuf toolchain to have properly specified go_package options in each proto source file. * The test.bash script accepts a "-regenerate" argument. * Add generation for the well-known types. Contrary to how these were laid out in the v1 repo, all the well-known types are placed in the same Go package. * Add generation for the conformance proto. * Remove regenerate.bash * Remove internal/protogen * Remove cmd/protoc-gen-go/golden_test.go * Remove cmd/protoc-gen-go-grpc/golden_test.go * Add cmd/protoc-gen-go/annotation_test.go Change-Id: I4a1a97ae6f66e2fabcf4e4d292c95ab2a2db0248 Reviewed-on: https://go-review.googlesource.com/c/164477 Reviewed-by: Damien Neil <dneil@google.com>
2019-02-27 21:46:29 -08:00
knownpb "github.com/golang/protobuf/v2/types/known"
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()
}
// splitLines is a cmpopts.Option for comparing strings with line breaks.
var splitLines = cmpopts.AcyclicTransformer("SplitLines", func(s string) []string {
return strings.Split(s, "\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
func pb2Enum(i int32) *pb2.Enum {
p := new(pb2.Enum)
*p = pb2.Enum(i)
return p
}
func pb2Enums_NestedEnum(i int32) *pb2.Enums_NestedEnum {
p := new(pb2.Enums_NestedEnum)
*p = pb2.Enums_NestedEnum(i)
return p
}
all: move v1 types over to the v2 repository As a goal, v2 should not depend on v1. As another step towards that end, we move all the types that used to be in the v1 protoapi package over to v2. For now, we place MessageV1, ExtensionRangeV1, and ExtensionDescV1 in runtime/protoiface since these are types that generated messages will probably have to reference forever. An alternative location could be reflect/protoreflect, but it seems unfortunate to have to dirty the namespace of that package with these types. We move ExtensionFieldV1, ExtensionFieldsV1, and ExtensionFieldsOf to internal/impl, since these are related to the implementation of a generated message. Since moving these types from v1 to v2 implies that the v1 protoapi package is useless, we update all usages of v1 protoapi in the v2 repository to point to the relevant v2 type or functionality. CL/168538 is the corresponding change to alter v1. There will be a temporary build failure as it is not possible to submit CL/168519 and CL/168538 atomically. Change-Id: Ide4025c1b6af5b7f0696f4b65b988b4d10a50f0b Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/168519 Reviewed-by: Herbie Ong <herbie@google.com>
2019-03-20 18:29:32 -07:00
func setExtension(m proto.Message, xd *protoiface.ExtensionDescV1, val interface{}) {
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
knownFields := m.ProtoReflect().KnownFields()
extTypes := knownFields.ExtensionTypes()
cmd/protoc-gen-go: correlate v1 ExtensionDesc with v2 ExtensionType Unfortunately a good amount of code uses pointer comparisons on the v1 ExtensionDesc to determine exactly which extension field is set, rather than checking whether the extension descriptor semantically describes the field that they are interested in. To preserve this behavior in v1, we need a 1:1 mapping between a v2 ExtensionType and a specific v1 ExtensionDesc. Change-Id: I852b3cefb4585bd656e48e5adad6cc28795d02df Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167759 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-14 16:08:22 -07:00
extTypes.Register(xd.Type)
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
if val == nil {
return
}
cmd/protoc-gen-go: correlate v1 ExtensionDesc with v2 ExtensionType Unfortunately a good amount of code uses pointer comparisons on the v1 ExtensionDesc to determine exactly which extension field is set, rather than checking whether the extension descriptor semantically describes the field that they are interested in. To preserve this behavior in v1, we need a 1:1 mapping between a v2 ExtensionType and a specific v1 ExtensionDesc. Change-Id: I852b3cefb4585bd656e48e5adad6cc28795d02df Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/167759 Reviewed-by: Damien Neil <dneil@google.com>
2019-03-14 16:08:22 -07:00
pval := xd.Type.ValueOf(val)
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
knownFields.Set(wire.Number(xd.Field), pval)
}
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
// dhex decodes a hex-string and returns the bytes and panics if s is invalid.
func dhex(s string) []byte {
b, err := hex.DecodeString(s)
if err != nil {
panic(err)
}
return b
}
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 TestMarshal(t *testing.T) {
tests := []struct {
desc string
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
mo textpb.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/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/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: "\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: "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/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: "\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: "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{
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
OptBool: scalar.Bool(false),
OptInt32: scalar.Int32(0),
OptInt64: scalar.Int64(0),
OptUint32: scalar.Uint32(0),
OptUint64: scalar.Uint64(0),
OptSint32: scalar.Int32(0),
OptSint64: scalar.Int64(0),
OptFixed32: scalar.Uint32(0),
OptFixed64: scalar.Uint64(0),
OptSfixed32: scalar.Int32(0),
OptSfixed64: scalar.Int64(0),
OptFloat: scalar.Float32(0),
OptDouble: scalar.Float64(0),
OptBytes: []byte{},
OptString: scalar.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/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/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: "\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: "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{
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
OptBool: scalar.Bool(true),
OptInt32: scalar.Int32(0xff),
OptInt64: scalar.Int64(0xdeadbeef),
OptUint32: scalar.Uint32(47),
OptUint64: scalar.Uint64(0xdeadbeef),
OptSint32: scalar.Int32(-1001),
OptSint64: scalar.Int64(-0xffff),
OptFixed64: scalar.Uint64(64),
OptSfixed32: scalar.Int32(-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
OptFloat: scalar.Float32(1.02),
OptDouble: scalar.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"),
OptString: scalar.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/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/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: "\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 set to zero value",
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: pb2Enum(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
OptNestedEnum: pb2Enums_NestedEnum(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
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/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/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/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: pb2Enum(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
OptNestedEnum: pb2Enums_NestedEnum(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
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{
OptEnum: pb2Enum(101),
OptNestedEnum: pb2Enums_NestedEnum(-101),
},
want: `opt_enum: 101
opt_nested_enum: -101
`,
}, {
desc: "proto3 enum not set",
input: &pb3.Enums{},
want: "\n",
}, {
desc: "proto3 enum set to zero value",
input: &pb3.Enums{
SEnum: pb3.Enum_ZERO,
SNestedEnum: pb3.Enums_CERO,
},
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: "\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: "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/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/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: "\n",
}, {
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/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{
OptString: scalar.String("nested message"),
OptNested: &pb2.Nested{
OptString: scalar.String("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: `opt_nested: {
opt_string: "nested message"
opt_nested: {
opt_string: "another nested message"
}
}
`,
}, {
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{
OptString: scalar.String("inside a group"),
OptNested: &pb2.Nested{
OptString: scalar.String("nested message inside a group"),
},
Optnestedgroup: &pb2.Nests_OptGroup_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
OptFixed32: scalar.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
}
}
`,
}, {
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/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: "\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: "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: 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/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: "\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: "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{},
want: "\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: "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{},
},
want: "\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: "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: 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{},
},
want: "\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: "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{
{
OptString: scalar.String("repeat nested one"),
},
{
OptString: scalar.String("repeat nested two"),
OptNested: &pb2.Nested{
OptString: scalar.String("inside repeat nested two"),
},
},
{},
},
},
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/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: "\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: "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/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: "\n",
}, {
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: 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{},
want: "\n",
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{
ReqBool: scalar.Bool(false),
ReqSfixed64: scalar.Int64(0xbeefcafe),
ReqDouble: scalar.Float64(math.NaN()),
ReqString: scalar.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",
mo: textpb.MarshalOptions{AllowPartial: true},
input: &pb2.Requireds{
ReqBool: scalar.Bool(false),
ReqSfixed64: scalar.Int64(0xbeefcafe),
ReqDouble: scalar.Float64(math.NaN()),
ReqString: scalar.String("hello"),
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{
ReqBool: scalar.Bool(false),
ReqSfixed64: scalar.Int64(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
ReqDouble: scalar.Float64(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
ReqString: scalar.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",
mo: textpb.MarshalOptions{AllowPartial: true},
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{},
},
want: "\n",
}, {
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",
mo: textpb.MarshalOptions{AllowPartial: true},
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{},
},
want: "\n",
}, {
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",
mo: textpb.MarshalOptions{AllowPartial: true},
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",
mo: textpb.MarshalOptions{AllowPartial: true},
input: &pb2.IndirectRequired{
Union: &pb2.IndirectRequired_OneofNested{
OneofNested: &pb2.NestedWithRequired{},
},
},
want: "oneof_nested: {}\n",
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",
input: &pb2.Scalars{
OptString: scalar.String("this message contains unknown fields"),
XXX_unrecognized: pack.Message{
pack.Tag{101, pack.VarintType}, pack.Bool(true),
pack.Tag{102, pack.VarintType}, pack.Varint(0xff),
pack.Tag{103, pack.Fixed32Type}, pack.Uint32(47),
pack.Tag{104, pack.Fixed64Type}, pack.Int64(0xdeadbeef),
}.Marshal(),
},
want: `opt_string: "this message contains unknown fields"
101: 1
102: 255
103: 47
104: 3735928559
`,
}, {
desc: "unknown length-delimited",
input: &pb2.Scalars{
XXX_unrecognized: pack.Message{
pack.Tag{101, pack.BytesType}, pack.LengthPrefix{pack.Bool(true), pack.Bool(false)},
pack.Tag{102, pack.BytesType}, pack.String("hello world"),
pack.Tag{103, pack.BytesType}, pack.Bytes("\xe4\xb8\x96\xe7\x95\x8c"),
}.Marshal(),
},
want: `101: "\x01\x00"
102: "hello world"
103: "世界"
`,
}, {
desc: "unknown group type",
input: &pb2.Scalars{
XXX_unrecognized: pack.Message{
pack.Tag{101, pack.StartGroupType}, pack.Tag{101, pack.EndGroupType},
pack.Tag{102, pack.StartGroupType},
pack.Tag{101, pack.VarintType}, pack.Bool(false),
pack.Tag{102, pack.BytesType}, pack.String("inside a group"),
pack.Tag{102, pack.EndGroupType},
}.Marshal(),
},
want: `101: {}
102: {
101: 0
102: "inside a group"
}
`,
}, {
desc: "unknown unpack repeated field",
input: &pb2.Scalars{
XXX_unrecognized: pack.Message{
pack.Tag{101, pack.BytesType}, pack.LengthPrefix{pack.Bool(true), pack.Bool(false), pack.Bool(true)},
pack.Tag{102, pack.BytesType}, pack.String("hello"),
pack.Tag{101, pack.VarintType}, pack.Bool(true),
pack.Tag{102, pack.BytesType}, pack.String("世界"),
}.Marshal(),
},
want: `101: "\x01\x00\x01"
101: 1
102: "hello"
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{
OptString: scalar.String("non-extension field"),
OptBool: scalar.Bool(true),
OptInt32: scalar.Int32(42),
}
setExtension(m, pb2.E_OptExtBool, true)
setExtension(m, pb2.E_OptExtString, "extension field")
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
setExtension(m, pb2.E_OptExtEnum, pb2.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
setExtension(m, pb2.E_OptExtNested, &pb2.Nested{
OptString: scalar.String("nested in an extension"),
OptNested: &pb2.Nested{
OptString: scalar.String("another nested in an extension"),
},
})
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: 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: "extension message field set to nil",
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
input: func() proto.Message {
m := &pb2.Extensions{}
setExtension(m, pb2.E_OptExtNested, nil)
return m
}(),
want: "\n",
}, {
desc: "extensions of repeated fields",
input: func() proto.Message {
m := &pb2.Extensions{}
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
setExtension(m, pb2.E_RptExtEnum, &[]pb2.Enum{pb2.Enum_TEN, 101, pb2.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
setExtension(m, pb2.E_RptExtFixed32, &[]uint32{42, 47})
setExtension(m, pb2.E_RptExtNested, &[]*pb2.Nested{
&pb2.Nested{OptString: scalar.String("one")},
&pb2.Nested{OptString: scalar.String("two")},
&pb2.Nested{OptString: scalar.String("three")},
})
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{}
setExtension(m, pb2.E_ExtensionsContainer_OptExtBool, true)
setExtension(m, pb2.E_ExtensionsContainer_OptExtString, "extension field")
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
setExtension(m, pb2.E_ExtensionsContainer_OptExtEnum, pb2.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
setExtension(m, pb2.E_ExtensionsContainer_OptExtNested, &pb2.Nested{
OptString: scalar.String("nested in an extension"),
OptNested: &pb2.Nested{
OptString: scalar.String("another nested in an extension"),
},
})
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{
OptString: scalar.String("non-extension field"),
OptBool: scalar.Bool(true),
OptInt32: scalar.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
setExtension(m, pb2.E_ExtensionsContainer_RptExtEnum, &[]pb2.Enum{pb2.Enum_TEN, 101, pb2.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
setExtension(m, pb2.E_ExtensionsContainer_RptExtString, &[]string{"hello", "world"})
setExtension(m, pb2.E_ExtensionsContainer_RptExtNested, &[]*pb2.Nested{
&pb2.Nested{OptString: scalar.String("one")},
&pb2.Nested{OptString: scalar.String("two")},
&pb2.Nested{OptString: scalar.String("three")},
})
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{}
setExtension(m, pb2.E_MessageSetExtension_MessageSetExtension, &pb2.MessageSetExtension{
OptString: scalar.String("a messageset extension"),
})
setExtension(m, pb2.E_MessageSetExtension_NotMessageSetExtension, &pb2.MessageSetExtension{
OptString: scalar.String("not a messageset extension"),
})
setExtension(m, pb2.E_MessageSetExtension_ExtNested, &pb2.Nested{
OptString: scalar.String("just a regular extension"),
})
return m
}(),
want: `[pb2.MessageSetExtension]: {
opt_string: "a messageset extension"
}
[pb2.MessageSetExtension.ext_nested]: {
opt_string: "just a regular extension"
}
[pb2.MessageSetExtension.not_message_set_extension]: {
opt_string: "not a messageset extension"
}
`,
}, {
desc: "not real MessageSet 1",
input: func() proto.Message {
m := &pb2.FakeMessageSet{}
setExtension(m, pb2.E_FakeMessageSetExtension_MessageSetExtension, &pb2.FakeMessageSetExtension{
OptString: scalar.String("not a messageset extension"),
})
return m
}(),
want: `[pb2.FakeMessageSetExtension.message_set_extension]: {
opt_string: "not a messageset extension"
}
`,
}, {
desc: "not real MessageSet 2",
input: func() proto.Message {
m := &pb2.MessageSet{}
setExtension(m, pb2.E_MessageSetExtension, &pb2.FakeMessageSetExtension{
OptString: scalar.String("another not a messageset extension"),
})
return m
}(),
want: `[pb2.message_set_extension]: {
opt_string: "another not a messageset extension"
}
`,
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",
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
mo: textpb.MarshalOptions{
Resolver: preg.NewTypes(),
},
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{
OptString: scalar.String("embedded inside Any"),
OptNested: &pb2.Nested{
OptString: scalar.String("inception"),
},
}
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)
}
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
return &knownpb.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: 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
mo: textpb.MarshalOptions{
Resolver: preg.NewTypes((&pb2.Nested{}).ProtoReflect().Type()),
},
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{
OptString: scalar.String("embedded inside Any"),
OptNested: &pb2.Nested{
OptString: scalar.String("inception"),
},
}
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)
}
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
return &knownpb.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/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 with missing required error",
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
mo: textpb.MarshalOptions{
Resolver: preg.NewTypes((&pb2.PartialRequired{}).ProtoReflect().Type()),
},
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{
OptString: scalar.String("embedded inside Any"),
}
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
b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
// TODO: Marshal may fail due to required field not set at some
// point. Need to ignore required not set error here.
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)
}
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
return &knownpb.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
TypeUrl: string(m.ProtoReflect().Type().FullName()),
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"
}
`,
wantErr: true,
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",
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
mo: textpb.MarshalOptions{
Resolver: preg.NewTypes((&pb2.Nested{}).ProtoReflect().Type()),
},
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
input: &knownpb.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",
Value: dhex("80"),
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/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
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)
if tt.want != "" && got != tt.want {
t.Errorf("Marshal()\n<got>\n%v\n<want>\n%v\n", got, tt.want)
if diff := cmp.Diff(tt.want, got, splitLines); 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)
}
}
})
}
}
Reference in New Issue Copy Permalink