diff options
| author | Etan Cohen <etancohen@google.com> | 2016-01-26 08:52:55 -0800 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2016-01-27 09:46:23 -0800 |
| commit | 2e09c384f5ce86061b115f20fe3ca75a175d87f0 (patch) | |
| tree | ee25dca25e77a6690e686c414b3b1024a1ff0553 /tests | |
| parent | 7be46e76ac639934f19e84f897cbe8b698e56dff (diff) | |
NAN: add message ID to correlate message callbacks to original message
Add message ID to be specified by caller to each message. Same message ID
is provided back in callbacks indicating message send success or failure.
Message ID is purely used as a caller-side object - the service doesn't use
the contents in any way.
Bug: 26769293
Change-Id: Ib1243f42473ecbd616a6c620d2fff4aa9d3a0d73
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/nan/WifiNanStateManagerTest.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/nan/WifiNanStateManagerTest.java b/tests/wifitests/src/com/android/server/wifi/nan/WifiNanStateManagerTest.java index 9cc09170a..a3dd6dd80 100644 --- a/tests/wifitests/src/com/android/server/wifi/nan/WifiNanStateManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/nan/WifiNanStateManagerTest.java @@ -421,6 +421,7 @@ public class WifiNanStateManagerTest { final String peerSsi = "some peer ssi data"; final String peerMatchFilter = "filter binary array represented as string"; final String peerMsg = "some message from peer"; + final int messageId = 6948; SubscribeData.Builder dataBuilder = new SubscribeData.Builder(); dataBuilder.setServiceName(serviceName).setServiceSpecificInfo(ssi); @@ -464,7 +465,7 @@ public class WifiNanStateManagerTest { inOrder.verify(mockListener).onMessageReceived(requestorId, peerMsg.getBytes(), peerMsg.length()); - mDut.sendMessage(uid, sessionId, requestorId, ssi.getBytes(), ssi.length()); + mDut.sendMessage(uid, sessionId, requestorId, ssi.getBytes(), ssi.length(), messageId); mMockLooper.dispatchAll(); inOrder.verify(mMockNative).sendMessage(transactionId.capture(), eq(subscribeId), @@ -473,9 +474,9 @@ public class WifiNanStateManagerTest { mDut.onMessageSendFail(transactionId.getValue(), reasonFail); mMockLooper.dispatchAll(); - inOrder.verify(mockListener).onMessageSendFail(reasonFail); + inOrder.verify(mockListener).onMessageSendFail(messageId, reasonFail); - mDut.sendMessage(uid, sessionId, requestorId, ssi.getBytes(), ssi.length()); + mDut.sendMessage(uid, sessionId, requestorId, ssi.getBytes(), ssi.length(), messageId); mMockLooper.dispatchAll(); inOrder.verify(mMockNative).sendMessage(transactionId.capture(), eq(subscribeId), @@ -484,7 +485,7 @@ public class WifiNanStateManagerTest { mDut.onMessageSendSuccess(transactionId.getValue()); mMockLooper.dispatchAll(); - inOrder.verify(mockListener).onMessageSendSuccess(); + inOrder.verify(mockListener).onMessageSendSuccess(messageId); verifyNoMoreInteractions(mockListener, mMockNative); } |