diff options
Diffstat (limited to 'java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java')
-rw-r--r-- | java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java | 53 |
1 files changed, 34 insertions, 19 deletions
diff --git a/java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java b/java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java index e376b1cd..20b93809 100644 --- a/java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java +++ b/java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java @@ -48,9 +48,9 @@ import org.junit.runners.JUnit4; /** * Tests the exceptions thrown when parsing from a stream. The methods on the {@link Parser} * interface are specified to only throw {@link InvalidProtocolBufferException}. But we really want - * to distinguish between invalid protos vs. actual I/O errors (like failures reading from a - * socket, etc.). So, when we're not using the parser directly, an {@link IOException} should be - * thrown where appropriate, instead of always an {@link InvalidProtocolBufferException}. + * to distinguish between invalid protos vs. actual I/O errors (like failures reading from a socket, + * etc.). So, when we're not using the parser directly, an {@link IOException} should be thrown + * where appropriate, instead of always an {@link InvalidProtocolBufferException}. * * @author jh@squareup.com (Joshua Humphries) */ @@ -61,7 +61,7 @@ public class ParseExceptionsTest { DescriptorProto parse(InputStream in) throws IOException; } - private byte serializedProto[]; + private byte[] serializedProto; private void setup() { serializedProto = DescriptorProto.getDescriptor().toProto().toByteArray(); @@ -77,7 +77,8 @@ public class ParseExceptionsTest { serializedProto = bos.toByteArray(); } - @Test public void message_parseFrom_InputStream() { + @Test + public void message_parseFrom_InputStream() { setup(); verifyExceptions( new ParseTester() { @@ -88,7 +89,8 @@ public class ParseExceptionsTest { }); } - @Test public void message_parseFrom_InputStreamAndExtensionRegistry() { + @Test + public void message_parseFrom_InputStreamAndExtensionRegistry() { setup(); verifyExceptions( new ParseTester() { @@ -99,7 +101,8 @@ public class ParseExceptionsTest { }); } - @Test public void message_parseFrom_CodedInputStream() { + @Test + public void message_parseFrom_CodedInputStream() { setup(); verifyExceptions( new ParseTester() { @@ -110,7 +113,8 @@ public class ParseExceptionsTest { }); } - @Test public void message_parseFrom_CodedInputStreamAndExtensionRegistry() { + @Test + public void message_parseFrom_CodedInputStreamAndExtensionRegistry() { setup(); verifyExceptions( new ParseTester() { @@ -122,7 +126,8 @@ public class ParseExceptionsTest { }); } - @Test public void message_parseDelimitedFrom_InputStream() { + @Test + public void message_parseDelimitedFrom_InputStream() { setupDelimited(); verifyExceptions( new ParseTester() { @@ -133,7 +138,8 @@ public class ParseExceptionsTest { }); } - @Test public void message_parseDelimitedFrom_InputStreamAndExtensionRegistry() { + @Test + public void message_parseDelimitedFrom_InputStreamAndExtensionRegistry() { setupDelimited(); verifyExceptions( new ParseTester() { @@ -144,7 +150,8 @@ public class ParseExceptionsTest { }); } - @Test public void messageBuilder_mergeFrom_InputStream() { + @Test + public void messageBuilder_mergeFrom_InputStream() { setup(); verifyExceptions( new ParseTester() { @@ -155,7 +162,8 @@ public class ParseExceptionsTest { }); } - @Test public void messageBuilder_mergeFrom_InputStreamAndExtensionRegistry() { + @Test + public void messageBuilder_mergeFrom_InputStreamAndExtensionRegistry() { setup(); verifyExceptions( new ParseTester() { @@ -168,7 +176,8 @@ public class ParseExceptionsTest { }); } - @Test public void messageBuilder_mergeFrom_CodedInputStream() { + @Test + public void messageBuilder_mergeFrom_CodedInputStream() { setup(); verifyExceptions( new ParseTester() { @@ -179,7 +188,8 @@ public class ParseExceptionsTest { }); } - @Test public void messageBuilder_mergeFrom_CodedInputStreamAndExtensionRegistry() { + @Test + public void messageBuilder_mergeFrom_CodedInputStreamAndExtensionRegistry() { setup(); verifyExceptions( new ParseTester() { @@ -192,7 +202,8 @@ public class ParseExceptionsTest { }); } - @Test public void messageBuilder_mergeDelimitedFrom_InputStream() { + @Test + public void messageBuilder_mergeDelimitedFrom_InputStream() { setupDelimited(); verifyExceptions( new ParseTester() { @@ -205,7 +216,8 @@ public class ParseExceptionsTest { }); } - @Test public void messageBuilder_mergeDelimitedFrom_InputStreamAndExtensionRegistry() { + @Test + public void messageBuilder_mergeDelimitedFrom_InputStreamAndExtensionRegistry() { setupDelimited(); verifyExceptions( new ParseTester() { @@ -221,7 +233,8 @@ public class ParseExceptionsTest { private void verifyExceptions(ParseTester parseTester) { // No exception try { - assertEquals(DescriptorProto.getDescriptor().toProto(), + assertEquals( + DescriptorProto.getDescriptor().toProto(), parseTester.parse(new ByteArrayInputStream(serializedProto))); } catch (IOException e) { fail("No exception expected: " + e); @@ -253,14 +266,16 @@ public class ParseExceptionsTest { return new FilterInputStream(i) { int count = 0; - @Override public int read() throws IOException { + @Override + public int read() throws IOException { if (count++ >= 50) { throw new IOException("I'm broken!"); } return super.read(); } - @Override public int read(byte b[], int off, int len) throws IOException { + @Override + public int read(byte[] b, int off, int len) throws IOException { if ((count += len) >= 50) { throw new IOException("I'm broken!"); } |