From 19641419a381509bddfc2d0b5d60a411b67b105b Mon Sep 17 00:00:00 2001 From: Brian Duff Date: Fri, 28 Jun 2013 17:23:51 -0700 Subject: Make it possible to use MessageNano.mergeFrom without casting. You can now do: MyMessage foo = MessageNano.mergeFrom(new MyMessage(), bytes); without having to cast the message returned from mergeFrom. Change-Id: Ibb2ad327f75855d45352ad304c7f054f20dd29c9 --- java/src/test/java/com/google/protobuf/NanoTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'java/src/test/java') diff --git a/java/src/test/java/com/google/protobuf/NanoTest.java b/java/src/test/java/com/google/protobuf/NanoTest.java index 38fafb9..19f3957 100644 --- a/java/src/test/java/com/google/protobuf/NanoTest.java +++ b/java/src/test/java/com/google/protobuf/NanoTest.java @@ -2241,6 +2241,15 @@ public class NanoTest extends TestCase { assertEquals(0, MessageNano.toByteArray(deserialized).length); } + public void testMergeFrom() throws Exception { + SimpleMessageNano message = new SimpleMessageNano(); + message.d = 123; + byte[] bytes = MessageNano.toByteArray(message); + + SimpleMessageNano newMessage = MessageNano.mergeFrom(new SimpleMessageNano(), bytes); + assertEquals(message.d, newMessage.d); + } + private List list(T first, T... remaining) { List list = new ArrayList(); list.add(first); -- cgit v1.1