Skip to content

Commit 98a6a39

Browse files
...Lint update...
FUTURE_COPYBARA_INTEGRATE_REVIEW=#2163 from android:updateVersions fc35104 PiperOrigin-RevId: 602431902
1 parent d013245 commit 98a6a39

File tree

12 files changed

+71
-67
lines changed

12 files changed

+71
-67
lines changed

espresso/contrib/java/androidx/test/espresso/contrib/api/current_public.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package androidx.test.espresso.contrib {
77
}
88

99
public final class ActivityResultMatchers {
10-
method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult>! hasResultCode(int);
11-
method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult>! hasResultData(org.hamcrest.Matcher<android.content.Intent!>!);
10+
method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult!>! hasResultCode(int);
11+
method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult!>! hasResultData(org.hamcrest.Matcher<android.content.Intent!>!);
1212
}
1313

1414
public final class DrawerActions {

espresso/core/java/androidx/test/espresso/api/current_internal.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package androidx.test.espresso.remote {
33

44
@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface IInteractionExecutionStatus extends android.os.IInterface {
55
method public boolean canExecute() throws android.os.RemoteException;
6-
field public static final String! DESCRIPTOR = "androidx.test.espresso.remote.IInteractionExecutionStatus";
6+
field public static final String DESCRIPTOR = "androidx.test.espresso.remote.IInteractionExecutionStatus";
77
}
88

99
public static class IInteractionExecutionStatus.Default implements androidx.test.espresso.remote.IInteractionExecutionStatus {

espresso/core/java/androidx/test/espresso/api/current_public.txt

+31-31
Large diffs are not rendered by default.

espresso/device/java/androidx/test/espresso/device/api/current_public.txt

+8-4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ package androidx.test.espresso.device.action {
4343
}
4444

4545
public enum ScreenOrientation {
46+
method public static kotlin.enums.EnumEntries<androidx.test.espresso.device.action.ScreenOrientation> getEntries();
4647
method public static androidx.test.espresso.device.action.ScreenOrientation valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
4748
method public static androidx.test.espresso.device.action.ScreenOrientation[] values();
4849
enum_constant public static final androidx.test.espresso.device.action.ScreenOrientation LANDSCAPE;
@@ -54,6 +55,7 @@ package androidx.test.espresso.device.action {
5455
package androidx.test.espresso.device.controller {
5556

5657
public enum DeviceMode {
58+
method public static kotlin.enums.EnumEntries<androidx.test.espresso.device.controller.DeviceMode> getEntries();
5759
method public static androidx.test.espresso.device.controller.DeviceMode valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
5860
method public static androidx.test.espresso.device.controller.DeviceMode[] values();
5961
enum_constant public static final androidx.test.espresso.device.controller.DeviceMode BOOK;
@@ -122,10 +124,11 @@ package androidx.test.espresso.device.sizeclass {
122124
}
123125

124126
public enum HeightSizeClass.Companion.HeightSizeClassEnum {
125-
method public final String! getDescription();
127+
method public final String getDescription();
128+
method public static kotlin.enums.EnumEntries<androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum> getEntries();
126129
method public static androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
127130
method public static androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum[] values();
128-
property public final String! description;
131+
property public final String description;
129132
enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum COMPACT;
130133
enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum EXPANDED;
131134
enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum MEDIUM;
@@ -148,10 +151,11 @@ package androidx.test.espresso.device.sizeclass {
148151
}
149152

150153
public enum WidthSizeClass.Companion.WidthSizeClassEnum {
151-
method public final String! getDescription();
154+
method public final String getDescription();
155+
method public static kotlin.enums.EnumEntries<androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum> getEntries();
152156
method public static androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
153157
method public static androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum[] values();
154-
property public final String! description;
158+
property public final String description;
155159
enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum COMPACT;
156160
enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum EXPANDED;
157161
enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum MEDIUM;

espresso/idling_resource/java/androidx/test/espresso/api/current_public.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ package androidx.test.espresso {
55
method public static androidx.test.espresso.IdlingRegistry! getInstance();
66
method public java.util.Collection<android.os.Looper!>! getLoopers();
77
method public java.util.Collection<androidx.test.espresso.IdlingResource!>! getResources();
8-
method public boolean register(androidx.test.espresso.IdlingResource!...);
8+
method public boolean register(androidx.test.espresso.IdlingResource!...!);
99
method public void registerLooperAsIdlingResource(android.os.Looper!);
10-
method public boolean unregister(androidx.test.espresso.IdlingResource!...);
10+
method public boolean unregister(androidx.test.espresso.IdlingResource!...!);
1111
method public boolean unregisterLooperAsIdlingResource(android.os.Looper!);
1212
}
1313

espresso/intents/java/androidx/test/espresso/intent/api/current_public.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ package androidx.test.espresso.intent {
88
public final class Checks {
99
method public static void checkArgument(boolean);
1010
method public static void checkArgument(boolean, Object!);
11-
method public static void checkArgument(boolean, String!, java.lang.Object!...);
11+
method public static void checkArgument(boolean, String!, java.lang.Object!...!);
1212
method public static <T> T! checkNotNull(T!);
1313
method public static <T> T! checkNotNull(T!, Object!);
14-
method public static <T> T! checkNotNull(T!, String!, java.lang.Object!...);
14+
method public static <T> T! checkNotNull(T!, String!, java.lang.Object!...!);
1515
method public static void checkState(boolean, Object!);
16-
method public static void checkState(boolean, String!, java.lang.Object!...);
16+
method public static void checkState(boolean, String!, java.lang.Object!...!);
1717
}
1818

1919
public final class Intents {
@@ -65,16 +65,16 @@ package androidx.test.espresso.intent {
6565
public static class RuntimePermissionsStubber.ActivityResultBuilder {
6666
ctor public RuntimePermissionsStubber.ActivityResultBuilder();
6767
method public android.app.Instrumentation.ActivityResult! build();
68-
method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withGrantedPermissions(java.lang.String!...);
68+
method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withGrantedPermissions(java.lang.String!...!);
6969
method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withResultCode(int);
70-
method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withRevokedPermissions(java.lang.String!...);
70+
method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withRevokedPermissions(java.lang.String!...!);
7171
}
7272

7373
public static class RuntimePermissionsStubber.Matchers {
7474
ctor public RuntimePermissionsStubber.Matchers();
7575
method public static org.hamcrest.Matcher<android.content.Intent!>! anyPermission();
7676
method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermission(String!);
77-
method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermissions(java.lang.String!...);
77+
method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermissions(java.lang.String!...!);
7878
method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermissions(org.hamcrest.Matcher<java.lang.Iterable<java.lang.String!>!>!);
7979
field public static final String ACTION_REQUEST_PERMISSIONS = "android.content.pm.action.REQUEST_PERMISSIONS";
8080
}
@@ -129,7 +129,7 @@ package androidx.test.espresso.intent.matcher {
129129
method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(String!);
130130
method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(org.hamcrest.Matcher<java.lang.String!>!);
131131
method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(java.util.Set<java.lang.String!>!);
132-
method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(org.hamcrest.Matcher<? extends java.lang.Iterable<? super java.lang.String>>!);
132+
method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(org.hamcrest.Matcher<? extends java.lang.Iterable<? super java.lang.String!>!>!);
133133
method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(android.content.ComponentName!);
134134
method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(String!);
135135
method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(org.hamcrest.Matcher<android.content.ComponentName!>!);
@@ -145,7 +145,7 @@ package androidx.test.espresso.intent.matcher {
145145
method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtras(org.hamcrest.Matcher<android.os.Bundle!>!);
146146
method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlag(int);
147147
method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlags(int);
148-
method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlags(int...);
148+
method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlags(int...!);
149149
method public static org.hamcrest.Matcher<android.content.Intent!>! hasPackage(String!);
150150
method public static org.hamcrest.Matcher<android.content.Intent!>! hasPackage(org.hamcrest.Matcher<java.lang.String!>!);
151151
method public static org.hamcrest.Matcher<android.content.Intent!>! hasType(String!);

espresso/remote/java/androidx/test/espresso/remote/api/current_public.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package androidx.test.espresso.remote {
77

88
public final class EspressoRemote implements androidx.test.espresso.remote.RemoteInteraction {
99
method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
10-
method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...);
10+
method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...!);
1111
method public static androidx.test.espresso.remote.EspressoRemote! getInstance();
1212
method public void init();
1313
method public boolean isRemoteProcess();
@@ -92,12 +92,12 @@ package androidx.test.espresso.remote {
9292
public static final class RemoteDescriptor.Builder {
9393
ctor public RemoteDescriptor.Builder();
9494
method public androidx.test.espresso.remote.RemoteDescriptor! build();
95-
method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceFieldDescriptors(androidx.test.espresso.remote.FieldDescriptor!...);
95+
method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceFieldDescriptors(androidx.test.espresso.remote.FieldDescriptor!...?);
9696
method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceType(Class<?>);
9797
method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoBuilderType(Class<?>);
9898
method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoParser(com.google.protobuf.Parser<?>);
9999
method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoType(Class<?>);
100-
method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteConstrTypes(Class<?>!...);
100+
method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteConstrTypes(Class<?>!...?);
101101
method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteType(Class<?>);
102102
}
103103

espresso/web/java/androidx/test/espresso/web/api/current_public.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ package androidx.test.espresso.web.assertion {
5555
public final class WebViewAssertions {
5656
method public static androidx.test.espresso.web.assertion.WebAssertion<org.w3c.dom.Document!>! webContent(org.hamcrest.Matcher<org.w3c.dom.Document!>!);
5757
method public static <E> androidx.test.espresso.web.assertion.WebAssertion<E!>! webMatches(androidx.test.espresso.web.model.Atom<E!>!, org.hamcrest.Matcher<E!>!);
58-
method public static <E> androidx.test.espresso.web.assertion.WebAssertion<E!>! webMatches(androidx.test.espresso.web.model.Atom<E!>!, org.hamcrest.Matcher<E!>!, androidx.test.espresso.web.assertion.WebViewAssertions.ResultDescriber<? super E>!);
58+
method public static <E> androidx.test.espresso.web.assertion.WebAssertion<E!>! webMatches(androidx.test.espresso.web.model.Atom<E!>!, org.hamcrest.Matcher<E!>!, androidx.test.espresso.web.assertion.WebViewAssertions.ResultDescriber<? super E!>!);
5959
}
6060

6161
public static interface WebViewAssertions.ResultDescriber<E> {

ext/truth/java/androidx/test/ext/truth/api/current_public.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ package androidx.test.ext.truth.content {
2929

3030
public final class IntentCorrespondences {
3131
method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! action();
32-
method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! all(com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>!...);
32+
method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! all(com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>!...!);
3333
method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! data();
3434
}
3535

runner/android_junit_runner/java/androidx/test/api/current_public.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ package androidx.test.filters {
1010
}
1111

1212
@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface CustomFilter {
13-
method public abstract Class<? extends androidx.test.filters.AbstractFilter> filterClass();
13+
method public abstract Class<? extends androidx.test.filters.AbstractFilter!> filterClass();
1414
}
1515

1616
@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 {

runner/monitor/java/androidx/test/api/current_internal.txt

+12-12
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ package androidx.test.internal.platform.app {
2323
@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ActivityInvoker {
2424
method public void finishActivity(android.app.Activity!);
2525
method public android.app.Instrumentation.ActivityResult! getActivityResult();
26-
method public default android.content.Intent! getIntentForActivity(Class<? extends android.app.Activity>!);
26+
method public default android.content.Intent! getIntentForActivity(Class<? extends android.app.Activity!>!);
2727
method public void pauseActivity(android.app.Activity!);
2828
method public void recreateActivity(android.app.Activity!);
2929
method public void resumeActivity(android.app.Activity!);
@@ -72,10 +72,10 @@ package androidx.test.internal.platform.reflect {
7272
}
7373

7474
@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectiveMethod<T> {
75-
ctor public ReflectiveMethod(Class<?>!, String!, Class<?>!...);
76-
ctor public ReflectiveMethod(String!, String!, Class<?>!...);
77-
method public T! invoke(Object!, java.lang.Object!...) throws androidx.test.internal.platform.reflect.ReflectionException;
78-
method public T! invokeStatic(java.lang.Object!...) throws androidx.test.internal.platform.reflect.ReflectionException;
75+
ctor public ReflectiveMethod(Class<?>!, String!, Class<?>!...!);
76+
ctor public ReflectiveMethod(String!, String!, Class<?>!...!);
77+
method public T! invoke(Object!, java.lang.Object!...!) throws androidx.test.internal.platform.reflect.ReflectionException;
78+
method public T! invokeStatic(java.lang.Object!...!) throws androidx.test.internal.platform.reflect.ReflectionException;
7979
}
8080

8181
}
@@ -143,22 +143,22 @@ package androidx.test.internal.util {
143143
@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class Checks {
144144
method public static void checkArgument(boolean);
145145
method public static void checkArgument(boolean, Object!);
146-
method public static void checkArgument(boolean, String!, java.lang.Object!...);
146+
method public static void checkArgument(boolean, String!, java.lang.Object!...!);
147147
method public static void checkMainThread();
148148
method public static void checkNotMainThread();
149149
method public static <T> T checkNotNull(T!);
150150
method public static <T> T checkNotNull(T!, Object!);
151-
method public static <T> T checkNotNull(T!, String!, java.lang.Object!...);
151+
method public static <T> T checkNotNull(T!, String!, java.lang.Object!...!);
152152
method public static void checkState(boolean);
153153
method public static void checkState(boolean, Object!);
154-
method public static void checkState(boolean, String!, java.lang.Object!...);
154+
method public static void checkState(boolean, String!, java.lang.Object!...!);
155155
}
156156

157157
@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class LogUtil {
158158
ctor public LogUtil();
159159
method public static androidx.test.internal.util.LogUtil.Supplier! lazyArg(androidx.test.internal.util.LogUtil.Supplier!);
160-
method public static void logDebug(String!, String!, java.lang.Object!...);
161-
method public static void logDebugWithProcess(String!, String!, java.lang.Object!...);
160+
method public static void logDebug(String!, String!, java.lang.Object!...!);
161+
method public static void logDebugWithProcess(String!, String!, java.lang.Object!...!);
162162
}
163163

164164
public static interface LogUtil.Supplier {
@@ -176,8 +176,8 @@ package androidx.test.internal.util {
176176

177177
@Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectionUtil {
178178
ctor @Deprecated public ReflectionUtil();
179-
method @Deprecated public static Object! callStaticMethod(Class<?>!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
180-
method @Deprecated public static Object! callStaticMethod(String!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
179+
method @Deprecated public static Object! callStaticMethod(Class<?>!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...!) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
180+
method @Deprecated public static Object! callStaticMethod(String!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...!) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
181181
}
182182

183183
@Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static class ReflectionUtil.ReflectionException extends java.lang.Exception {

0 commit comments

Comments
 (0)