| Index: third_party/protobuf/java/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java
|
| diff --git a/third_party/protobuf/java/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java b/third_party/protobuf/java/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java
|
| index a312fc33af09d9e169b356b058cfbe85f0fa5b20..194f7b9c737b85e21030a2a7884ba7c0941668b0 100644
|
| --- a/third_party/protobuf/java/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java
|
| +++ b/third_party/protobuf/java/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java
|
| @@ -152,6 +152,15 @@ public class FieldMaskUtilTest extends TestCase {
|
| FieldMask result = FieldMaskUtil.union(mask1, mask2);
|
| assertEquals("bar,foo", FieldMaskUtil.toString(result));
|
| }
|
| +
|
| + public void testUnion_usingVarArgs() throws Exception {
|
| + FieldMask mask1 = FieldMaskUtil.fromString("foo");
|
| + FieldMask mask2 = FieldMaskUtil.fromString("foo.bar,bar.quz");
|
| + FieldMask mask3 = FieldMaskUtil.fromString("bar.quz");
|
| + FieldMask mask4 = FieldMaskUtil.fromString("bar");
|
| + FieldMask result = FieldMaskUtil.union(mask1, mask2, mask3, mask4);
|
| + assertEquals("bar,foo", FieldMaskUtil.toString(result));
|
| + }
|
|
|
| public void testIntersection() throws Exception {
|
| // Only test a simple case here and expect
|
|
|