diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-13 02:40:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-13 02:40:40 +0000 |
| commit | 6abf3c0c866f93ca91c52559283d6ff33abdd295 (patch) | |
| tree | 57beef3991c15b5f4ce77fb8ab226494a718455f /tests | |
| parent | 824a8335fbb551cc07755aec6f28ecc389815478 (diff) | |
| parent | d5a56317c4697aab6fc8c277ba33dbce6542db79 (diff) | |
Merge changes Ie40bfecf,I26352317 into oc-dev
* changes:
SupplicantP2pIfaceCallback: Remove quotes around network name
SupplicantStaIfaceHal: Change the order of broadcasts
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java | 7 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java b/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java index f1897c8b2..74bdfa1c2 100644 --- a/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStaIfaceHalTest.java @@ -898,6 +898,7 @@ public class SupplicantStaIfaceHalTest { */ @Test public void testStateChangeToCompletedCallback() throws Exception { + InOrder wifiMonitorInOrder = inOrder(mWifiMonitor); executeAndValidateInitializationSequence(); int frameworkNetworkId = 6; executeAndValidateConnectSequence(frameworkNetworkId, false); @@ -908,11 +909,11 @@ public class SupplicantStaIfaceHalTest { NativeUtil.macAddressToByteArray(BSSID), SUPPLICANT_NETWORK_ID, NativeUtil.decodeSsid(SUPPLICANT_SSID)); - verify(mWifiMonitor).broadcastSupplicantStateChangeEvent( + wifiMonitorInOrder.verify(mWifiMonitor).broadcastNetworkConnectionEvent( + eq(WLAN_IFACE_NAME), eq(frameworkNetworkId), eq(BSSID)); + wifiMonitorInOrder.verify(mWifiMonitor).broadcastSupplicantStateChangeEvent( eq(WLAN_IFACE_NAME), eq(frameworkNetworkId), any(WifiSsid.class), eq(BSSID), eq(SupplicantState.COMPLETED)); - verify(mWifiMonitor).broadcastNetworkConnectionEvent( - eq(WLAN_IFACE_NAME), eq(frameworkNetworkId), eq(BSSID)); } /** diff --git a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java index ff39a203e..ec1d43364 100644 --- a/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java +++ b/tests/wifitests/src/com/android/server/wifi/p2p/SupplicantP2pIfaceCallbackTest.java @@ -18,12 +18,10 @@ package com.android.server.wifi.p2p; import static org.junit.Assert.*; import static org.mockito.Matchers.*; import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import android.app.test.MockAnswerUtil.AnswerWithArguments; import android.hardware.wifi.supplicant.V1_0.ISupplicantP2pIfaceCallback; @@ -33,15 +31,12 @@ import android.net.wifi.p2p.WifiP2pConfig; import android.net.wifi.p2p.WifiP2pDevice; import android.net.wifi.p2p.WifiP2pGroup; import android.net.wifi.p2p.WifiP2pProvDiscEvent; -import android.net.wifi.p2p.WifiP2pWfdInfo; import org.junit.Assert.*; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.mockito.stubbing.Answer; import java.util.ArrayList; import java.util.HashSet; @@ -295,7 +290,7 @@ public class SupplicantP2pIfaceCallbackTest { add((byte)0x32); add((byte)0x33); }}; - String fakeSsidString = "\"0123\""; + String fakeSsidString = "0123"; HashSet<String> passwords = new HashSet<String>(); doAnswer(new AnswerWithArguments() { |