From fbf4f6cccafbb9942c858a0e90f92c44a8e26b35 Mon Sep 17 00:00:00 2001 From: AndroidX Test Team Date: Mon, 29 Jan 2024 10:36:47 -0800 Subject: [PATCH] ...Lint update... FUTURE_COPYBARA_INTEGRATE_REVIEW=https://github.com/android/android-test/pull/2163 from android:updateVersions fc3510455b88aa94728fad67ed4f4eec50c4b0c8 PiperOrigin-RevId: 602431902 --- .../espresso/contrib/api/current_public.txt | 4 +- .../test/espresso/api/current_internal.txt | 2 +- .../test/espresso/api/current_public.txt | 62 +++++++++---------- .../espresso/device/api/current_public.txt | 12 ++-- .../test/espresso/api/current_public.txt | 4 +- .../espresso/intent/api/current_public.txt | 16 ++--- .../espresso/remote/api/current_public.txt | 6 +- .../test/espresso/web/api/current_public.txt | 2 +- .../test/ext/truth/api/current_public.txt | 2 +- .../java/androidx/test/api/current_public.txt | 2 +- .../androidx/test/api/current_internal.txt | 24 +++---- .../java/androidx/test/api/current_public.txt | 2 +- 12 files changed, 71 insertions(+), 67 deletions(-) diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/api/current_public.txt b/espresso/contrib/java/androidx/test/espresso/contrib/api/current_public.txt index 48b88873a..cdc67bad8 100644 --- a/espresso/contrib/java/androidx/test/espresso/contrib/api/current_public.txt +++ b/espresso/contrib/java/androidx/test/espresso/contrib/api/current_public.txt @@ -7,8 +7,8 @@ package androidx.test.espresso.contrib { } public final class ActivityResultMatchers { - method public static org.hamcrest.Matcher! hasResultCode(int); - method public static org.hamcrest.Matcher! hasResultData(org.hamcrest.Matcher!); + method public static org.hamcrest.Matcher! hasResultCode(int); + method public static org.hamcrest.Matcher! hasResultData(org.hamcrest.Matcher!); } public final class DrawerActions { diff --git a/espresso/core/java/androidx/test/espresso/api/current_internal.txt b/espresso/core/java/androidx/test/espresso/api/current_internal.txt index 4276a966f..9c26c4f50 100644 --- a/espresso/core/java/androidx/test/espresso/api/current_internal.txt +++ b/espresso/core/java/androidx/test/espresso/api/current_internal.txt @@ -3,7 +3,7 @@ package androidx.test.espresso.remote { @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface IInteractionExecutionStatus extends android.os.IInterface { method public boolean canExecute() throws android.os.RemoteException; - field public static final String! DESCRIPTOR = "androidx.test.espresso.remote.IInteractionExecutionStatus"; + field public static final String DESCRIPTOR = "androidx.test.espresso.remote.IInteractionExecutionStatus"; } public static class IInteractionExecutionStatus.Default implements androidx.test.espresso.remote.IInteractionExecutionStatus { diff --git a/espresso/core/java/androidx/test/espresso/api/current_public.txt b/espresso/core/java/androidx/test/espresso/api/current_public.txt index 8a92ffee6..c665e5090 100644 --- a/espresso/core/java/androidx/test/espresso/api/current_public.txt +++ b/espresso/core/java/androidx/test/espresso/api/current_public.txt @@ -11,12 +11,12 @@ package androidx.test.espresso { method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! from(androidx.test.espresso.AmbiguousViewMatcherException!); method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! includeViewHierarchy(boolean); method @com.google.errorprone.annotations.CanIgnoreReturnValue public androidx.test.espresso.AmbiguousViewMatcherException.Builder withMaxMsgLen(int); - method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withOtherAmbiguousViews(android.view.View!...); + method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withOtherAmbiguousViews(android.view.View!...!); method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withRootView(android.view.View!); method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withView1(android.view.View!); method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withView2(android.view.View!); method @com.google.errorprone.annotations.CanIgnoreReturnValue public androidx.test.espresso.AmbiguousViewMatcherException.Builder withViewHierarchyFile(String?); - method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withViewMatcher(org.hamcrest.Matcher!); + method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withViewMatcher(org.hamcrest.Matcher!); } public final class AppNotIdleException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException { @@ -30,7 +30,7 @@ package androidx.test.espresso { method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! inAdapterView(org.hamcrest.Matcher!); method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! inRoot(org.hamcrest.Matcher!); method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! onChildView(org.hamcrest.Matcher!); - method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...); + method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...!); method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! usingAdapterViewProtocol(androidx.test.espresso.action.AdapterViewProtocol!); } @@ -52,11 +52,11 @@ package androidx.test.espresso { method public static void openContextualActionModeOverflowMenu(); method public static void pressBack(); method public static void pressBackUnconditionally(); - method @Deprecated public static boolean registerIdlingResources(androidx.test.espresso.IdlingResource!...); + method @Deprecated public static boolean registerIdlingResources(androidx.test.espresso.IdlingResource!...!); method @Deprecated public static void registerLooperAsIdlingResource(android.os.Looper!); method @Deprecated public static void registerLooperAsIdlingResource(android.os.Looper!, boolean); method public static void setFailureHandler(androidx.test.espresso.FailureHandler!); - method @Deprecated public static boolean unregisterIdlingResources(androidx.test.espresso.IdlingResource!...); + method @Deprecated public static boolean unregisterIdlingResources(androidx.test.espresso.IdlingResource!...!); } public interface EspressoException extends androidx.test.platform.TestFrameworkException { @@ -122,7 +122,7 @@ package androidx.test.espresso { method public androidx.test.espresso.NoMatchingViewException.Builder withMaxMsgLen(int); method public androidx.test.espresso.NoMatchingViewException.Builder! withRootView(android.view.View!); method public androidx.test.espresso.NoMatchingViewException.Builder withViewHierarchyFile(String?); - method public androidx.test.espresso.NoMatchingViewException.Builder! withViewMatcher(org.hamcrest.Matcher!); + method public androidx.test.espresso.NoMatchingViewException.Builder! withViewMatcher(org.hamcrest.Matcher!); } public final class PerformException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException { @@ -184,7 +184,7 @@ package androidx.test.espresso { method public androidx.test.espresso.ViewInteraction! check(androidx.test.espresso.ViewAssertion!); method public androidx.test.espresso.ViewInteraction! inRoot(org.hamcrest.Matcher!); method public androidx.test.espresso.ViewInteraction! noActivity(); - method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...); + method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...!); method public androidx.test.espresso.ViewInteraction! withFailureHandler(androidx.test.espresso.FailureHandler!); } @@ -202,11 +202,11 @@ package androidx.test.espresso.action { } public interface AdapterViewProtocol { - method public Iterable! getDataInAdapterView(android.widget.AdapterView!); - method @Deprecated public androidx.test.espresso.util.EspressoOptional! getDataRenderedByView(android.widget.AdapterView!, android.view.View!); - method public default androidx.test.espresso.action.AdapterViewProtocol.AdaptedData? getDataRenderedByView2(android.widget.AdapterView!, android.view.View!); - method public boolean isDataRenderedWithinAdapterView(android.widget.AdapterView!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!); - method public void makeDataRenderedWithinAdapterView(android.widget.AdapterView!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!); + method public Iterable! getDataInAdapterView(android.widget.AdapterView!); + method @Deprecated public androidx.test.espresso.util.EspressoOptional! getDataRenderedByView(android.widget.AdapterView!, android.view.View!); + method public default androidx.test.espresso.action.AdapterViewProtocol.AdaptedData? getDataRenderedByView2(android.widget.AdapterView!, android.view.View!); + method public boolean isDataRenderedWithinAdapterView(android.widget.AdapterView!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!); + method public void makeDataRenderedWithinAdapterView(android.widget.AdapterView!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!); } public static class AdapterViewProtocol.AdaptedData { @@ -485,7 +485,7 @@ package androidx.test.espresso.assertion { public final class ViewAssertions { method public static androidx.test.espresso.ViewAssertion! doesNotExist(); - method public static androidx.test.espresso.ViewAssertion! matches(org.hamcrest.Matcher!); + method public static androidx.test.espresso.ViewAssertion! matches(org.hamcrest.Matcher!); method public static androidx.test.espresso.ViewAssertion! selectedDescendantsMatch(org.hamcrest.Matcher!, org.hamcrest.Matcher!); } @@ -510,9 +510,9 @@ package androidx.test.espresso.base { ctor public IdlingResourceRegistry(android.os.Looper!); method public java.util.List! getResources(); method public void registerLooper(android.os.Looper!, boolean); - method public boolean registerResources(java.util.List!); + method public boolean registerResources(java.util.List!); method public void sync(Iterable!, Iterable!); - method public boolean unregisterResources(java.util.List!); + method public boolean unregisterResources(java.util.List!); } public interface IdlingUiController extends androidx.test.espresso.UiController { @@ -559,8 +559,8 @@ package androidx.test.espresso.core.internal.deps.guava.base { method @Deprecated public T! or(androidx.test.espresso.core.internal.deps.guava.base.Supplier!); method @Deprecated public T! or(T!); method @Deprecated public T! orNull(); - method @Deprecated public static Iterable! presentInstances(Iterable>!); - method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional! transform(androidx.test.espresso.core.internal.deps.guava.base.Function!); + method @Deprecated public static Iterable! presentInstances(Iterable!>!); + method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional! transform(androidx.test.espresso.core.internal.deps.guava.base.Function!); } @Deprecated public interface Supplier { @@ -572,8 +572,8 @@ package androidx.test.espresso.core.internal.deps.guava.base { package androidx.test.espresso.matcher { public abstract class BoundedDiagnosingMatcher extends org.hamcrest.BaseMatcher { - ctor public BoundedDiagnosingMatcher(Class!); - ctor public BoundedDiagnosingMatcher(Class!, Class!, Class!...); + ctor public BoundedDiagnosingMatcher(Class!); + ctor public BoundedDiagnosingMatcher(Class!, Class!, Class!...!); method public final void describeMismatch(Object!, org.hamcrest.Description!); method protected abstract void describeMoreTo(org.hamcrest.Description!); method public final void describeTo(org.hamcrest.Description!); @@ -582,8 +582,8 @@ package androidx.test.espresso.matcher { } public abstract class BoundedMatcher extends org.hamcrest.BaseMatcher { - ctor public BoundedMatcher(Class!); - ctor public BoundedMatcher(Class!, Class!, Class!...); + ctor public BoundedMatcher(Class!); + ctor public BoundedMatcher(Class!, Class!, Class!...!); method public final boolean matches(Object!); method protected abstract boolean matchesSafely(S!); } @@ -684,7 +684,7 @@ package androidx.test.espresso.matcher { method public static org.hamcrest.Matcher! hasSibling(org.hamcrest.Matcher!); method public static org.hamcrest.Matcher! hasTextColor(int); method public static org.hamcrest.Matcher! isActivated(); - method public static org.hamcrest.Matcher! isAssignableFrom(Class!); + method public static org.hamcrest.Matcher! isAssignableFrom(Class!); method public static org.hamcrest.Matcher! isChecked(); method public static org.hamcrest.Matcher! isClickable(); method public static org.hamcrest.Matcher! isCompletelyDisplayed(); @@ -710,7 +710,7 @@ package androidx.test.espresso.matcher { method public static org.hamcrest.Matcher! withClassName(org.hamcrest.Matcher!); method public static org.hamcrest.Matcher! withContentDescription(int); method public static org.hamcrest.Matcher! withContentDescription(String!); - method public static org.hamcrest.Matcher! withContentDescription(org.hamcrest.Matcher!); + method public static org.hamcrest.Matcher! withContentDescription(org.hamcrest.Matcher!); method public static org.hamcrest.Matcher! withEffectiveVisibility(androidx.test.espresso.matcher.ViewMatchers.Visibility!); method public static org.hamcrest.Matcher! withHint(int); method public static org.hamcrest.Matcher! withHint(String!); @@ -754,8 +754,8 @@ package androidx.test.espresso.remote { } public final class ConstructorInvocation { - ctor public ConstructorInvocation(Class, Class?, Class!...); - method public Object! invokeConstructor(java.lang.Object!...); + ctor public ConstructorInvocation(Class, Class?, Class!...?); + method public Object! invokeConstructor(java.lang.Object!...!); } public interface EspressoRemoteMessage { @@ -776,7 +776,7 @@ package androidx.test.espresso.remote { public class NoopRemoteInteraction implements androidx.test.espresso.remote.RemoteInteraction { ctor public NoopRemoteInteraction(); method public java.util.concurrent.Callable! createRemoteCheckCallable(org.hamcrest.Matcher!, org.hamcrest.Matcher!, java.util.Map!, androidx.test.espresso.ViewAssertion!); - method public java.util.concurrent.Callable! createRemotePerformCallable(org.hamcrest.Matcher!, org.hamcrest.Matcher!, java.util.Map!, androidx.test.espresso.ViewAction!...); + method public java.util.concurrent.Callable! createRemotePerformCallable(org.hamcrest.Matcher!, org.hamcrest.Matcher!, java.util.Map!, androidx.test.espresso.ViewAction!...!); method public boolean isRemoteProcess(); } @@ -787,7 +787,7 @@ package androidx.test.espresso.remote { public interface RemoteInteraction { method public java.util.concurrent.Callable! createRemoteCheckCallable(org.hamcrest.Matcher!, org.hamcrest.Matcher!, java.util.Map!, androidx.test.espresso.ViewAssertion!); - method public java.util.concurrent.Callable! createRemotePerformCallable(org.hamcrest.Matcher!, org.hamcrest.Matcher!, java.util.Map!, androidx.test.espresso.ViewAction!...); + method public java.util.concurrent.Callable! createRemotePerformCallable(org.hamcrest.Matcher!, org.hamcrest.Matcher!, java.util.Map!, androidx.test.espresso.ViewAction!...!); method public default boolean isRemoteClient(); method public boolean isRemoteProcess(); field public static final String BUNDLE_EXECUTION_STATUS = "executionStatus"; @@ -831,12 +831,12 @@ package androidx.test.espresso.util { method @Deprecated public T! get(); method @Deprecated public boolean isPresent(); method @Deprecated public static androidx.test.espresso.util.EspressoOptional! of(T!); - method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional! or(androidx.test.espresso.core.internal.deps.guava.base.Optional!); - method @Deprecated public T! or(androidx.test.espresso.core.internal.deps.guava.base.Supplier!); + method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional! or(androidx.test.espresso.core.internal.deps.guava.base.Optional!); + method @Deprecated public T! or(androidx.test.espresso.core.internal.deps.guava.base.Supplier!); method @Deprecated public T! or(T!); method @Deprecated public T! orNull(); - method @Deprecated public static Iterable! presentInstances(Iterable>!); - method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional! transform(androidx.test.espresso.core.internal.deps.guava.base.Function!); + method @Deprecated public static Iterable! presentInstances(Iterable!>!); + method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional! transform(androidx.test.espresso.core.internal.deps.guava.base.Function!); } public final class HumanReadables { diff --git a/espresso/device/java/androidx/test/espresso/device/api/current_public.txt b/espresso/device/java/androidx/test/espresso/device/api/current_public.txt index f7a2dcbe1..652a08fd2 100644 --- a/espresso/device/java/androidx/test/espresso/device/api/current_public.txt +++ b/espresso/device/java/androidx/test/espresso/device/api/current_public.txt @@ -43,6 +43,7 @@ package androidx.test.espresso.device.action { } public enum ScreenOrientation { + method public static kotlin.enums.EnumEntries getEntries(); method public static androidx.test.espresso.device.action.ScreenOrientation valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException; method public static androidx.test.espresso.device.action.ScreenOrientation[] values(); enum_constant public static final androidx.test.espresso.device.action.ScreenOrientation LANDSCAPE; @@ -54,6 +55,7 @@ package androidx.test.espresso.device.action { package androidx.test.espresso.device.controller { public enum DeviceMode { + method public static kotlin.enums.EnumEntries getEntries(); method public static androidx.test.espresso.device.controller.DeviceMode valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException; method public static androidx.test.espresso.device.controller.DeviceMode[] values(); enum_constant public static final androidx.test.espresso.device.controller.DeviceMode BOOK; @@ -122,10 +124,11 @@ package androidx.test.espresso.device.sizeclass { } public enum HeightSizeClass.Companion.HeightSizeClassEnum { - method public final String! getDescription(); + method public final String getDescription(); + method public static kotlin.enums.EnumEntries getEntries(); method public static androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException; method public static androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum[] values(); - property public final String! description; + property public final String description; enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum COMPACT; enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum EXPANDED; enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum MEDIUM; @@ -148,10 +151,11 @@ package androidx.test.espresso.device.sizeclass { } public enum WidthSizeClass.Companion.WidthSizeClassEnum { - method public final String! getDescription(); + method public final String getDescription(); + method public static kotlin.enums.EnumEntries getEntries(); method public static androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException; method public static androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum[] values(); - property public final String! description; + property public final String description; enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum COMPACT; enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum EXPANDED; enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum MEDIUM; diff --git a/espresso/idling_resource/java/androidx/test/espresso/api/current_public.txt b/espresso/idling_resource/java/androidx/test/espresso/api/current_public.txt index 9a21728c9..10898636d 100644 --- a/espresso/idling_resource/java/androidx/test/espresso/api/current_public.txt +++ b/espresso/idling_resource/java/androidx/test/espresso/api/current_public.txt @@ -5,9 +5,9 @@ package androidx.test.espresso { method public static androidx.test.espresso.IdlingRegistry! getInstance(); method public java.util.Collection! getLoopers(); method public java.util.Collection! getResources(); - method public boolean register(androidx.test.espresso.IdlingResource!...); + method public boolean register(androidx.test.espresso.IdlingResource!...!); method public void registerLooperAsIdlingResource(android.os.Looper!); - method public boolean unregister(androidx.test.espresso.IdlingResource!...); + method public boolean unregister(androidx.test.espresso.IdlingResource!...!); method public boolean unregisterLooperAsIdlingResource(android.os.Looper!); } diff --git a/espresso/intents/java/androidx/test/espresso/intent/api/current_public.txt b/espresso/intents/java/androidx/test/espresso/intent/api/current_public.txt index e760c9cc1..f02fd4af4 100644 --- a/espresso/intents/java/androidx/test/espresso/intent/api/current_public.txt +++ b/espresso/intents/java/androidx/test/espresso/intent/api/current_public.txt @@ -8,12 +8,12 @@ package androidx.test.espresso.intent { public final class Checks { method public static void checkArgument(boolean); method public static void checkArgument(boolean, Object!); - method public static void checkArgument(boolean, String!, java.lang.Object!...); + method public static void checkArgument(boolean, String!, java.lang.Object!...!); method public static T! checkNotNull(T!); method public static T! checkNotNull(T!, Object!); - method public static T! checkNotNull(T!, String!, java.lang.Object!...); + method public static T! checkNotNull(T!, String!, java.lang.Object!...!); method public static void checkState(boolean, Object!); - method public static void checkState(boolean, String!, java.lang.Object!...); + method public static void checkState(boolean, String!, java.lang.Object!...!); } public final class Intents { @@ -65,16 +65,16 @@ package androidx.test.espresso.intent { public static class RuntimePermissionsStubber.ActivityResultBuilder { ctor public RuntimePermissionsStubber.ActivityResultBuilder(); method public android.app.Instrumentation.ActivityResult! build(); - method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withGrantedPermissions(java.lang.String!...); + method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withGrantedPermissions(java.lang.String!...!); method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withResultCode(int); - method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withRevokedPermissions(java.lang.String!...); + method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withRevokedPermissions(java.lang.String!...!); } public static class RuntimePermissionsStubber.Matchers { ctor public RuntimePermissionsStubber.Matchers(); method public static org.hamcrest.Matcher! anyPermission(); method public static org.hamcrest.Matcher! hasPermission(String!); - method public static org.hamcrest.Matcher! hasPermissions(java.lang.String!...); + method public static org.hamcrest.Matcher! hasPermissions(java.lang.String!...!); method public static org.hamcrest.Matcher! hasPermissions(org.hamcrest.Matcher!>!); field public static final String ACTION_REQUEST_PERMISSIONS = "android.content.pm.action.REQUEST_PERMISSIONS"; } @@ -129,7 +129,7 @@ package androidx.test.espresso.intent.matcher { method public static org.hamcrest.Matcher! hasAction(String!); method public static org.hamcrest.Matcher! hasAction(org.hamcrest.Matcher!); method public static org.hamcrest.Matcher! hasCategories(java.util.Set!); - method public static org.hamcrest.Matcher! hasCategories(org.hamcrest.Matcher>!); + method public static org.hamcrest.Matcher! hasCategories(org.hamcrest.Matcher!>!); method public static org.hamcrest.Matcher! hasComponent(android.content.ComponentName!); method public static org.hamcrest.Matcher! hasComponent(String!); method public static org.hamcrest.Matcher! hasComponent(org.hamcrest.Matcher!); @@ -145,7 +145,7 @@ package androidx.test.espresso.intent.matcher { method public static org.hamcrest.Matcher! hasExtras(org.hamcrest.Matcher!); method public static org.hamcrest.Matcher! hasFlag(int); method public static org.hamcrest.Matcher! hasFlags(int); - method public static org.hamcrest.Matcher! hasFlags(int...); + method public static org.hamcrest.Matcher! hasFlags(int...!); method public static org.hamcrest.Matcher! hasPackage(String!); method public static org.hamcrest.Matcher! hasPackage(org.hamcrest.Matcher!); method public static org.hamcrest.Matcher! hasType(String!); diff --git a/espresso/remote/java/androidx/test/espresso/remote/api/current_public.txt b/espresso/remote/java/androidx/test/espresso/remote/api/current_public.txt index 0ce271761..12486e15d 100644 --- a/espresso/remote/java/androidx/test/espresso/remote/api/current_public.txt +++ b/espresso/remote/java/androidx/test/espresso/remote/api/current_public.txt @@ -7,7 +7,7 @@ package androidx.test.espresso.remote { public final class EspressoRemote implements androidx.test.espresso.remote.RemoteInteraction { method public java.util.concurrent.Callable! createRemoteCheckCallable(org.hamcrest.Matcher!, org.hamcrest.Matcher!, java.util.Map!, androidx.test.espresso.ViewAssertion!); - method public java.util.concurrent.Callable! createRemotePerformCallable(org.hamcrest.Matcher!, org.hamcrest.Matcher!, java.util.Map!, androidx.test.espresso.ViewAction!...); + method public java.util.concurrent.Callable! createRemotePerformCallable(org.hamcrest.Matcher!, org.hamcrest.Matcher!, java.util.Map!, androidx.test.espresso.ViewAction!...!); method public static androidx.test.espresso.remote.EspressoRemote! getInstance(); method public void init(); method public boolean isRemoteProcess(); @@ -92,12 +92,12 @@ package androidx.test.espresso.remote { public static final class RemoteDescriptor.Builder { ctor public RemoteDescriptor.Builder(); method public androidx.test.espresso.remote.RemoteDescriptor! build(); - method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceFieldDescriptors(androidx.test.espresso.remote.FieldDescriptor!...); + method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceFieldDescriptors(androidx.test.espresso.remote.FieldDescriptor!...?); method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceType(Class); method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoBuilderType(Class); method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoParser(com.google.protobuf.Parser); method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoType(Class); - method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteConstrTypes(Class!...); + method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteConstrTypes(Class!...?); method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteType(Class); } diff --git a/espresso/web/java/androidx/test/espresso/web/api/current_public.txt b/espresso/web/java/androidx/test/espresso/web/api/current_public.txt index ee0cc3a06..4e296dc16 100644 --- a/espresso/web/java/androidx/test/espresso/web/api/current_public.txt +++ b/espresso/web/java/androidx/test/espresso/web/api/current_public.txt @@ -55,7 +55,7 @@ package androidx.test.espresso.web.assertion { public final class WebViewAssertions { method public static androidx.test.espresso.web.assertion.WebAssertion! webContent(org.hamcrest.Matcher!); method public static androidx.test.espresso.web.assertion.WebAssertion! webMatches(androidx.test.espresso.web.model.Atom!, org.hamcrest.Matcher!); - method public static androidx.test.espresso.web.assertion.WebAssertion! webMatches(androidx.test.espresso.web.model.Atom!, org.hamcrest.Matcher!, androidx.test.espresso.web.assertion.WebViewAssertions.ResultDescriber!); + method public static androidx.test.espresso.web.assertion.WebAssertion! webMatches(androidx.test.espresso.web.model.Atom!, org.hamcrest.Matcher!, androidx.test.espresso.web.assertion.WebViewAssertions.ResultDescriber!); } public static interface WebViewAssertions.ResultDescriber { diff --git a/ext/truth/java/androidx/test/ext/truth/api/current_public.txt b/ext/truth/java/androidx/test/ext/truth/api/current_public.txt index 89f88c78f..8cd4d6967 100644 --- a/ext/truth/java/androidx/test/ext/truth/api/current_public.txt +++ b/ext/truth/java/androidx/test/ext/truth/api/current_public.txt @@ -29,7 +29,7 @@ package androidx.test.ext.truth.content { public final class IntentCorrespondences { method public static com.google.common.truth.Correspondence! action(); - method public static com.google.common.truth.Correspondence! all(com.google.common.truth.Correspondence!...); + method public static com.google.common.truth.Correspondence! all(com.google.common.truth.Correspondence!...!); method public static com.google.common.truth.Correspondence! data(); } diff --git a/runner/android_junit_runner/java/androidx/test/api/current_public.txt b/runner/android_junit_runner/java/androidx/test/api/current_public.txt index 20cc0ef8a..e9d90ab91 100644 --- a/runner/android_junit_runner/java/androidx/test/api/current_public.txt +++ b/runner/android_junit_runner/java/androidx/test/api/current_public.txt @@ -10,7 +10,7 @@ package androidx.test.filters { } @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface CustomFilter { - method public abstract Class filterClass(); + method public abstract Class filterClass(); } @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface FlakyTest { diff --git a/runner/monitor/java/androidx/test/api/current_internal.txt b/runner/monitor/java/androidx/test/api/current_internal.txt index e2b758dd3..9cfc91350 100644 --- a/runner/monitor/java/androidx/test/api/current_internal.txt +++ b/runner/monitor/java/androidx/test/api/current_internal.txt @@ -23,7 +23,7 @@ package androidx.test.internal.platform.app { @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ActivityInvoker { method public void finishActivity(android.app.Activity!); method public android.app.Instrumentation.ActivityResult! getActivityResult(); - method public default android.content.Intent! getIntentForActivity(Class!); + method public default android.content.Intent! getIntentForActivity(Class!); method public void pauseActivity(android.app.Activity!); method public void recreateActivity(android.app.Activity!); method public void resumeActivity(android.app.Activity!); @@ -72,10 +72,10 @@ package androidx.test.internal.platform.reflect { } @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectiveMethod { - ctor public ReflectiveMethod(Class!, String!, Class!...); - ctor public ReflectiveMethod(String!, String!, Class!...); - method public T! invoke(Object!, java.lang.Object!...) throws androidx.test.internal.platform.reflect.ReflectionException; - method public T! invokeStatic(java.lang.Object!...) throws androidx.test.internal.platform.reflect.ReflectionException; + ctor public ReflectiveMethod(Class!, String!, Class!...!); + ctor public ReflectiveMethod(String!, String!, Class!...!); + method public T! invoke(Object!, java.lang.Object!...!) throws androidx.test.internal.platform.reflect.ReflectionException; + method public T! invokeStatic(java.lang.Object!...!) throws androidx.test.internal.platform.reflect.ReflectionException; } } @@ -143,22 +143,22 @@ package androidx.test.internal.util { @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class Checks { method public static void checkArgument(boolean); method public static void checkArgument(boolean, Object!); - method public static void checkArgument(boolean, String!, java.lang.Object!...); + method public static void checkArgument(boolean, String!, java.lang.Object!...!); method public static void checkMainThread(); method public static void checkNotMainThread(); method public static T checkNotNull(T!); method public static T checkNotNull(T!, Object!); - method public static T checkNotNull(T!, String!, java.lang.Object!...); + method public static T checkNotNull(T!, String!, java.lang.Object!...!); method public static void checkState(boolean); method public static void checkState(boolean, Object!); - method public static void checkState(boolean, String!, java.lang.Object!...); + method public static void checkState(boolean, String!, java.lang.Object!...!); } @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class LogUtil { ctor public LogUtil(); method public static androidx.test.internal.util.LogUtil.Supplier! lazyArg(androidx.test.internal.util.LogUtil.Supplier!); - method public static void logDebug(String!, String!, java.lang.Object!...); - method public static void logDebugWithProcess(String!, String!, java.lang.Object!...); + method public static void logDebug(String!, String!, java.lang.Object!...!); + method public static void logDebugWithProcess(String!, String!, java.lang.Object!...!); } public static interface LogUtil.Supplier { @@ -176,8 +176,8 @@ package androidx.test.internal.util { @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectionUtil { ctor @Deprecated public ReflectionUtil(); - method @Deprecated public static Object! callStaticMethod(Class!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...) throws androidx.test.internal.util.ReflectionUtil.ReflectionException; - method @Deprecated public static Object! callStaticMethod(String!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...) throws androidx.test.internal.util.ReflectionUtil.ReflectionException; + method @Deprecated public static Object! callStaticMethod(Class!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...!) throws androidx.test.internal.util.ReflectionUtil.ReflectionException; + method @Deprecated public static Object! callStaticMethod(String!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...!) throws androidx.test.internal.util.ReflectionUtil.ReflectionException; } @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static class ReflectionUtil.ReflectionException extends java.lang.Exception { diff --git a/runner/rules/java/androidx/test/api/current_public.txt b/runner/rules/java/androidx/test/api/current_public.txt index 8c11cdf66..13716b976 100644 --- a/runner/rules/java/androidx/test/api/current_public.txt +++ b/runner/rules/java/androidx/test/api/current_public.txt @@ -34,7 +34,7 @@ package androidx.test.rule { public class GrantPermissionRule implements org.junit.rules.TestRule { method public final org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!); - method public static androidx.test.rule.GrantPermissionRule! grant(java.lang.String!...); + method public static androidx.test.rule.GrantPermissionRule! grant(java.lang.String!...!); } public class ServiceTestRule implements org.junit.rules.TestRule {