diff options
| author | Felipe Leme <felipeal@google.com> | 2023-07-17 12:33:29 -0700 |
|---|---|---|
| committer | Felipe Leme <felipeal@google.com> | 2023-07-17 14:08:42 -0700 |
| commit | d6d52c8341b7a10e01376d7b3d23e772ef0d1843 (patch) | |
| tree | 20460c4d04f837a5e412ac076bec5a9d9082d6fb /java/com | |
| parent | fecc86063042caa33bb56abfae6cc1009326310e (diff) | |
| download | modules-utils-d6d52c8341b7a10e01376d7b3d23e772ef0d1843.tar.gz | |
Fixed bad API call from AbstractExtendedMockitoRule.
It was calling com.android.internal.util.Preconditions.checkState(),
which is not available on Android 11.
AOSP-first: might need it on internal branches that wouldn't be on AOSP
Test: atest ModulesUtilsTestingTests
Fixes: 289984858
Change-Id: Id81667b803a7fadab6731c986923fd349a49bacf
Merged-In: Id81667b803a7fadab6731c986923fd349a49bacf
(cherry picked from commit 156e57c4c618621b5c6a4a9b2a5c2fad31b72918)
Diffstat (limited to 'java/com')
| -rw-r--r-- | java/com/android/modules/utils/testing/AbstractExtendedMockitoRule.java | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/java/com/android/modules/utils/testing/AbstractExtendedMockitoRule.java b/java/com/android/modules/utils/testing/AbstractExtendedMockitoRule.java index 837c43b..05e2894 100644 --- a/java/com/android/modules/utils/testing/AbstractExtendedMockitoRule.java +++ b/java/com/android/modules/utils/testing/AbstractExtendedMockitoRule.java @@ -22,7 +22,6 @@ import android.util.Log; import com.android.dx.mockito.inline.extended.StaticMockitoSessionBuilder; import com.android.internal.annotations.VisibleForTesting; -import com.android.internal.util.Preconditions; import com.android.modules.utils.testing.AbstractExtendedMockitoRule.AbstractBuilder; import org.junit.AssumptionViolatedException; @@ -301,10 +300,8 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock @Deprecated public final B configureSessionBuilder( SessionBuilderVisitor sessionBuilderConfigurator) { - Preconditions.checkState(mMockedStaticClasses.isEmpty(), - "mockStatic() already called"); - Preconditions.checkState(mSpiedStaticClasses.isEmpty(), - "spyStatic() already called"); + checkState(mMockedStaticClasses.isEmpty(), "mockStatic() already called"); + checkState(mSpiedStaticClasses.isEmpty(), "spyStatic() already called"); mSessionBuilderConfigurator = Objects.requireNonNull(sessionBuilderConfigurator); return thisBuilder(); } @@ -355,16 +352,14 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock } private void checkConfigureSessionBuilderNotCalled() { - Preconditions.checkState(mSessionBuilderConfigurator == null, + checkState(mSessionBuilderConfigurator == null, "configureSessionBuilder() already called"); } private Class<?> checkClassNotMockedOrSpied(Class<?> clazz) { Objects.requireNonNull(clazz); - Preconditions.checkState(!mMockedStaticClasses.contains(clazz), - "class %s already mocked", clazz); - Preconditions.checkState(!mSpiedStaticClasses.contains(clazz), - "class %s already spied", clazz); + checkState(!mMockedStaticClasses.contains(clazz), "class %s already mocked", clazz); + checkState(!mSpiedStaticClasses.contains(clazz), "class %s already spied", clazz); return clazz; } } @@ -379,4 +374,12 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock */ void visit(StaticMockitoSessionBuilder builder); } + + // Copied from com.android.internal.util.Preconditions, as that method is not available on RVC + private static void checkState(boolean expression, String messageTemplate, + Object... messageArgs) { + if (!expression) { + throw new IllegalStateException(String.format(messageTemplate, messageArgs)); + } + } } |