mirror/protobuf-go
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf-go.git synced 2025-04-16 08:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: use subtests to identify the message type

Browse Source 
This makes it a little easier to track down test failures.

Also add a note to TestMarshalAppendAllocations to explain what it tests.

Change-Id: Ie35f3ddd7c7d5cb300294f0fe665c6711d45d186
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/569775
Auto-Submit: Michael Stapelberg <stapelberg@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Lasse Folger <lassefolger@google.com>
This commit is contained in:
Michael Stapelberg 2024-03-07 15:50:23 +01:00 committed by Gopher Robot
parent e216807546
commit f56368575a
2 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
proto/encode_test.go
View File

@ -157,6 +157,9 @@ func TestEncodeOneofNilWrapper(t *testing.T) {
} }
func TestMarshalAppendAllocations(t *testing.T) { func TestMarshalAppendAllocations(t *testing.T) {
// This test ensures that MarshalAppend() has the same performance
// characteristics as the append() builtin, meaning that repeated calls do
// not allocate each time, but allocations are amortized.
m := &test3pb.TestAllTypes{SingularInt32: 1} m := &test3pb.TestAllTypes{SingularInt32: 1}
size := proto.Size(m) size := proto.Size(m)
const count = 1000 const count = 1000
@ -257,22 +260,24 @@ func TestEncodeLarge(t *testing.T) {
// but exist to detect accidental changes in behavior. // but exist to detect accidental changes in behavior.
func TestEncodeEmpty(t *testing.T) { func TestEncodeEmpty(t *testing.T) {
for _, m := range []proto.Message{nil, (*testpb.TestAllTypes)(nil), &testpb.TestAllTypes{}} { for _, m := range []proto.Message{nil, (*testpb.TestAllTypes)(nil), &testpb.TestAllTypes{}} {
isValid := m != nil && m.ProtoReflect().IsValid() t.Run(fmt.Sprintf("%T", m), func(t *testing.T) {
isValid := m != nil && m.ProtoReflect().IsValid()
b, err := proto.Marshal(m) b, err := proto.Marshal(m)
if err != nil { if err != nil {
t.Errorf("proto.Marshal() = %v", err) t.Errorf("proto.Marshal() = %v", err)
} }
if isNil := b == nil; isNil == isValid { if isNil := b == nil; isNil == isValid {
t.Errorf("proto.Marshal() == nil: %v, want %v", isNil, !isValid) t.Errorf("proto.Marshal() == nil: %v, want %v", isNil, !isValid)
} }
b, err = proto.MarshalOptions{}.Marshal(m) b, err = proto.MarshalOptions{}.Marshal(m)
if err != nil { if err != nil {
t.Errorf("proto.MarshalOptions{}.Marshal() = %v", err) t.Errorf("proto.MarshalOptions{}.Marshal() = %v", err)
} }
if isNil := b == nil; isNil == isValid { if isNil := b == nil; isNil == isValid {
t.Errorf("proto.MarshalOptions{}.Marshal() = %v, want %v", isNil, !isValid) t.Errorf("proto.MarshalOptions{}.Marshal() = %v, want %v", isNil, !isValid)
} }
})
} }
} }

23
types/dynamicpb/dynamic_test.go
View File

@ -5,6 +5,7 @@
package dynamicpb_test package dynamicpb_test
import ( import (
"fmt"
"testing" "testing"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
@ -23,8 +24,10 @@ func TestConformance(t *testing.T) {
(*test3pb.TestAllTypes)(nil), (*test3pb.TestAllTypes)(nil),
(*testpb.TestAllExtensions)(nil), (*testpb.TestAllExtensions)(nil),
} { } {
mt := dynamicpb.NewMessageType(message.ProtoReflect().Descriptor()) t.Run(fmt.Sprintf("%T", message), func(t *testing.T) {
prototest.Message{}.Test(t, mt) mt := dynamicpb.NewMessageType(message.ProtoReflect().Descriptor())
prototest.Message{}.Test(t, mt)
})
} }
} }
@ -32,10 +35,12 @@ func TestDynamicExtensions(t *testing.T) {
for _, message := range []proto.Message{ for _, message := range []proto.Message{
(*testpb.TestAllExtensions)(nil), (*testpb.TestAllExtensions)(nil),
} { } {
mt := dynamicpb.NewMessageType(message.ProtoReflect().Descriptor()) t.Run(fmt.Sprintf("%T", message), func(t *testing.T) {
prototest.Message{ mt := dynamicpb.NewMessageType(message.ProtoReflect().Descriptor())
Resolver: extResolver{}, prototest.Message{
}.Test(t, mt) Resolver: extResolver{},
}.Test(t, mt)
})
} }
} }
@ -44,8 +49,10 @@ func TestDynamicEnums(t *testing.T) {
testpb.TestAllTypes_FOO, testpb.TestAllTypes_FOO,
test3pb.TestAllTypes_FOO, test3pb.TestAllTypes_FOO,
} { } {
et := dynamicpb.NewEnumType(enum.Descriptor()) t.Run(fmt.Sprintf("%v", enum), func(t *testing.T) {
prototest.Enum{}.Test(t, et) et := dynamicpb.NewEnumType(enum.Descriptor())
prototest.Enum{}.Test(t, et)
})
} }
} }