From 09328db1ff546e5c535ee0c3fbbe2b1f3ec07b63 Mon Sep 17 00:00:00 2001
From: Anuraag Agrawal <anuraaga@gmail.com>
Date: Tue, 4 Apr 2017 18:58:46 +0900
Subject: Fix test for unexpected type url when parsing Any. Currently, the
 test fails since TestAllTypes doesn't have field '@type', which is the same
 test as testUnknownFields.

---
 java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java b/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java
index 395d7458..808e542d 100644
--- a/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java
+++ b/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java
@@ -1099,7 +1099,7 @@ public class JsonFormatTest extends TestCase {
 
   public void testParserUnexpectedTypeUrl() throws Exception {
     try {
-      TestAllTypes.Builder builder = TestAllTypes.newBuilder();
+      Any.Builder builder = Any.newBuilder();
       mergeFromJson(
           "{\n"
               + "  \"@type\": \"type.googleapis.com/json_test.TestAllTypes\",\n"
-- 
cgit v1.2.3