diff options
| author | Etan Cohen <etancohen@google.com> | 2016-01-28 18:36:29 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2016-01-28 18:36:29 +0000 |
| commit | d3efa09daa49ad39ed1f6920388e9ba63c8e271b (patch) | |
| tree | b5fe256ad3835de027be04227c7a201824b2e0f0 /tests | |
| parent | 27d23f166b1f33e4991cf56ca20bfe382dfcb408 (diff) | |
| parent | 2e09c384f5ce86061b115f20fe3ca75a175d87f0 (diff) | |
Merge "NAN: add message ID to correlate message callbacks to original message" into mm-wireless-dev
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); } |