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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/android/javatests/src/org/chromium/mojo/system/impl/CoreImplTest.java

Issue 1057213003: Java: Introduce ResultAnd<> and use it. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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 | « mojo/android/javatests/src/org/chromium/mojo/bindings/RouterTest.java ('k') | mojo/android/system/core_impl.cc » ('j') | mojo/public/java/system/src/org/chromium/mojo/system/ResultAnd.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/android/javatests/src/org/chromium/mojo/system/impl/CoreImplTest.java
diff --git a/mojo/android/javatests/src/org/chromium/mojo/system/impl/CoreImplTest.java b/mojo/android/javatests/src/org/chromium/mojo/system/impl/CoreImplTest.java
index f03f70bf03fc8a30b626fcc872518460861e98e1..c9cd084d4cb4b789fb30db3d4395224499c49dc2 100644
--- a/mojo/android/javatests/src/org/chromium/mojo/system/impl/CoreImplTest.java
+++ b/mojo/android/javatests/src/org/chromium/mojo/system/impl/CoreImplTest.java
@@ -22,6 +22,7 @@ import org.chromium.mojo.system.MessagePipeHandle;
import org.chromium.mojo.system.MojoException;
import org.chromium.mojo.system.MojoResult;
import org.chromium.mojo.system.Pair;
+import org.chromium.mojo.system.ResultAnd;
import org.chromium.mojo.system.SharedBufferHandle;
import java.nio.ByteBuffer;
@@ -106,21 +107,21 @@ public class CoreImplTest extends MojoTestCase {
// Try to read into a small buffer.
ByteBuffer receiveBuffer = ByteBuffer.allocateDirect(bytes.length / 2);
- MessagePipeHandle.ReadMessageResult result =
+ ResultAnd<MessagePipeHandle.ReadMessageResult> result =
out.readMessage(receiveBuffer, 0, MessagePipeHandle.ReadFlags.NONE);
assertEquals(MojoResult.RESOURCE_EXHAUSTED, result.getMojoResult());
- assertEquals(bytes.length, result.getMessageSize());
- assertEquals(0, result.getHandlesCount());
+ assertEquals(bytes.length, result.getValue().getMessageSize());
+ assertEquals(0, result.getValue().getHandlesCount());
// Read into a correct buffer.
receiveBuffer = ByteBuffer.allocateDirect(bytes.length);
result = out.readMessage(receiveBuffer, 0, MessagePipeHandle.ReadFlags.NONE);
assertEquals(MojoResult.OK, result.getMojoResult());
- assertEquals(bytes.length, result.getMessageSize());
- assertEquals(0, result.getHandlesCount());
+ assertEquals(bytes.length, result.getValue().getMessageSize());
+ assertEquals(0, result.getValue().getHandlesCount());
assertEquals(0, receiveBuffer.position());
- assertEquals(result.getMessageSize(), receiveBuffer.limit());
- byte[] receivedBytes = new byte[result.getMessageSize()];
+ assertEquals(result.getValue().getMessageSize(), receiveBuffer.limit());
+ byte[] receivedBytes = new byte[result.getValue().getMessageSize()];
receiveBuffer.get(receivedBytes);
assertTrue(Arrays.equals(bytes, receivedBytes));
}
@@ -133,18 +134,20 @@ public class CoreImplTest extends MojoTestCase {
random.nextBytes(bytes);
ByteBuffer buffer = ByteBuffer.allocateDirect(bytes.length);
buffer.put(bytes);
- int result = in.writeData(buffer, DataPipe.WriteFlags.NONE);
- assertEquals(bytes.length, result);
+ ResultAnd<Integer> result = in.writeData(buffer, DataPipe.WriteFlags.NONE);
+ assertEquals(MojoResult.OK, result.getMojoResult());
+ assertEquals(bytes.length, result.getValue().intValue());
// Query number of bytes available.
- result = out.readData(null, DataPipe.ReadFlags.none().query(true));
- assertEquals(bytes.length, result);
+ ResultAnd<Integer> readResult = out.readData(null, DataPipe.ReadFlags.none().query(true));
+ assertEquals(MojoResult.OK, readResult.getMojoResult());
+ assertEquals(bytes.length, readResult.getValue().intValue());
// Peek data into a buffer.
ByteBuffer peekBuffer = ByteBuffer.allocateDirect(bytes.length);
- result = out.readData(peekBuffer, DataPipe.ReadFlags.none().peek(true));
- assertEquals(bytes.length, result);
- assertEquals(0, peekBuffer.position());
+ readResult = out.readData(peekBuffer, DataPipe.ReadFlags.none().peek(true));
+ assertEquals(MojoResult.OK, readResult.getMojoResult());
+ assertEquals(bytes.length, readResult.getValue().intValue());
assertEquals(bytes.length, peekBuffer.limit());
byte[] peekBytes = new byte[bytes.length];
peekBuffer.get(peekBytes);
@@ -152,8 +155,9 @@ public class CoreImplTest extends MojoTestCase {
// Read into a buffer.
ByteBuffer receiveBuffer = ByteBuffer.allocateDirect(bytes.length);
- result = out.readData(receiveBuffer, DataPipe.ReadFlags.NONE);
- assertEquals(bytes.length, result);
+ readResult = out.readData(receiveBuffer, DataPipe.ReadFlags.NONE);
+ assertEquals(MojoResult.OK, readResult.getMojoResult());
+ assertEquals(bytes.length, readResult.getValue().intValue());
assertEquals(0, receiveBuffer.position());
assertEquals(bytes.length, receiveBuffer.limit());
byte[] receivedBytes = new byte[bytes.length];
@@ -294,7 +298,7 @@ public class CoreImplTest extends MojoTestCase {
assertEquals(ALL_SIGNALS, waitResult.getHandleSignalsState().getSatisfiableSignals());
// Testing read on an empty pipe.
- MessagePipeHandle.ReadMessageResult readResult =
+ ResultAnd<MessagePipeHandle.ReadMessageResult> readResult =
handles.first.readMessage(null, 0, MessagePipeHandle.ReadFlags.NONE);
assertEquals(MojoResult.SHOULD_WAIT, readResult.getMojoResult());
@@ -353,11 +357,11 @@ public class CoreImplTest extends MojoTestCase {
handles.first.writeMessage(buffer, null, MessagePipeHandle.WriteFlags.NONE);
ByteBuffer receiveBuffer = ByteBuffer.allocateDirect(1);
- MessagePipeHandle.ReadMessageResult result =
+ ResultAnd<MessagePipeHandle.ReadMessageResult> result =
handles.second.readMessage(receiveBuffer, 0, MessagePipeHandle.ReadFlags.NONE);
assertEquals(MojoResult.RESOURCE_EXHAUSTED, result.getMojoResult());
- assertEquals(bytes.length, result.getMessageSize());
- assertEquals(0, result.getHandlesCount());
+ assertEquals(bytes.length, result.getValue().getMessageSize());
+ assertEquals(0, result.getValue().getHandlesCount());
}
/**
@@ -374,10 +378,11 @@ public class CoreImplTest extends MojoTestCase {
handles.first.writeMessage(null, Collections.<Handle>singletonList(handlesToShare.second),
MessagePipeHandle.WriteFlags.NONE);
assertFalse(handlesToShare.second.isValid());
- MessagePipeHandle.ReadMessageResult readMessageResult =
+ ResultAnd<MessagePipeHandle.ReadMessageResult> readMessageResult =
handles.second.readMessage(null, 1, MessagePipeHandle.ReadFlags.NONE);
- assertEquals(1, readMessageResult.getHandlesCount());
- MessagePipeHandle newHandle = readMessageResult.getHandles().get(0).toMessagePipeHandle();
+ assertEquals(1, readMessageResult.getValue().getHandlesCount());
+ MessagePipeHandle newHandle =
+ readMessageResult.getValue().getHandles().get(0).toMessagePipeHandle();
addHandleToClose(newHandle);
assertTrue(newHandle.isValid());
checkSendingMessage(handlesToShare.first, newHandle);
@@ -465,8 +470,9 @@ public class CoreImplTest extends MojoTestCase {
random.nextBytes(bytes);
ByteBuffer buffer = ByteBuffer.allocateDirect(bytes.length);
buffer.put(bytes);
- int result = handles.first.writeData(buffer, DataPipe.WriteFlags.NONE);
- assertEquals(bytes.length, result);
+ ResultAnd<Integer> result = handles.first.writeData(buffer, DataPipe.WriteFlags.NONE);
+ assertEquals(MojoResult.OK, result.getMojoResult());
+ assertEquals(bytes.length, result.getValue().intValue());
// Discard bytes.
final int nbBytesToDiscard = 4;
@@ -475,8 +481,10 @@ public class CoreImplTest extends MojoTestCase {
// Read into a buffer.
ByteBuffer receiveBuffer = ByteBuffer.allocateDirect(bytes.length - nbBytesToDiscard);
- result = handles.second.readData(receiveBuffer, DataPipe.ReadFlags.NONE);
- assertEquals(bytes.length - nbBytesToDiscard, result);
+ ResultAnd<Integer> readResult =
+ handles.second.readData(receiveBuffer, DataPipe.ReadFlags.NONE);
+ assertEquals(MojoResult.OK, readResult.getMojoResult());
+ assertEquals(bytes.length - nbBytesToDiscard, readResult.getValue().intValue());
assertEquals(0, receiveBuffer.position());
assertEquals(bytes.length - nbBytesToDiscard, receiveBuffer.limit());
byte[] receivedBytes = new byte[bytes.length - nbBytesToDiscard];
@@ -567,10 +575,10 @@ public class CoreImplTest extends MojoTestCase {
try {
handles.first.writeMessage(null, Collections.<Handle>singletonList(handle),
MessagePipeHandle.WriteFlags.NONE);
- MessagePipeHandle.ReadMessageResult readMessageResult =
+ ResultAnd<MessagePipeHandle.ReadMessageResult> readMessageResult =
handles.second.readMessage(null, 1, MessagePipeHandle.ReadFlags.NONE);
- assertEquals(1, readMessageResult.getHandlesCount());
- assertFalse(readMessageResult.getHandles().get(0).isValid());
+ assertEquals(1, readMessageResult.getValue().getHandlesCount());
+ assertFalse(readMessageResult.getValue().getHandles().get(0).isValid());
} catch (MojoException e) {
assertEquals(MojoResult.INVALID_ARGUMENT, e.getMojoResult());
}
« no previous file with comments | « mojo/android/javatests/src/org/chromium/mojo/bindings/RouterTest.java ('k') | mojo/android/system/core_impl.cc » ('j') | mojo/public/java/system/src/org/chromium/mojo/system/ResultAnd.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698