diff options
| author | Rebecca Silberstein <silberst@google.com> | 2016-05-26 15:05:13 -0700 |
|---|---|---|
| committer | Rebecca Silberstein <silberst@google.com> | 2016-05-27 14:59:57 -0700 |
| commit | 11ad3437e833ead2c7c235f173824db16ee4ea02 (patch) | |
| tree | e90ffb1832ff527c77edf9fc00040b996e375caf /tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java | |
| parent | ddd09bbe798f9fb257bb9c73649bee3bd77fb469 (diff) | |
| download | android_frameworks_opt_net_wifi-11ad3437e833ead2c7c235f173824db16ee4ea02.tar.gz android_frameworks_opt_net_wifi-11ad3437e833ead2c7c235f173824db16ee4ea02.tar.bz2 android_frameworks_opt_net_wifi-11ad3437e833ead2c7c235f173824db16ee4ea02.zip | |
WifiLastResortWatchdog: reset wifi on trigger
Added wifi reset on WifiLastResortTrigger. The reset is implemented by
sending the CMD_RESTART_WIFI message to WifiController.
BUG: 27856267
Change-Id: Icb7c3a211afcd234cfcd25a42665aed03c33f5e1
Diffstat (limited to 'tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java b/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java index 64f1ce0fd..237fc666d 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiLastResortWatchdogTest.java @@ -19,6 +19,7 @@ package com.android.server.wifi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.*; +import static org.mockito.MockitoAnnotations.*; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiSsid; @@ -27,6 +28,7 @@ import android.util.Pair; import org.junit.Before; import org.junit.Test; +import org.mockito.Mock; import java.util.ArrayList; import java.util.Arrays; @@ -38,7 +40,8 @@ import java.util.List; @SmallTest public class WifiLastResortWatchdogTest { WifiLastResortWatchdog mLastResortWatchdog; - WifiMetrics mWifiMetrics; + @Mock WifiMetrics mWifiMetrics; + @Mock WifiController mWifiController; private String[] mSsids = {"\"test1\"", "\"test2\"", "\"test3\"", "\"test4\""}; private String[] mBssids = {"6c:f3:7f:ae:8c:f3", "6c:f3:7f:ae:8c:f4", "de:ad:ba:b1:e5:55", "c0:ff:ee:ee:e3:ee"}; @@ -51,8 +54,9 @@ public class WifiLastResortWatchdogTest { @Before public void setUp() throws Exception { - mWifiMetrics = mock(WifiMetrics.class); + initMocks(this); mLastResortWatchdog = new WifiLastResortWatchdog(mWifiMetrics); + mLastResortWatchdog.setWifiController(mWifiController); } private List<Pair<ScanDetail, WifiConfiguration>> createFilteredQnsCandidates(String[] ssids, @@ -1276,6 +1280,8 @@ public class WifiLastResortWatchdogTest { ssids[ssids.length - 1], bssids[ssids.length - 1], WifiLastResortWatchdog.FAILURE_CODE_ASSOCIATION); assertEquals(true, watchdogTriggered); + verify(mWifiController).sendMessage(WifiController.CMD_RESTART_WIFI); + reset(mWifiController); } /** |