encoding/protojson, encoding/prototext: remove most explicit registries
Change tests which use private types registries to use the global one.
Except in cases where we want to explicitly test that the private
registry is used, it's simpler to use the global registry.
Change-Id: I998fb463b6beef91c7f5ce2ca2083251ae24d1db
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/199897
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
Reviewed-by: Herbie Ong <herbie@google.com>
diff --git a/encoding/prototext/decode_test.go b/encoding/prototext/decode_test.go
index c9df319..03ba552 100644
--- a/encoding/prototext/decode_test.go
+++ b/encoding/prototext/decode_test.go
@@ -10,7 +10,6 @@
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/internal/flags"
- pimpl "google.golang.org/protobuf/internal/impl"
"google.golang.org/protobuf/proto"
preg "google.golang.org/protobuf/reflect/protoregistry"
@@ -1400,10 +1399,7 @@
Value: []byte("some bytes"),
},
}, {
- desc: "Any expanded",
- umo: prototext.UnmarshalOptions{
- Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb2.Nested{})),
- },
+ desc: "Any expanded",
inputMessage: &anypb.Any{},
inputText: `
[foobar/pb2.Nested]: {
@@ -1430,20 +1426,14 @@
}
}(),
}, {
- desc: "Any expanded with empty value",
- umo: prototext.UnmarshalOptions{
- Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb2.Nested{})),
- },
+ desc: "Any expanded with empty value",
inputMessage: &anypb.Any{},
inputText: `[foo.com/pb2.Nested]: {}`,
wantMessage: &anypb.Any{
TypeUrl: "foo.com/pb2.Nested",
},
}, {
- desc: "Any expanded with missing required",
- umo: prototext.UnmarshalOptions{
- Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb2.PartialRequired{})),
- },
+ desc: "Any expanded with missing required",
inputMessage: &anypb.Any{},
inputText: `
[pb2.PartialRequired]: {
@@ -1467,10 +1457,7 @@
}
}(),
}, {
- desc: "Any with invalid UTF-8",
- umo: prototext.UnmarshalOptions{
- Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb3.Nested{})),
- },
+ desc: "Any with invalid UTF-8",
inputMessage: &anypb.Any{},
inputText: `
[pb3.Nested]: {
@@ -1480,23 +1467,17 @@
wantErr: true,
}, {
desc: "Any expanded with unregistered type",
- umo: prototext.UnmarshalOptions{Resolver: preg.NewTypes()},
+ umo: prototext.UnmarshalOptions{Resolver: new(preg.Types)},
inputMessage: &anypb.Any{},
inputText: `[SomeMessage]: {}`,
wantErr: true,
}, {
- desc: "Any expanded with invalid value",
- umo: prototext.UnmarshalOptions{
- Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb2.Nested{})),
- },
+ desc: "Any expanded with invalid value",
inputMessage: &anypb.Any{},
inputText: `[pb2.Nested]: 123`,
wantErr: true,
}, {
- desc: "Any expanded with unknown fields",
- umo: prototext.UnmarshalOptions{
- Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb2.Nested{})),
- },
+ desc: "Any expanded with unknown fields",
inputMessage: &anypb.Any{},
inputText: `
[pb2.Nested]: {}
@@ -1504,10 +1485,7 @@
`,
wantErr: true,
}, {
- desc: "Any contains expanded and unexpanded fields",
- umo: prototext.UnmarshalOptions{
- Resolver: preg.NewTypes(pimpl.Export{}.MessageTypeOf(&pb2.Nested{})),
- },
+ desc: "Any contains expanded and unexpanded fields",
inputMessage: &anypb.Any{},
inputText: `
[pb2.Nested]: {}