← Back to branch summary

~statik/ubuntu/maverick/protobuf/A

« back to all changes in this revision

Viewing changes to src/google/protobuf/message_unittest.cc

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2010-02-11 11:13:19 UTC
  • mfrom: (2.2.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100211111319-zdn8hmw0gh8s4cf8
Tags: 2.2.0a-0.1ubuntu1
* Merge from Debian testing.
* Remaining Ubuntu changes:
  - Don't use python2.4.
* Ubuntu changes dropped:
  - Disable death tests on Itanium, fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/google/protobuf/message_unittest.cc
248
248
  EXPECT_FALSE(message.ParseFromArray("\014", 1));
249
249
}
250
250
 
251
 
TEST(MessageTest, FieldConstantValues) {
252
 
  unittest::TestRequired message;
253
 
  EXPECT_EQ(protobuf_unittest::TestAllTypes_NestedMessage::kBbFieldNumber, 1);
254
 
  EXPECT_EQ(protobuf_unittest::TestAllTypes::kOptionalInt32FieldNumber, 1);
255
 
  EXPECT_EQ(protobuf_unittest::TestAllTypes::kOptionalgroupFieldNumber, 16);
256
 
  EXPECT_EQ(protobuf_unittest::TestAllTypes::kOptionalNestedMessageFieldNumber,
257
 
    18);
258
 
  EXPECT_EQ(protobuf_unittest::TestAllTypes::kOptionalNestedEnumFieldNumber,
259
 
    21);
260
 
  EXPECT_EQ(protobuf_unittest::TestAllTypes::kRepeatedInt32FieldNumber, 31);
261
 
  EXPECT_EQ(protobuf_unittest::TestAllTypes::kRepeatedgroupFieldNumber, 46);
262
 
  EXPECT_EQ(protobuf_unittest::TestAllTypes::kRepeatedNestedMessageFieldNumber,
263
 
    48);
264
 
  EXPECT_EQ(protobuf_unittest::TestAllTypes::kRepeatedNestedEnumFieldNumber,
265
 
    51);
266
 
}
267
 
 
268
 
TEST(MessageTest, ExtensionConstantValues) {
269
 
  EXPECT_EQ(protobuf_unittest::TestRequired::kSingleFieldNumber, 1000);
270
 
  EXPECT_EQ(protobuf_unittest::TestRequired::kMultiFieldNumber, 1001);
271
 
  EXPECT_EQ(protobuf_unittest::kOptionalInt32ExtensionFieldNumber, 1);
272
 
  EXPECT_EQ(protobuf_unittest::kOptionalgroupExtensionFieldNumber, 16);
273
 
  EXPECT_EQ(protobuf_unittest::kOptionalNestedMessageExtensionFieldNumber, 18);
274
 
  EXPECT_EQ(protobuf_unittest::kOptionalNestedEnumExtensionFieldNumber, 21);
275
 
  EXPECT_EQ(protobuf_unittest::kRepeatedInt32ExtensionFieldNumber, 31);
276
 
  EXPECT_EQ(protobuf_unittest::kRepeatedgroupExtensionFieldNumber, 46);
277
 
  EXPECT_EQ(protobuf_unittest::kRepeatedNestedMessageExtensionFieldNumber, 48);
278
 
  EXPECT_EQ(protobuf_unittest::kRepeatedNestedEnumExtensionFieldNumber, 51);
279
 
}
280
 
 
281
251
TEST(MessageFactoryTest, GeneratedFactoryLookup) {
282
252
  EXPECT_EQ(
283
253
    MessageFactory::generated_factory()->GetPrototype(