From f84177299a76759be1eb925093b059aef246fc0e Mon Sep 17 00:00:00 2001
From: Max Cai <maxtroy@google.com>
Date: Fri, 10 Jan 2014 13:26:51 +0000
Subject: Don't serialize required fields whose 'has' flags are unset.

Change-Id: Ibbe944fff83e44a8f2206e18ee9ec6f10661297a
---
 java/src/test/java/com/google/protobuf/NanoTest.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/src/test/java/com/google/protobuf/NanoTest.java b/java/src/test/java/com/google/protobuf/NanoTest.java
index 4934844..bb95a17 100644
--- a/java/src/test/java/com/google/protobuf/NanoTest.java
+++ b/java/src/test/java/com/google/protobuf/NanoTest.java
@@ -2202,6 +2202,7 @@ public class NanoTest extends TestCase {
       assertFalse(msg.hasDefaultFloatNan);
       assertFalse(msg.hasDefaultNestedEnum);
       assertFalse(msg.hasId);
+      assertFalse(msg.hasRequiredEnum);
       msg.optionalInt32 = 123;
       msg.optionalNestedMessage = new TestAllTypesNanoHas.NestedMessage();
       msg.optionalNestedMessage.bb = 2;
@@ -2211,7 +2212,7 @@ public class NanoTest extends TestCase {
     byte [] result = MessageNano.toByteArray(msg);
     int msgSerializedSize = msg.getSerializedSize();
     //System.out.printf("mss=%d result.length=%d\n", msgSerializedSize, result.length);
-    assertTrue(msgSerializedSize == 13);
+    assertTrue(msgSerializedSize == 10);
     assertEquals(result.length, msgSerializedSize);
 
     // Has fields true upon parse.
@@ -2237,6 +2238,8 @@ public class NanoTest extends TestCase {
     msg.hasDefaultBytes = true;
     msg.hasDefaultFloatNan = true;
     msg.hasDefaultNestedEnum = true;
+    msg.hasId = true;
+    msg.hasRequiredEnum = true;
 
     byte [] result = MessageNano.toByteArray(msg);
     int msgSerializedSize = msg.getSerializedSize();
@@ -2255,6 +2258,7 @@ public class NanoTest extends TestCase {
     assertTrue(newMsg.hasDefaultFloatNan);
     assertTrue(newMsg.hasDefaultNestedEnum);
     assertTrue(newMsg.hasId);
+    assertTrue(newMsg.hasRequiredEnum);
     assertEquals(0, newMsg.optionalInt32);
     assertEquals(0, newMsg.optionalString.length());
     assertEquals(0, newMsg.optionalBytes.length);
@@ -2266,6 +2270,7 @@ public class NanoTest extends TestCase {
     assertEquals(TestAllTypesNanoHas.BAR, newMsg.defaultNestedEnum);
     assertEquals(Float.NaN, newMsg.defaultFloatNan);
     assertEquals(0, newMsg.id);
+    assertEquals(TestAllTypesNanoHas.FOO, newMsg.requiredEnum);
   }
 
   public void testNanoWithAccessorsBasic() throws Exception {
-- 
cgit v1.1