hpb: update extension_test to use hpb::Parse -> hpb::StatusOr<T>
PiperOrigin-RevId: 811021098
diff --git a/hpb_generator/tests/extension_test.cc b/hpb_generator/tests/extension_test.cc
index c1d5164..28b5b07 100644
--- a/hpb_generator/tests/extension_test.cc
+++ b/hpb_generator/tests/extension_test.cc
@@ -440,7 +440,9 @@
hpb::Arena arena;
auto bytes = hpb::Serialize(&model, arena);
EXPECT_EQ(true, bytes.ok());
- TestModel parsed_model = ::hpb::Parse<TestModel>(bytes.value()).value();
+ TestModel parsed_model =
+ ::hpb::Parse<TestModel>(bytes.value(), hpb::ParseOptionsDefault())
+ .value();
EXPECT_EQ("Test123", parsed_model.str1());
EXPECT_EQ(true, hpb::GetExtension(&parsed_model, theme).ok());
}
@@ -476,8 +478,7 @@
EXPECT_EQ(true, bytes.ok());
TestModel parsed_model =
- ::hpb::Parse<TestModel>(bytes.value(),
- hpb::ExtensionRegistry::generated_registry())
+ ::hpb::Parse<TestModel>(bytes.value(), hpb::ParseOptionsDefault())
.value();
EXPECT_EQ("Test123", parsed_model.str1());
EXPECT_EQ(true, hpb::GetExtension(&parsed_model, theme).ok());
@@ -586,9 +587,7 @@
// Test with ExtensionRegistry
TestModel parsed_model =
- ::hpb::Parse<TestModel>(data,
- hpb::ExtensionRegistry::generated_registry())
- .value();
+ ::hpb::Parse<TestModel>(data, hpb::ParseOptionsDefault()).value();
EXPECT_TRUE(::hpb::HasExtension(&parsed_model, theme));
}
@@ -601,10 +600,11 @@
hpb::Arena arena;
hpb::ExtensionRegistry extensions(arena);
extensions.AddExtension(repeated_int32_ext);
+ hpb::ParseOptions options{.extension_registry = extensions};
// These bytes are the serialized form of a repeated int32 field
// with two elements: [2, 3] @index 13004
auto bytes = "\342\254\006\002\002\003";
- auto parsed_model = hpb::Parse<TestModel>(bytes, extensions).value();
+ auto parsed_model = hpb::Parse<TestModel>(bytes, options).value();
auto res = hpb::GetExtension(&parsed_model, repeated_int32_ext);
EXPECT_EQ(true, res.ok());
EXPECT_EQ(res->size(), 2);
@@ -617,9 +617,10 @@
hpb::Arena arena;
hpb::ExtensionRegistry extensions(arena);
extensions.AddExtension(repeated_int64_ext);
+ hpb::ParseOptions options{.extension_registry = extensions};
// These bytes represent a repeated int64 field with one element: [322].
auto bytes = "\352\254\006\002\302\002";
- auto parsed_model = hpb::Parse<TestModel>(bytes, extensions).value();
+ auto parsed_model = hpb::Parse<TestModel>(bytes, options).value();
auto res = hpb::GetExtension(&parsed_model, repeated_int64_ext);
EXPECT_EQ(true, res.ok());
EXPECT_EQ(res->size(), 1);
@@ -631,9 +632,10 @@
hpb::Arena arena;
hpb::ExtensionRegistry extensions(arena);
extensions.AddExtension(string_ext);
+ hpb::ParseOptions options{.extension_registry = extensions};
// These bytes represent a singular string field: "todaraba" @index 13012.
auto bytes = "\242\255\006\010todaraba";
- auto parsed_model = hpb::Parse<TestModel>(bytes, extensions).value();
+ auto parsed_model = hpb::Parse<TestModel>(bytes, options).value();
auto res = hpb::GetExtension(&parsed_model, string_ext);
EXPECT_THAT(res, IsOkAndHolds("todaraba"));
}
@@ -643,10 +645,11 @@
hpb::Arena arena;
hpb::ExtensionRegistry extensions(arena);
extensions.AddExtension(repeated_string_ext);
+ hpb::ParseOptions options{.extension_registry = extensions};
// These bytes represent a repeated string field with two elements:
// ["hello", "world"] @index 13006.
auto bytes = "\362\254\006\005hello\362\254\006\005world";
- auto parsed_model = hpb::Parse<TestModel>(bytes, extensions).value();
+ auto parsed_model = hpb::Parse<TestModel>(bytes, options).value();
auto res = hpb::GetExtension(&parsed_model, repeated_string_ext);
EXPECT_EQ(true, res.ok());
EXPECT_EQ(res->size(), 2);