summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGlen Kuhne <kuh@google.com>2016-02-26 18:07:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-02-26 18:07:42 +0000
commit52da3dd6345bb068b0f0ec8fd6a749b2ee977d89 (patch)
tree1a0c3b5eed56d3fe30cb77df169f668dd5c80b88 /tests
parent590b0d9b7879a4d7f24a057603ac82f30aff80f4 (diff)
parent2bdcccb7badf35e9e00ea0b3b8e315f3f77af86a (diff)
Merge "Add makeWifiConfigManager() to FacadeFramework" into mm-wireless-dev
am: 2bdcccb7ba * commit '2bdcccb7badf35e9e00ea0b3b8e315f3f77af86a': Add makeWifiConfigManager() to FacadeFramework
Diffstat (limited to 'tests')
-rw-r--r--tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index 92a80372b..74388ce6b 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -196,6 +196,17 @@ public class WifiStateMachineTest {
when(facade.checkUidPermission(eq(android.Manifest.permission.OVERRIDE_WIFI_CONFIG),
anyInt())).thenReturn(PackageManager.PERMISSION_GRANTED);
+ when(facade.makeWifiConfigManager(any(Context.class), any(WifiStateMachine.class),
+ any(WifiNative.class), any(FrameworkFacade.class), any(Clock.class),
+ any(UserManager.class))).then(new AnswerWithArguments() {
+ public WifiConfigManager answer(Context context, WifiStateMachine wifiStateMachine,
+ WifiNative wifiNative, FrameworkFacade frameworkFacade, Clock clock,
+ UserManager userManager){
+ mWifiConfigManager = new WifiConfigManager(context, wifiStateMachine, wifiNative,
+ frameworkFacade, clock, userManager);
+ return mWifiConfigManager;
+ }
+ });
return facade;
}
@@ -298,6 +309,7 @@ public class WifiStateMachineTest {
MockWifiMonitor mWifiMonitor;
TestIpManager mTestIpManager;
MockLooper mLooper;
+ WifiConfigManager mWifiConfigManager;
@Mock WifiNative mWifiNative;
@Mock SupplicantStateTracker mSupplicantStateTracker;