Index: mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java |
diff --git a/mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java b/mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java |
index 57f2550a6941ca08ed5f768a632b5422acedde8a..ae73aaedc26d839d02908b32dadc52a95841fa3a 100644 |
--- a/mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java |
+++ b/mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java |
@@ -7,7 +7,6 @@ package org.chromium.mojo.bindings; |
import android.test.suitebuilder.annotation.SmallTest; |
import org.chromium.mojo.MojoTestCase; |
-import org.chromium.mojo.TestUtils; |
import org.chromium.mojo.bindings.BindingsTestUtils.CapturingErrorHandler; |
import org.chromium.mojo.bindings.BindingsTestUtils.RecordingMessageReceiver; |
import org.chromium.mojo.system.Core; |
@@ -31,7 +30,7 @@ public class ConnectorTest extends MojoTestCase { |
private MessagePipeHandle mHandle; |
private Connector mConnector; |
- private Message mTestMessage; |
+ private MessageWithHeader mTestMessage; |
private RecordingMessageReceiver mReceiver; |
private CapturingErrorHandler mErrorHandler; |
@@ -50,7 +49,7 @@ public class ConnectorTest extends MojoTestCase { |
mErrorHandler = new CapturingErrorHandler(); |
mConnector.setErrorHandler(mErrorHandler); |
mConnector.start(); |
- mTestMessage = new Message(TestUtils.newRandomBuffer(DATA_LENGTH), new ArrayList<Handle>()); |
+ mTestMessage = BindingsTestUtils.newRandomMessageWithHeader(DATA_LENGTH); |
assertNull(mErrorHandler.exception); |
assertEquals(0, mReceiver.messages.size()); |
} |
@@ -77,7 +76,7 @@ public class ConnectorTest extends MojoTestCase { |
MessagePipeHandle.ReadFlags.NONE); |
assertEquals(MojoResult.OK, result.getMojoResult()); |
assertEquals(DATA_LENGTH, result.getMessageSize()); |
- assertEquals(mTestMessage.buffer, received); |
+ assertEquals(mTestMessage.getMessage().buffer, received); |
} |
/** |
@@ -85,14 +84,14 @@ public class ConnectorTest extends MojoTestCase { |
*/ |
@SmallTest |
public void testReceivingMessage() { |
- mHandle.writeMessage(mTestMessage.buffer, new ArrayList<Handle>(), |
+ mHandle.writeMessage(mTestMessage.getMessage().buffer, new ArrayList<Handle>(), |
MessagePipeHandle.WriteFlags.NONE); |
nativeRunLoop(RUN_LOOP_TIMEOUT_MS); |
assertNull(mErrorHandler.exception); |
assertEquals(1, mReceiver.messages.size()); |
- Message received = mReceiver.messages.get(0); |
- assertEquals(0, received.handles.size()); |
- assertEquals(mTestMessage.buffer, received.buffer); |
+ MessageWithHeader received = mReceiver.messages.get(0); |
+ assertEquals(0, received.getMessage().handles.size()); |
+ assertEquals(mTestMessage.getMessage().buffer, received.getMessage().buffer); |
} |
/** |