Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix unit test for DevicePolicyManager"

Browse Source
This commit is contained in:
Oscar Shu
2018-12-15 20:47:33 +00:00
committed by Android (Google) Code Review
parent eabdf59585 425b9a6cbf
commit 7fa540e0ed
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
View File

@@ -72,7 +72,6 @@ import android.content.pm.StringParceledListSlice;
import android.content.pm.UserInfo;
import android.graphics.Color;
import android.net.Uri;
import android.net.wifi.WifiInfo;
import android.os.Build.VERSION_CODES;
import android.os.Bundle;
import android.os.Process;
@@ -1989,17 +1988,16 @@ public class DevicePolicyManagerTest extends DpmTestBase {
// Test 4, Caller is DO now.
assertTrue(dpm.setDeviceOwner(admin1, null, UserHandle.USER_SYSTEM));
// 4-1. But no WifiInfo.
// 4-1. But WifiManager is not ready.
assertNull(dpm.getWifiMacAddress(admin1));
// 4-2. Returns WifiInfo, but with the default MAC.
when(getServices().wifiManager.getConnectionInfo()).thenReturn(new WifiInfo());
// 4-2. When WifiManager returns an empty array, dpm should also output null.
when(getServices().wifiManager.getFactoryMacAddresses()).thenReturn(new String[0]);
assertNull(dpm.getWifiMacAddress(admin1));
// 4-3. With a real MAC address.
final WifiInfo wi = new WifiInfo();
wi.setMacAddress("11:22:33:44:55:66");
when(getServices().wifiManager.getConnectionInfo()).thenReturn(wi);
final String[] macAddresses = new String[]{"11:22:33:44:55:66"};
when(getServices().wifiManager.getFactoryMacAddresses()).thenReturn(macAddresses);
assertEquals("11:22:33:44:55:66", dpm.getWifiMacAddress(admin1));
}