Removed ExtendedMockitoRule.configureSessionBuilder(). am: 3d035792bftmp_amf_315507370

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2865674

Change-Id: Ic9481e1f8611fcf4e72ee28a0fb9659846aba399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 2 insertions, 88 deletions

diff --git a/java/com/android/modules/utils/testing/AbstractExtendedMockitoRule.java b/java/com/android/modules/utils/testing/AbstractExtendedMockitoRule.java
index 5256d6a..2242ca0 100644
--- a/java/com/android/modules/utils/testing/AbstractExtendedMockitoRule.java
+++ b/java/com/android/modules/utils/testing/AbstractExtendedMockitoRule.java
@@ -77,7 +77,6 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock
     private final Set<Class<?>> mMockedStaticClasses;
     private final Set<Class<?>> mSpiedStaticClasses;
     private final List<StaticMockFixture> mStaticMockFixtures;
-    private final @Nullable SessionBuilderVisitor mSessionBuilderConfigurator;
     private final boolean mClearInlineMocks;
 
     private MockitoSession mMockitoSession;
@@ -88,7 +87,6 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock
         mMockitoFramework = builder.mMockitoFramework;
         mMockitoSession = builder.mMockitoSession;
         mAfterSessionFinishedCallback = builder.mAfterSessionFinishedCallback;
-        mSessionBuilderConfigurator = builder.mSessionBuilderConfigurator;
         mMockedStaticClasses = builder.mMockedStaticClasses;
         mSpiedStaticClasses = builder.mSpiedStaticClasses;
         mStaticMockFixtures = builder.mStaticMockFixtures == null ? Collections.emptyList()
@@ -98,7 +96,6 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock
                 + ", mockedStaticClasses=" + mMockedStaticClasses
                 + ", spiedStaticClasses=" + mSpiedStaticClasses
                 + ", staticMockFixtures=" + mStaticMockFixtures
-                + ", sessionBuilderConfigurator=" + mSessionBuilderConfigurator
                 + ", afterSessionFinishedCallback=" + mAfterSessionFinishedCallback
                 + ", mockitoFramework=" + mMockitoFramework
                 + ", mockitoSession=" + mMockitoSession
@@ -219,10 +216,6 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock
             Log.v(TAG, "Calling spyStatic() on " + clazz);
             sessionBuilder.spyStatic(clazz);
         }
-        if (mSessionBuilderConfigurator != null) {
-            Log.v(TAG, "Visiting " + mSessionBuilderConfigurator + " with " + sessionBuilder);
-            mSessionBuilderConfigurator.visit(sessionBuilder);
-        }
     }
 
     private void setUpMockBehaviors() {
@@ -287,7 +280,6 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock
         Strictness mStrictness = Strictness.LENIENT;
         @Nullable MockitoFramework mMockitoFramework;
         @Nullable MockitoSession mMockitoSession;
-        @Nullable SessionBuilderVisitor mSessionBuilderConfigurator;
         @Nullable Runnable mAfterSessionFinishedCallback;
         boolean mClearInlineMocks = true;
 
@@ -321,11 +313,9 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock
          * com.android.dx.mockito.inline.extended.StaticMockitoSessionBuilder#mockStatic(Class)}.
          *
          * @throws IllegalStateException if the same class was already passed to
-         *   {@link #mockStatic(Class)} or {@link #spyStatic(Class)} or if
-         *   {@link #configureSessionBuilder(SessionBuilderVisitor)} was called before.
+         *   {@link #mockStatic(Class)} or {@link #spyStatic(Class)}.
          */
         public final B mockStatic(Class<?> clazz) {
-            checkConfigureSessionBuilderNotCalled();
             mMockedStaticClasses.add(checkClassNotMockedOrSpied(clazz));
             return thisBuilder();
         }
@@ -335,11 +325,9 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock
          * com.android.dx.mockito.inline.extended.StaticMockitoSessionBuilder#spyStatic(Class)}.
          *
          * @throws IllegalStateException if the same class was already passed to
-         *   {@link #mockStatic(Class)} or {@link #spyStatic(Class)} or if
-         *   {@link #configureSessionBuilder(SessionBuilderVisitor)} was called before.
+         *   {@link #mockStatic(Class)} or {@link #spyStatic(Class)}.
          */
         public final B spyStatic(Class<?> clazz) {
-            checkConfigureSessionBuilderNotCalled();
             mSpiedStaticClasses.add(checkClassNotMockedOrSpied(clazz));
             return thisBuilder();
         }
@@ -361,25 +349,6 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock
             return thisBuilder();
         }
 
-        // TODO(b/281577492): remove once CachedAppOptimizerTest doesn't use anymore
-        /**
-         * Alternative for {@link #spyStatic(Class)} / {@link #mockStatic(Class)}; typically used
-         * when the same setup is shared by multiple tests.
-         *
-         * @deprecated use {@link #addStaticMockFixtures(Supplier...)} instead
-         *
-         * @throws IllegalStateException if {@link #mockStatic(Class)} or {@link #spyStatic(Class)}
-         * was called before.
-         */
-        @Deprecated
-        public final B configureSessionBuilder(
-                SessionBuilderVisitor sessionBuilderConfigurator) {
-            checkState(mMockedStaticClasses.isEmpty(), "mockStatic() already called");
-            checkState(mSpiedStaticClasses.isEmpty(), "spyStatic() already called");
-            mSessionBuilderConfigurator = Objects.requireNonNull(sessionBuilderConfigurator);
-            return thisBuilder();
-        }
-
         /**
          * Runs the given {@code runnable} after the session finished.
          *
@@ -425,11 +394,6 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock
             return (B) this;
         }
 
-        private void checkConfigureSessionBuilderNotCalled() {
-            checkState(mSessionBuilderConfigurator == null,
-                    "configureSessionBuilder() already called");
-        }
-
         private Class<?> checkClassNotMockedOrSpied(Class<?> clazz) {
             Objects.requireNonNull(clazz);
             checkState(!mMockedStaticClasses.contains(clazz), "class %s already mocked", clazz);
@@ -438,17 +402,6 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock
         }
     }
 
-    /**
-     * Visitor for {@link StaticMockitoSessionBuilder}.
-     */
-    public interface SessionBuilderVisitor {
-
-        /**
-         * Visits it.
-         */
-        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) {
diff --git a/javatests/com/android/modules/utils/testing/ExtendedMockitoRuleTest.java b/javatests/com/android/modules/utils/testing/ExtendedMockitoRuleTest.java
index 765b318..26d0cc3 100644
--- a/javatests/com/android/modules/utils/testing/ExtendedMockitoRuleTest.java
+++ b/javatests/com/android/modules/utils/testing/ExtendedMockitoRuleTest.java
@@ -65,7 +65,6 @@ public final class ExtendedMockitoRuleTest {
 
     private @Mock Statement mStatement;
     private @Mock Runnable mRunnable;
-    private @Mock ExtendedMockitoRule.SessionBuilderVisitor mSessionBuilderVisitor;
     private @Mock StaticMockFixture mStaticMockFixture1;
     private @Mock StaticMockFixture mStaticMockFixture2;
     private @Mock StaticMockFixture mStaticMockFixture3;
@@ -100,12 +99,6 @@ public final class ExtendedMockitoRuleTest {
     }
 
     @Test
-    public void testBuilder_configureSessionBuilder_null() {
-        assertThrows(NullPointerException.class,
-                () -> mBuilder.configureSessionBuilder(null));
-    }
-
-    @Test
     public void testBuilder_mockStatic_null() {
         assertThrows(NullPointerException.class, () -> mBuilder.mockStatic(null));
     }
@@ -420,18 +413,6 @@ public final class ExtendedMockitoRuleTest {
     }
 
     @Test
-    public void testSpyStatic_afterConfigureSessionBuilder() throws Throwable {
-        assertThrows(IllegalStateException.class, () -> mBuilder
-                .configureSessionBuilder(mSessionBuilderVisitor).spyStatic(StaticClass.class));
-    }
-
-    @Test
-    public void testMockStatic_afterConfigureSessionBuilder() throws Throwable {
-        assertThrows(IllegalStateException.class, () -> mBuilder
-                .configureSessionBuilder(mSessionBuilderVisitor).mockStatic(StaticClass.class));
-    }
-
-    @Test
     public void testAddStaticMockFixtures_once() throws Throwable {
         InOrder inOrder = inOrder(mStaticMockFixture1, mStaticMockFixture2);
 
@@ -515,26 +496,6 @@ public final class ExtendedMockitoRuleTest {
     }
 
     @Test
-    public void testConfigureSessionBuilder_afterMockStatic() throws Throwable {
-        assertThrows(IllegalStateException.class, () -> mBuilder.mockStatic(StaticClass.class)
-                .configureSessionBuilder(mSessionBuilderVisitor));
-    }
-
-    @Test
-    public void testConfigureSessionBuilder_afterSpyStatic() throws Throwable {
-        assertThrows(IllegalStateException.class, () -> mBuilder.spyStatic(StaticClass.class)
-                .configureSessionBuilder(mSessionBuilderVisitor));
-    }
-
-    @Test
-    public void testConfigureSessionBuilder() throws Throwable {
-        mUnsafeBuilder.configureSessionBuilder(mSessionBuilderVisitor)
-                .build().apply(mStatement, mDescription).evaluate();
-
-        verify(mSessionBuilderVisitor).visit(notNull());
-    }
-
-    @Test
     public void testAfterSessionFinished() throws Throwable {
         mUnsafeBuilder.afterSessionFinished(mRunnable).build().apply(mStatement, mDescription)
                 .evaluate();