aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/message_unittest.cc
diff options
context:
space:
mode:
authorkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2009-04-18 00:02:12 +0000
committerkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2009-04-18 00:02:12 +0000
commitcfa2d8aa87cc0b22b5092a5fb3bf7e394f85cbf1 (patch)
tree77ee2f4d02dfb43187511f3eb5a37a00c2f6f5de /src/google/protobuf/message_unittest.cc
parenteb26a1efdef3f1f5e77807d456a08f3c76cc5207 (diff)
downloadprotobuf-cfa2d8aa87cc0b22b5092a5fb3bf7e394f85cbf1.tar.gz
protobuf-cfa2d8aa87cc0b22b5092a5fb3bf7e394f85cbf1.tar.bz2
protobuf-cfa2d8aa87cc0b22b5092a5fb3bf7e394f85cbf1.zip
Generate field number constants. Patch from Michael Poole.
Diffstat (limited to 'src/google/protobuf/message_unittest.cc')
-rw-r--r--src/google/protobuf/message_unittest.cc30
1 files changed, 30 insertions, 0 deletions
diff --git a/src/google/protobuf/message_unittest.cc b/src/google/protobuf/message_unittest.cc
index 46e68446..d0592de0 100644
--- a/src/google/protobuf/message_unittest.cc
+++ b/src/google/protobuf/message_unittest.cc
@@ -248,6 +248,36 @@ TEST(MessageTest, ParseFailsOnInvalidMessageEnd) {
EXPECT_FALSE(message.ParseFromArray("\014", 1));
}
+TEST(MessageTest, FieldConstantValues) {
+ unittest::TestRequired message;
+ EXPECT_EQ(protobuf_unittest::TestAllTypes_NestedMessage::kBbFieldNumber, 1);
+ EXPECT_EQ(protobuf_unittest::TestAllTypes::kOptionalInt32FieldNumber, 1);
+ EXPECT_EQ(protobuf_unittest::TestAllTypes::kOptionalgroupFieldNumber, 16);
+ EXPECT_EQ(protobuf_unittest::TestAllTypes::kOptionalNestedMessageFieldNumber,
+ 18);
+ EXPECT_EQ(protobuf_unittest::TestAllTypes::kOptionalNestedEnumFieldNumber,
+ 21);
+ EXPECT_EQ(protobuf_unittest::TestAllTypes::kRepeatedInt32FieldNumber, 31);
+ EXPECT_EQ(protobuf_unittest::TestAllTypes::kRepeatedgroupFieldNumber, 46);
+ EXPECT_EQ(protobuf_unittest::TestAllTypes::kRepeatedNestedMessageFieldNumber,
+ 48);
+ EXPECT_EQ(protobuf_unittest::TestAllTypes::kRepeatedNestedEnumFieldNumber,
+ 51);
+}
+
+TEST(MessageTest, ExtensionConstantValues) {
+ EXPECT_EQ(protobuf_unittest::TestRequired::kSingleFieldNumber, 1000);
+ EXPECT_EQ(protobuf_unittest::TestRequired::kMultiFieldNumber, 1001);
+ EXPECT_EQ(protobuf_unittest::kOptionalInt32ExtensionFieldNumber, 1);
+ EXPECT_EQ(protobuf_unittest::kOptionalgroupExtensionFieldNumber, 16);
+ EXPECT_EQ(protobuf_unittest::kOptionalNestedMessageExtensionFieldNumber, 18);
+ EXPECT_EQ(protobuf_unittest::kOptionalNestedEnumExtensionFieldNumber, 21);
+ EXPECT_EQ(protobuf_unittest::kRepeatedInt32ExtensionFieldNumber, 31);
+ EXPECT_EQ(protobuf_unittest::kRepeatedgroupExtensionFieldNumber, 46);
+ EXPECT_EQ(protobuf_unittest::kRepeatedNestedMessageExtensionFieldNumber, 48);
+ EXPECT_EQ(protobuf_unittest::kRepeatedNestedEnumExtensionFieldNumber, 51);
+}
+
TEST(MessageFactoryTest, GeneratedFactoryLookup) {
EXPECT_EQ(
MessageFactory::generated_factory()->GetPrototype(