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

Merge "Fix DevicePolicyManagerServiceMigrationTest" into rvc-dev

Browse Source
This commit is contained in:
Rubin Xu
2020-02-28 20:16:23 +00:00
committed by Android (Google) Code Review
parent b4c187f5ce e07acdd3bf
commit 099d56392f
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,14 +39,13 @@ import androidx.test.filters.SmallTest;
import com.android.frameworks.servicestests.R; import com.android.frameworks.servicestests.R;
import com.android.server.LocalServices; import com.android.server.LocalServices;
import com.android.server.SystemService; import com.android.server.SystemService;
import com.android.server.devicepolicy.DevicePolicyManagerServiceTestable.OwnersTestable;
import java.io.File; import java.io.File;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
// TODO (b/149818286): Fix old test cases and put the whole test into presubmit. @Presubmit
public class DevicePolicyManagerServiceMigrationTest extends DpmTestBase { public class DevicePolicyManagerServiceMigrationTest extends DpmTestBase {
private static final String USER_TYPE_EMPTY = ""; private static final String USER_TYPE_EMPTY = "";
@@ -78,7 +77,7 @@ public class DevicePolicyManagerServiceMigrationTest extends DpmTestBase {
// Create the legacy owners & policies file. // Create the legacy owners & policies file.
DpmTestUtils.writeToFile( DpmTestUtils.writeToFile(
(new File(getServices().dataDir, OwnersTestable.LEGACY_FILE)).getAbsoluteFile(), (new File(getServices().dataDir, "device_owner.xml")).getAbsoluteFile(),
DpmTestUtils.readAsset(mRealTestContext, DpmTestUtils.readAsset(mRealTestContext,
"DevicePolicyManagerServiceMigrationTest/legacy_device_owner.xml")); "DevicePolicyManagerServiceMigrationTest/legacy_device_owner.xml"));
@@ -193,8 +192,7 @@ public class DevicePolicyManagerServiceMigrationTest extends DpmTestBase {
// Check the new owner restrictions. // Check the new owner restrictions.
DpmTestUtils.assertRestrictions( DpmTestUtils.assertRestrictions(
DpmTestUtils.newRestrictions( DpmTestUtils.newRestrictions(
UserManager.DISALLOW_ADD_USER, UserManager.DISALLOW_ADD_USER
UserManager.DISALLOW_ADD_MANAGED_PROFILE
), ),
dpms.getDeviceOwnerAdminLocked().ensureUserRestrictions()); dpms.getDeviceOwnerAdminLocked().ensureUserRestrictions());
@@ -216,7 +214,7 @@ public class DevicePolicyManagerServiceMigrationTest extends DpmTestBase {
// Create the legacy owners & policies file. // Create the legacy owners & policies file.
DpmTestUtils.writeToFile( DpmTestUtils.writeToFile(
(new File(getServices().dataDir, OwnersTestable.LEGACY_FILE)).getAbsoluteFile(), (new File(getServices().dataDir, "device_owner.xml")).getAbsoluteFile(),
DpmTestUtils.readAsset(mRealTestContext, DpmTestUtils.readAsset(mRealTestContext,
"DevicePolicyManagerServiceMigrationTest2/legacy_device_owner.xml")); "DevicePolicyManagerServiceMigrationTest2/legacy_device_owner.xml"));
@@ -346,7 +344,6 @@ public class DevicePolicyManagerServiceMigrationTest extends DpmTestBase {
assertTrue(alreadySet.contains(UserManager.DISALLOW_BLUETOOTH_SHARING)); assertTrue(alreadySet.contains(UserManager.DISALLOW_BLUETOOTH_SHARING));
} }
@Presubmit
@SmallTest @SmallTest
public void testCompMigrationUnAffiliated_skipped() throws Exception { public void testCompMigrationUnAffiliated_skipped() throws Exception {
prepareAdmin1AsDo(); prepareAdmin1AsDo();
@@ -359,7 +356,6 @@ public class DevicePolicyManagerServiceMigrationTest extends DpmTestBase {
assertTrue(dpms.mOwners.hasDeviceOwner()); assertTrue(dpms.mOwners.hasDeviceOwner());
} }
@Presubmit
@SmallTest @SmallTest
public void testCompMigrationAffiliated() throws Exception { public void testCompMigrationAffiliated() throws Exception {
prepareAdmin1AsDo(); prepareAdmin1AsDo();

1
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerServiceTestable.java
View File

@@ -66,7 +66,6 @@ public class DevicePolicyManagerServiceTestable extends DevicePolicyManagerServi
* Overrides {@link #Owners} for dependency injection. * Overrides {@link #Owners} for dependency injection.
*/ */
public static class OwnersTestable extends Owners { public static class OwnersTestable extends Owners {
public static final String LEGACY_FILE = "legacy.xml";
public OwnersTestable(MockSystemServices services) { public OwnersTestable(MockSystemServices services) {
super(services.userManager, services.userManagerInternal, super(services.userManager, services.userManagerInternal,