Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(484)

Unified Diff: third_party/protobuf/java/core/src/test/java/com/google/protobuf/ParserTest.java

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/protobuf/java/core/src/test/java/com/google/protobuf/ParserTest.java
diff --git a/third_party/protobuf/java/core/src/test/java/com/google/protobuf/ParserTest.java b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/ParserTest.java
index 8c2e4c261c0e1367b6d65a03286ca829a88ff143..30842d2c0833fc13b91bd65a87f45274ad115091 100644
--- a/third_party/protobuf/java/core/src/test/java/com/google/protobuf/ParserTest.java
+++ b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/ParserTest.java
@@ -42,12 +42,13 @@ import protobuf_unittest.UnittestProto.TestAllTypes;
import protobuf_unittest.UnittestProto.TestEmptyMessage;
import protobuf_unittest.UnittestProto.TestParsingMerge;
import protobuf_unittest.UnittestProto.TestRequired;
+
+import junit.framework.TestCase;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InterruptedIOException;
-import junit.framework.TestCase;
/**
* Unit test for {@link Parser}.
@@ -373,43 +374,4 @@ public class ParserTest extends TestCase {
assertEquals(3, parsingMerge.getExtensionCount(
TestParsingMergeLite.repeatedExt));
}
-
- public void testParseDelimitedFrom_firstByteInterrupted_preservesCause() {
- try {
- TestUtil.getAllSet().parseDelimitedFrom(
- new InputStream() {
- @Override
- public int read() throws IOException {
- throw new InterruptedIOException();
- }
- });
- fail("Expected InterruptedIOException");
- } catch (Exception e) {
- assertEquals(InterruptedIOException.class, e.getClass());
- }
- }
-
- public void testParseDelimitedFrom_secondByteInterrupted_preservesCause() {
- try {
- TestUtil.getAllSet().parseDelimitedFrom(
- new InputStream() {
- private int i;
-
- @Override
- public int read() throws IOException {
- switch (i++) {
- case 0:
- return 1;
- case 1:
- throw new InterruptedIOException();
- default:
- throw new AssertionError();
- }
- }
- });
- fail("Expected InterruptedIOException");
- } catch (Exception e) {
- assertEquals(InterruptedIOException.class, e.getClass());
- }
- }
}

Powered by Google App Engine
This is Rietveld 408576698