From 1370c0590ca57cdff5f7494e86b5585c016846a9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A5rten=20Kongstad?= Date: Thu, 3 May 2018 10:48:35 +0200 Subject: [PATCH] OMS: add internal tests Add unit tests for OMS internal components. These are different from the OMS public API tests [that reside in core/tests/overlaytest]. Also, fix typo in OverlayInfo#toString. Bug: 119443459 Test: atest FrameworksServicesTests:com.android.server.om Change-Id: Icbee70800de5157a1804e0c96101f31c0bad2619 --- core/java/android/content/om/OverlayInfo.java | 2 +- .../android/server/om/OverlayManagerService.java | 7 + .../android/server/om/OverlayManagerSettings.java | 7 +- .../server/om/OverlayManagerServiceImplTests.java | 504 ++++++++++++++++++++ .../server/om/OverlayManagerSettingsTests.java | 505 +++++++++++++++++++++ 5 files changed, 1022 insertions(+), 3 deletions(-) create mode 100644 services/tests/servicestests/src/com/android/server/om/OverlayManagerServiceImplTests.java create mode 100644 services/tests/servicestests/src/com/android/server/om/OverlayManagerSettingsTests.java diff --git a/core/java/android/content/om/OverlayInfo.java b/core/java/android/content/om/OverlayInfo.java index fc79a425e861..639335e53ae5 100644 --- a/core/java/android/content/om/OverlayInfo.java +++ b/core/java/android/content/om/OverlayInfo.java @@ -451,7 +451,7 @@ public final class OverlayInfo implements Parcelable { public String toString() { return "OverlayInfo { overlay=" + packageName + ", targetPackage=" + targetPackageName + ((targetOverlayableName == null) ? "" - : ", targetOverlyabale=" + targetOverlayableName) + : ", targetOverlayable=" + targetOverlayableName) + ", state=" + state + " (" + stateToString(state) + "), userId=" + userId + " }"; } } diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java index 51d5acc9b555..ee07c7de9dbc 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -166,6 +166,13 @@ import java.util.concurrent.atomic.AtomicBoolean; * . . . . . . . . . . . . . . . . . . . . . . * * + *

To test the OMS, execute: + * + * atest FrameworksServicesTests:com.android.server.om # internal tests + * atest OverlayDeviceTests OverlayHostTests # public API tests + * + *

+ * *

Finally, here is a list of keywords used in the OMS context.

* *