Renamed ExtendedMockito annotations.

Removed the Class suffix (like SpyStaticClass) as they're redundant -
they were added to be consistent with the repeated annotations (like
SpyStaticClasses), but in reality, the repeated ones won't be used
in tests, so it's clear to have just @SpyStatic / @MockStatic.

Test: m -j ModulesUtilsTestingTests && adb install $OUT/testcases/ModulesUtilsTestingTests/*/ModulesUtilsTestingTests.apk && adb shell am instrument -w -e class com.android.modules.utils.testing.ExtendedMockitoRuleTest -w com.android.modules.utils.testing/androidx.test.runner.AndroidJUnitRunner

Bug: 311790035

Change-Id: I297a05f3e8a2ff70cb3928e7cce68ae7d803d049

2 files changed, 12 insertions, 12 deletions

diff --git a/java/com/android/modules/utils/testing/AbstractExtendedMockitoRule.java b/java/com/android/modules/utils/testing/AbstractExtendedMockitoRule.java
index 594551c..7a0f41b 100644
--- a/java/com/android/modules/utils/testing/AbstractExtendedMockitoRule.java
+++ b/java/com/android/modules/utils/testing/AbstractExtendedMockitoRule.java
@@ -23,9 +23,9 @@ import android.util.Log;
 import com.android.dx.mockito.inline.extended.StaticMockitoSessionBuilder;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.modules.utils.testing.AbstractExtendedMockitoRule.AbstractBuilder;
-import com.android.modules.utils.testing.ExtendedMockitoRule.MockStaticClass;
+import com.android.modules.utils.testing.ExtendedMockitoRule.MockStatic;
 import com.android.modules.utils.testing.ExtendedMockitoRule.MockStaticClasses;
-import com.android.modules.utils.testing.ExtendedMockitoRule.SpyStaticClass;
+import com.android.modules.utils.testing.ExtendedMockitoRule.SpyStatic;
 import com.android.modules.utils.testing.ExtendedMockitoRule.SpyStaticClasses;
 
 import org.junit.rules.TestRule;
@@ -63,11 +63,11 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock
 
     private static final String TAG = AbstractExtendedMockitoRule.class.getSimpleName();
 
-    private static final AnnotationFetcher<SpyStaticClass, SpyStaticClasses>
-        sSpyStaticAnnotationFetcher = new AnnotationFetcher<>(SpyStaticClass.class,
+    private static final AnnotationFetcher<SpyStatic, SpyStaticClasses>
+        sSpyStaticAnnotationFetcher = new AnnotationFetcher<>(SpyStatic.class,
                 SpyStaticClasses.class, r -> r.value());
-    private static final AnnotationFetcher<MockStaticClass, MockStaticClasses>
-        sMockStaticAnnotationFetcher = new AnnotationFetcher<>(MockStaticClass.class,
+    private static final AnnotationFetcher<MockStatic, MockStaticClasses>
+        sMockStaticAnnotationFetcher = new AnnotationFetcher<>(MockStatic.class,
                 MockStaticClasses.class, r -> r.value());
 
     private final Object mTestClassInstance;
@@ -109,7 +109,7 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock
      * Gets the mocked static classes present in the given test.
      *
      * <p>By default, it returns the classes defined by {@link AbstractBuilder#mockStatic(Class)}
-     * plus the classes present in the {@link MockStaticClass} and {@link MockStaticClasses}
+     * plus the classes present in the {@link MockStatic} and {@link MockStaticClasses}
      * annotations (presents in the test method, its class, or its superclasses).
      */
     protected Set<Class<?>> getMockedStaticClasses(Description description) {
@@ -123,7 +123,7 @@ public abstract class AbstractExtendedMockitoRule<R extends AbstractExtendedMock
      * Gets the spied static classes present in the given test.
      *
      * <p>By default, it returns the classes defined by {@link AbstractBuilder#spyStatic(Class)}
-     * plus the classes present in the {@link SpyStaticClass} and {@link SpyStaticClasses}
+     * plus the classes present in the {@link SpyStatic} and {@link SpyStaticClasses}
      * annotations (presents in the test method, its class, or its superclasses).
      */
     protected Set<Class<?>> getSpiedStaticClasses(Description description) {
diff --git a/java/com/android/modules/utils/testing/ExtendedMockitoRule.java b/java/com/android/modules/utils/testing/ExtendedMockitoRule.java
index 3d6a5bd..fa7d7fa 100644
--- a/java/com/android/modules/utils/testing/ExtendedMockitoRule.java
+++ b/java/com/android/modules/utils/testing/ExtendedMockitoRule.java
@@ -81,26 +81,26 @@ public final class ExtendedMockitoRule extends
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.METHOD, ElementType.TYPE})
     @Repeatable(SpyStaticClasses.class)
-    public @interface SpyStaticClass {
+    public @interface SpyStatic {
         Class<?> value();
     }
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.METHOD, ElementType.TYPE})
     public @interface SpyStaticClasses {
-        SpyStaticClass[] value();
+        SpyStatic[] value();
     }
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.METHOD, ElementType.TYPE})
     @Repeatable(MockStaticClasses.class)
-    public @interface MockStaticClass {
+    public @interface MockStatic {
         Class<?> value();
     }
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.METHOD, ElementType.TYPE})
     public @interface MockStaticClasses {
-        MockStaticClass[] value();
+        MockStatic[] value();
     }
 }