| OLD | NEW |
| 1 // Protocol Buffers - Google's data interchange format | 1 // Protocol Buffers - Google's data interchange format |
| 2 // Copyright 2008 Google Inc. All rights reserved. | 2 // Copyright 2008 Google Inc. All rights reserved. |
| 3 // https://developers.google.com/protocol-buffers/ | 3 // http://code.google.com/p/protobuf/ |
| 4 // | 4 // |
| 5 // Redistribution and use in source and binary forms, with or without | 5 // Redistribution and use in source and binary forms, with or without |
| 6 // modification, are permitted provided that the following conditions are | 6 // modification, are permitted provided that the following conditions are |
| 7 // met: | 7 // met: |
| 8 // | 8 // |
| 9 // * Redistributions of source code must retain the above copyright | 9 // * Redistributions of source code must retain the above copyright |
| 10 // notice, this list of conditions and the following disclaimer. | 10 // notice, this list of conditions and the following disclaimer. |
| 11 // * Redistributions in binary form must reproduce the above | 11 // * Redistributions in binary form must reproduce the above |
| 12 // copyright notice, this list of conditions and the following disclaimer | 12 // copyright notice, this list of conditions and the following disclaimer |
| 13 // in the documentation and/or other materials provided with the | 13 // in the documentation and/or other materials provided with the |
| 14 // distribution. | 14 // distribution. |
| 15 // * Neither the name of Google Inc. nor the names of its | 15 // * Neither the name of Google Inc. nor the names of its |
| 16 // contributors may be used to endorse or promote products derived from | 16 // contributors may be used to endorse or promote products derived from |
| 17 // this software without specific prior written permission. | 17 // this software without specific prior written permission. |
| 18 // | 18 // |
| 19 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 19 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| 20 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 20 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| 21 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 21 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| 22 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 22 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 23 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 23 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 24 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 24 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 25 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 25 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 26 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 26 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 27 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 28 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 29 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 30 | 30 |
| 31 package com.google.protobuf; | 31 package com.google.protobuf.test; |
| 32 import com.google.protobuf.*; |
| 32 | 33 |
| 33 import protobuf_unittest.UnittestProto.ForeignMessage; | 34 import protobuf_unittest.UnittestProto.TestAllTypes; |
| 34 import protobuf_unittest.UnittestProto.TestAllExtensions; | 35 import protobuf_unittest.UnittestProto.TestAllExtensions; |
| 35 import protobuf_unittest.UnittestProto.TestAllTypes; | |
| 36 import protobuf_unittest.UnittestProto.TestRequired; | 36 import protobuf_unittest.UnittestProto.TestRequired; |
| 37 import protobuf_unittest.UnittestProto.TestRequiredForeign; | 37 import protobuf_unittest.UnittestProto.TestRequiredForeign; |
| 38 import protobuf_unittest.UnittestProto.ForeignMessage; |
| 38 | 39 |
| 39 import junit.framework.TestCase; | 40 import junit.framework.TestCase; |
| 40 | 41 |
| 41 import java.util.List; | 42 import java.util.List; |
| 42 | 43 |
| 43 /** | 44 /** |
| 44 * Misc. unit tests for message operations that apply to both generated | 45 * Misc. unit tests for message operations that apply to both generated |
| 45 * and dynamic messages. | 46 * and dynamic messages. |
| 46 * | 47 * |
| 47 * @author kenton@google.com Kenton Varda | 48 * @author kenton@google.com Kenton Varda |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 DynamicMessage.newBuilder(TestAllTypes.getDescriptor()) | 345 DynamicMessage.newBuilder(TestAllTypes.getDescriptor()) |
| 345 .mergeFrom(DynamicMessage.newBuilder(REPEATED_NESTED).build()) | 346 .mergeFrom(DynamicMessage.newBuilder(REPEATED_NESTED).build()) |
| 346 .build(); | 347 .build(); |
| 347 | 348 |
| 348 assertTrue(result.getField(result.getDescriptorForType() | 349 assertTrue(result.getField(result.getDescriptorForType() |
| 349 .findFieldByName("repeated_foreign_message")) instanceof List<?>); | 350 .findFieldByName("repeated_foreign_message")) instanceof List<?>); |
| 350 assertEquals(result.getRepeatedFieldCount(result.getDescriptorForType() | 351 assertEquals(result.getRepeatedFieldCount(result.getDescriptorForType() |
| 351 .findFieldByName("repeated_foreign_message")), 2); | 352 .findFieldByName("repeated_foreign_message")), 2); |
| 352 } | 353 } |
| 353 } | 354 } |
| OLD | NEW |