diff options
| author | Winson <chiuwinson@google.com> | 2020-01-24 12:02:58 -0800 |
|---|---|---|
| committer | Winson <chiuwinson@google.com> | 2020-02-19 08:22:50 -0800 |
| commit | 33eacc6c05f52e12990e54b61e1534d6ee794961 (patch) | |
| tree | aad5ab26053bedd19ef10cdc2a4f2711944a2c91 /services/robotests/src | |
| parent | 5e0a1d5ce22e5b627f4e6f28c280bda801b05b24 (diff) | |
ParsingPackage/ParsedPackage test code migration
Part of the Parsing/ParsedPackage split into core/server.
Moves core tests that are should now be in services,
and cleans up/migrates test code. Import changes, moving
classes into the server, and general small cleanup.
This is the final commit in the Parsing/ParsedPackage split.
Bug: 135203078
Test: enumerated in first commit of change ID
Ib4fe51d729a56bfb0ea1316e577358ba0dfceccf
Change-Id: I694da372feda070815e05b450807a18d71ec9b9d
Diffstat (limited to 'services/robotests/src')
| -rw-r--r-- | services/robotests/src/com/android/server/pm/CrossProfileAppsServiceImplRoboTest.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/services/robotests/src/com/android/server/pm/CrossProfileAppsServiceImplRoboTest.java b/services/robotests/src/com/android/server/pm/CrossProfileAppsServiceImplRoboTest.java index 6190802d033d..fa0febd7f20f 100644 --- a/services/robotests/src/com/android/server/pm/CrossProfileAppsServiceImplRoboTest.java +++ b/services/robotests/src/com/android/server/pm/CrossProfileAppsServiceImplRoboTest.java @@ -46,8 +46,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManagerInternal; import android.content.pm.ResolveInfo; -import android.content.pm.parsing.AndroidPackage; -import android.content.pm.parsing.PackageImpl; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; @@ -58,6 +56,9 @@ import androidx.test.core.app.ApplicationProvider; import com.android.internal.util.FunctionalUtils.ThrowingRunnable; import com.android.internal.util.FunctionalUtils.ThrowingSupplier; import com.android.server.LocalServices; +import com.android.server.pm.parsing.pkg.AndroidPackage; +import com.android.server.pm.parsing.pkg.PackageImpl; +import com.android.server.pm.parsing.pkg.ParsedPackage; import com.android.server.testing.shadows.ShadowApplicationPackageManager; import com.android.server.testing.shadows.ShadowUserManager; import com.android.server.wm.ActivityTaskManagerInternal; @@ -135,7 +136,8 @@ public class CrossProfileAppsServiceImplRoboTest { eq(userId))) .thenReturn(packageInfo); when(mPackageManagerInternal.getPackage(uid)) - .thenReturn(PackageImpl.forParsing(CROSS_PROFILE_APP_PACKAGE_NAME)); + .thenReturn(((ParsedPackage) PackageImpl.forTesting(CROSS_PROFILE_APP_PACKAGE_NAME) + .hideAsParsed()).hideAsFinal()); } private PackageInfo buildTestPackageInfo() { @@ -497,7 +499,9 @@ public class CrossProfileAppsServiceImplRoboTest { private void declareCrossProfileAttributeOnCrossProfileApp(boolean value) { mockCrossProfileAndroidPackage( - PackageImpl.forParsing(CROSS_PROFILE_APP_PACKAGE_NAME).setCrossProfile(value)); + ((ParsedPackage) PackageImpl.forTesting(CROSS_PROFILE_APP_PACKAGE_NAME) + .setCrossProfile(value) + .hideAsParsed()).hideAsFinal()); } private class TestInjector implements CrossProfileAppsServiceImpl.Injector { |