aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/descriptor_unittest.cc
diff options
context:
space:
mode:
authorkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2008-12-02 20:08:45 +0000
committerkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2008-12-02 20:08:45 +0000
commit1ea526879c523a7d5a50478734adbab93b018e0d (patch)
treeedc36a78398aa1a36970796cbc4f97191b39ba80 /src/google/protobuf/descriptor_unittest.cc
parent2f669cbe75c054851234b7789342a5650ef951a5 (diff)
downloadprotobuf-1ea526879c523a7d5a50478734adbab93b018e0d.tar.gz
protobuf-1ea526879c523a7d5a50478734adbab93b018e0d.tar.bz2
protobuf-1ea526879c523a7d5a50478734adbab93b018e0d.zip
Add full-system test for custom enum value options. (Previously, only a
parsing test in parser_unittest.cc existed.)
Diffstat (limited to 'src/google/protobuf/descriptor_unittest.cc')
-rw-r--r--src/google/protobuf/descriptor_unittest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/google/protobuf/descriptor_unittest.cc b/src/google/protobuf/descriptor_unittest.cc
index 3a2b52bd..f4e60b3a 100644
--- a/src/google/protobuf/descriptor_unittest.cc
+++ b/src/google/protobuf/descriptor_unittest.cc
@@ -1554,6 +1554,9 @@ TEST(CustomOptions, OptionLocations) {
field->options().GetExtension(protobuf_unittest::field_opt2));
EXPECT_EQ(-789,
enm->options().GetExtension(protobuf_unittest::enum_opt1));
+ EXPECT_EQ(123,
+ enm->value(1)->options().GetExtension(
+ protobuf_unittest::enum_value_opt1));
EXPECT_EQ(GOOGLE_LONGLONG(-9876543210),
service->options().GetExtension(protobuf_unittest::service_opt1));
EXPECT_EQ(protobuf_unittest::METHODOPT1_VAL2,