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

Unified Diff: third_party/protobuf/conformance/ConformanceJava.java

Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months 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
« no previous file with comments | « third_party/protobuf/configure.ac ('k') | third_party/protobuf/conformance/Makefile.am » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/conformance/ConformanceJava.java
diff --git a/third_party/protobuf/conformance/ConformanceJava.java b/third_party/protobuf/conformance/ConformanceJava.java
deleted file mode 100644
index 25646b8516feacbc86a495cd1f09f90e6a065e0b..0000000000000000000000000000000000000000
--- a/third_party/protobuf/conformance/ConformanceJava.java
+++ /dev/null
@@ -1,120 +0,0 @@
-
-import com.google.protobuf.conformance.Conformance;
-import com.google.protobuf.InvalidProtocolBufferException;
-
-class ConformanceJava {
- private int testCount = 0;
-
- private boolean readFromStdin(byte[] buf, int len) throws Exception {
- int ofs = 0;
- while (len > 0) {
- int read = System.in.read(buf, ofs, len);
- if (read == -1) {
- return false; // EOF
- }
- ofs += read;
- len -= read;
- }
-
- return true;
- }
-
- private void writeToStdout(byte[] buf) throws Exception {
- System.out.write(buf);
- }
-
- // Returns -1 on EOF (the actual values will always be positive).
- private int readLittleEndianIntFromStdin() throws Exception {
- byte[] buf = new byte[4];
- if (!readFromStdin(buf, 4)) {
- return -1;
- }
- return buf[0] | (buf[1] << 1) | (buf[2] << 2) | (buf[3] << 3);
- }
-
- private void writeLittleEndianIntToStdout(int val) throws Exception {
- byte[] buf = new byte[4];
- buf[0] = (byte)val;
- buf[1] = (byte)(val >> 8);
- buf[2] = (byte)(val >> 16);
- buf[3] = (byte)(val >> 24);
- writeToStdout(buf);
- }
-
- private Conformance.ConformanceResponse doTest(Conformance.ConformanceRequest request) {
- Conformance.TestAllTypes testMessage;
-
- switch (request.getPayloadCase()) {
- case PROTOBUF_PAYLOAD: {
- try {
- testMessage = Conformance.TestAllTypes.parseFrom(request.getProtobufPayload());
- } catch (InvalidProtocolBufferException e) {
- return Conformance.ConformanceResponse.newBuilder().setParseError(e.getMessage()).build();
- }
- break;
- }
- case JSON_PAYLOAD: {
- return Conformance.ConformanceResponse.newBuilder().setSkipped("JSON not yet supported.").build();
- }
- case PAYLOAD_NOT_SET: {
- throw new RuntimeException("Request didn't have payload.");
- }
-
- default: {
- throw new RuntimeException("Unexpected payload case.");
- }
- }
-
- switch (request.getRequestedOutputFormat()) {
- case UNSPECIFIED:
- throw new RuntimeException("Unspecified output format.");
-
- case PROTOBUF:
- return Conformance.ConformanceResponse.newBuilder().setProtobufPayload(testMessage.toByteString()).build();
-
- case JSON:
- return Conformance.ConformanceResponse.newBuilder().setSkipped("JSON not yet supported.").build();
-
- default: {
- throw new RuntimeException("Unexpected request output.");
- }
- }
- }
-
- private boolean doTestIo() throws Exception {
- int bytes = readLittleEndianIntFromStdin();
-
- if (bytes == -1) {
- return false; // EOF
- }
-
- byte[] serializedInput = new byte[bytes];
-
- if (!readFromStdin(serializedInput, bytes)) {
- throw new RuntimeException("Unexpected EOF from test program.");
- }
-
- Conformance.ConformanceRequest request =
- Conformance.ConformanceRequest.parseFrom(serializedInput);
- Conformance.ConformanceResponse response = doTest(request);
- byte[] serializedOutput = response.toByteArray();
-
- writeLittleEndianIntToStdout(serializedOutput.length);
- writeToStdout(serializedOutput);
-
- return true;
- }
-
- public void run() throws Exception {
- while (doTestIo()) {
- // Empty.
- }
-
- System.err.println("ConformanceJava: received EOF from test runner after " +
- this.testCount + " tests");
- }
-
- public static void main(String[] args) throws Exception {
- new ConformanceJava().run();
- }
-}
« no previous file with comments | « third_party/protobuf/configure.ac ('k') | third_party/protobuf/conformance/Makefile.am » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698