diff options
author | Jeff Davidson <jpd@google.com> | 2015-01-20 13:02:58 -0800 |
---|---|---|
committer | Jeff Davidson <jpd@google.com> | 2015-01-20 13:12:29 -0800 |
commit | afb4b72037e3f13db208590fc782c4bc8e27f862 (patch) | |
tree | 204041a6b0ac0941d14faa2afe222d1b4b627db9 /java/src/test/java/com/google/protobuf/DynamicMessageTest.java | |
parent | 80aff29bb2d37977a02c0a677721522d3467a4d9 (diff) | |
download | external_protobuf-afb4b72037e3f13db208590fc782c4bc8e27f862.zip external_protobuf-afb4b72037e3f13db208590fc782c4bc8e27f862.tar.gz external_protobuf-afb4b72037e3f13db208590fc782c4bc8e27f862.tar.bz2 |
Upgrade protobuf library to v2.6.1.
The previous commit was actually between v2.6.0 and v2.6.1. This CL
was created by generating a patch with:
git format-patch edc5994525c79cd1919859a370837a6ff7c8e308..v2.6.1
and applying this patch to the tree. The patch was clean except for
pom.xml, where the packaging type should have previously been changed
from "jar" to "bundle".
Reran ./configure && make -j12 check to regenerate configure script
and makefiles.
Change-Id: I817ff426c9a512cbda0246df5aee38f97e762dea
Diffstat (limited to 'java/src/test/java/com/google/protobuf/DynamicMessageTest.java')
-rw-r--r-- | java/src/test/java/com/google/protobuf/DynamicMessageTest.java | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/java/src/test/java/com/google/protobuf/DynamicMessageTest.java b/java/src/test/java/com/google/protobuf/DynamicMessageTest.java index ee3769c..55144e7 100644 --- a/java/src/test/java/com/google/protobuf/DynamicMessageTest.java +++ b/java/src/test/java/com/google/protobuf/DynamicMessageTest.java @@ -1,6 +1,6 @@ // Protocol Buffers - Google's data interchange format // Copyright 2008 Google Inc. All rights reserved. -// http://code.google.com/p/protobuf/ +// https://developers.google.com/protocol-buffers/ // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are @@ -30,6 +30,7 @@ package com.google.protobuf; +import com.google.protobuf.Descriptors.EnumDescriptor; import com.google.protobuf.Descriptors.FieldDescriptor; import com.google.protobuf.Descriptors.OneofDescriptor; @@ -307,4 +308,19 @@ public class DynamicMessageTest extends TestCase { message = builder.build(); assertSame(null, message.getOneofFieldDescriptor(oneof)); } + + // Regression test for a bug that makes setField() not work for repeated + // enum fields. + public void testSettersForRepeatedEnumField() throws Exception { + DynamicMessage.Builder builder = + DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); + FieldDescriptor repeatedEnumField = + TestAllTypes.getDescriptor().findFieldByName( + "repeated_nested_enum"); + EnumDescriptor enumDescriptor = TestAllTypes.NestedEnum.getDescriptor(); + builder.setField(repeatedEnumField, enumDescriptor.getValues()); + DynamicMessage message = builder.build(); + assertEquals( + enumDescriptor.getValues(), message.getField(repeatedEnumField)); + } } |