Update third_party/protobuf to protobuf-v3.0.0-beta-3

third_party/protobuf/java/core/src/test/java/com/google/protobuf/EnumTest.java

Index: third_party/protobuf/java/core/src/test/java/com/google/protobuf/EnumTest.java
diff --git a/third_party/protobuf/java/src/test/java/com/google/protobuf/WellKnownTypesTest.java b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/EnumTest.java
similarity index 54%
copy from third_party/protobuf/java/src/test/java/com/google/protobuf/WellKnownTypesTest.java
copy to third_party/protobuf/java/core/src/test/java/com/google/protobuf/EnumTest.java
index 982e200f53f678bfce021ed2e93ece13edc55cda..14c7406b3d6babe1ee459dfb964066477807c58b 100644
--- a/third_party/protobuf/java/src/test/java/com/google/protobuf/WellKnownTypesTest.java
+++ b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/EnumTest.java
@@ -30,36 +30,47 @@
 
 package com.google.protobuf;
 
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.test.TestWellKnownTypes;
+import com.google.protobuf.UnittestLite.ForeignEnumLite;
+import com.google.protobuf.UnittestLite.TestAllTypesLite;
+import protobuf_unittest.UnittestProto.ForeignEnum;
+import protobuf_unittest.UnittestProto.TestAllTypes;
 
 import junit.framework.TestCase;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+public class EnumTest extends TestCase {
+  
+  public void testForNumber() {
+    ForeignEnum e = ForeignEnum.forNumber(ForeignEnum.FOREIGN_BAR.getNumber());
+    assertEquals(ForeignEnum.FOREIGN_BAR, e);
 
-/**
- * This test ensures that well-known types are included in protobuf Java
- * runtime library.
- */
-public class WellKnownTypesTest extends TestCase {
-  public void testWellKnownTypes() {
-    // The test passes if it compiles.
-    TestWellKnownTypes message = TestWellKnownTypes.newBuilder().build();
-    assertEquals(0, message.getAnyField().getSerializedSize());
-    assertEquals(0, message.getApiField().getSerializedSize());
-    assertEquals(0, message.getDurationField().getSerializedSize());
-    assertEquals(0, message.getEmptyField().getSerializedSize());
-    assertEquals(0, message.getFieldMaskField().getSerializedSize());
-    assertEquals(0, message.getSourceContextField().getSerializedSize());
-    assertEquals(0, message.getStructField().getSerializedSize());
-    assertEquals(0, message.getTimestampField().getSerializedSize());
-    assertEquals(0, message.getTypeField().getSerializedSize());
-    assertEquals(0, message.getInt32Field().getSerializedSize());
+    e = ForeignEnum.forNumber(1000);
+    assertEquals(null, e);
+  }
+  
+  public void testForNumber_oneof() {
+    TestAllTypes.OneofFieldCase e = TestAllTypes.OneofFieldCase.forNumber(
+        TestAllTypes.OneofFieldCase.ONEOF_NESTED_MESSAGE.getNumber());
+    assertEquals(TestAllTypes.OneofFieldCase.ONEOF_NESTED_MESSAGE, e);
+
+    e = TestAllTypes.OneofFieldCase.forNumber(1000);
+    assertEquals(null, e);
+  }
+  
+  public void testForNumberLite() {
+    ForeignEnumLite e = ForeignEnumLite.forNumber(ForeignEnumLite.FOREIGN_LITE_BAR.getNumber());
+    assertEquals(ForeignEnumLite.FOREIGN_LITE_BAR, e);
+
+    e = ForeignEnumLite.forNumber(1000);
+    assertEquals(null, e);
+  }
+  
+  public void testForNumberLite_oneof() {
+    TestAllTypesLite.OneofFieldCase e = TestAllTypesLite.OneofFieldCase.forNumber(
+        TestAllTypesLite.OneofFieldCase.ONEOF_NESTED_MESSAGE.getNumber());
+    assertEquals(TestAllTypesLite.OneofFieldCase.ONEOF_NESTED_MESSAGE, e);
+
+    e = TestAllTypesLite.OneofFieldCase.forNumber(1000);
+    assertEquals(null, e);
   }
 }
+