Skip to content

Commit 56d05cb

Browse files
sfreilichcopybara-androidxtest
sfreilich
authored and
copybara-androidxtest
committed
Internal change
COPYBARA_INTEGRATE_REVIEW=N/A PiperOrigin-RevId: 885180733
1 parent b8bf75d commit 56d05cb

15 files changed

Lines changed: 153 additions & 144 deletions

File tree

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ package androidx.test.core.app {
55
method public void close();
66
method public android.app.Instrumentation.ActivityResult! getResult();
77
method public androidx.lifecycle.Lifecycle.State! getState();
8-
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(android.content.Intent!);
9-
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(android.content.Intent!, android.os.Bundle?);
10-
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(Class<A!>!);
11-
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(Class<A!>!, android.os.Bundle?);
12-
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(android.content.Intent);
13-
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(android.content.Intent, android.os.Bundle?);
14-
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(Class<A!>);
15-
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(Class<A!>, android.os.Bundle?);
16-
method public androidx.test.core.app.ActivityScenario<A!>! moveToState(androidx.lifecycle.Lifecycle.State!);
17-
method public androidx.test.core.app.ActivityScenario<A!>! onActivity(androidx.test.core.app.ActivityScenario.ActivityAction<A!>!);
18-
method public androidx.test.core.app.ActivityScenario<A!>! recreate();
8+
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A>! launch(android.content.Intent!);
9+
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A>! launch(android.content.Intent!, android.os.Bundle?);
10+
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A>! launch(Class<A>!);
11+
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A>! launch(Class<A>!, android.os.Bundle?);
12+
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivityForResult(android.content.Intent);
13+
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivityForResult(android.content.Intent, android.os.Bundle?);
14+
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivityForResult(Class<A>);
15+
method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivityForResult(Class<A>, android.os.Bundle?);
16+
method public androidx.test.core.app.ActivityScenario<A>! moveToState(androidx.lifecycle.Lifecycle.State!);
17+
method public androidx.test.core.app.ActivityScenario<A>! onActivity(androidx.test.core.app.ActivityScenario.ActivityAction<A>!);
18+
method public androidx.test.core.app.ActivityScenario<A>! recreate();
1919
}
2020

2121
public static interface ActivityScenario.ActivityAction<A extends android.app.Activity> {
22-
method public void perform(A!);
22+
method public void perform(A);
2323
}
2424

2525
public final class ApplicationProvider {
26-
method public static <T extends android.content.Context> T! getApplicationContext();
26+
method public static <T extends android.content.Context> T getApplicationContext();
2727
}
2828

2929
public final class DeviceCapture {
@@ -65,7 +65,7 @@ package androidx.test.core.graphics {
6565
package androidx.test.core.os {
6666

6767
public final class Parcelables {
68-
method public static <T extends android.os.Parcelable> T! forceParcel(T!, android.os.Parcelable.Creator<T!>!);
68+
method public static <T extends android.os.Parcelable> T forceParcel(T, android.os.Parcelable.Creator<T>!);
6969
}
7070

7171
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ package androidx.test.espresso.contrib {
4040
}
4141

4242
public final class RecyclerViewActions {
43-
method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! actionOnHolderItem(org.hamcrest.Matcher<VH!>!, androidx.test.espresso.ViewAction!);
43+
method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! actionOnHolderItem(org.hamcrest.Matcher<VH>!, androidx.test.espresso.ViewAction!);
4444
method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! actionOnItem(org.hamcrest.Matcher<android.view.View!>!, androidx.test.espresso.ViewAction!);
4545
method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction! actionOnItemAtPosition(int, androidx.test.espresso.ViewAction!);
4646
method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! scrollTo(org.hamcrest.Matcher<android.view.View!>!);
47-
method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! scrollToHolder(org.hamcrest.Matcher<VH!>!);
47+
method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! scrollToHolder(org.hamcrest.Matcher<VH>!);
4848
method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction scrollToLastPosition();
4949
method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction! scrollToPosition(int);
5050
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ package androidx.test.espresso.util {
2929
}
3030

3131
@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class Iterators {
32-
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static <T> T![]! toArray(java.util.Iterator<T!>!, Class<T!>!);
32+
method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static <T> T[]! toArray(java.util.Iterator<T>!, Class<T>!);
3333
}
3434

3535
public final class StringJoinerKt {

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

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ package androidx.test.espresso {
4646
method @Deprecated public static java.util.List<androidx.test.espresso.IdlingResource!>! getIdlingResources();
4747
method @CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.DataInteraction! onData(org.hamcrest.Matcher<? extends java.lang.Object!>!);
4848
method public static void onIdle();
49-
method public static <T> T! onIdle(java.util.concurrent.Callable<T!>!);
49+
method public static <T> T onIdle(java.util.concurrent.Callable<T>!);
5050
method @CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.ViewInteraction! onView(org.hamcrest.Matcher<android.view.View!>!);
5151
method public static void openActionBarOverflowOrOptionsMenu(android.content.Context!);
5252
method public static void openContextualActionModeOverflowMenu();
@@ -233,11 +233,11 @@ package androidx.test.espresso.action {
233233

234234
public final class CaptureToBitmapAction implements androidx.test.espresso.ViewAction {
235235
ctor public CaptureToBitmapAction(androidx.test.espresso.action.ViewActions.BitmapReceiver bitmapReceiver);
236-
method public androidx.test.espresso.action.ViewActions.BitmapReceiver getBitmapReceiver();
236+
method @InaccessibleFromKotlin public androidx.test.espresso.action.ViewActions.BitmapReceiver getBitmapReceiver();
237237
method public org.hamcrest.Matcher<android.view.View> getConstraints();
238238
method public String getDescription();
239239
method public void perform(androidx.test.espresso.UiController uiController, android.view.View view);
240-
property public final androidx.test.espresso.action.ViewActions.BitmapReceiver bitmapReceiver;
240+
property public androidx.test.espresso.action.ViewActions.BitmapReceiver bitmapReceiver;
241241
}
242242

243243
public final class CloseKeyboardAction implements androidx.test.espresso.ViewAction {
@@ -560,46 +560,46 @@ package androidx.test.espresso.base {
560560
package androidx.test.espresso.core.internal.deps.guava.base {
561561

562562
@Deprecated public interface Function<F, T> {
563-
method @Deprecated public T! apply(F!);
563+
method @Deprecated public T apply(F);
564564
}
565565

566566
@Deprecated public class Optional<T> implements java.io.Serializable {
567-
method @Deprecated public java.util.Set<T!>! asSet();
568-
method @Deprecated public static <T> androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>! fromNullable(T?);
569-
method @Deprecated public T! get();
567+
method @Deprecated public java.util.Set<T>! asSet();
568+
method @Deprecated public static <T> androidx.test.espresso.core.internal.deps.guava.base.Optional<T>! fromNullable(T?);
569+
method @Deprecated public T get();
570570
method @Deprecated public boolean isPresent();
571-
method @Deprecated public static <T> androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>! of(T!);
572-
method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>! or(androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>!);
573-
method @Deprecated public T! or(androidx.test.espresso.core.internal.deps.guava.base.Supplier<T!>!);
574-
method @Deprecated public T! or(T!);
575-
method @Deprecated public T! orNull();
576-
method @Deprecated public static <T> Iterable<T!>! presentInstances(Iterable<? extends androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T!>!>!);
577-
method @Deprecated public <V> androidx.test.espresso.core.internal.deps.guava.base.Optional<V!>! transform(androidx.test.espresso.core.internal.deps.guava.base.Function<? super T!,V!>!);
571+
method @Deprecated public static <T> androidx.test.espresso.core.internal.deps.guava.base.Optional<T>! of(T);
572+
method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional<T>! or(androidx.test.espresso.core.internal.deps.guava.base.Optional<T>!);
573+
method @Deprecated public T or(androidx.test.espresso.core.internal.deps.guava.base.Supplier<T>!);
574+
method @Deprecated public T or(T);
575+
method @Deprecated public T orNull();
576+
method @Deprecated public static <T> Iterable<T>! presentInstances(Iterable<? extends androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T>!>!);
577+
method @Deprecated public <V> androidx.test.espresso.core.internal.deps.guava.base.Optional<V>! transform(androidx.test.espresso.core.internal.deps.guava.base.Function<? super T,V>!);
578578
}
579579

580580
@Deprecated public interface Supplier<T> {
581-
method @Deprecated public T! get();
581+
method @Deprecated public T get();
582582
}
583583

584584
}
585585

586586
package androidx.test.espresso.matcher {
587587

588-
public abstract class BoundedDiagnosingMatcher<S, T extends S> extends org.hamcrest.BaseMatcher<S!> {
589-
ctor public BoundedDiagnosingMatcher(Class<? extends S!>!);
590-
ctor public BoundedDiagnosingMatcher(Class<? extends S!>!, Class<? extends java.lang.Object!>!, Class<? extends java.lang.Object!>!...!);
588+
public abstract class BoundedDiagnosingMatcher<S, T extends S> extends org.hamcrest.BaseMatcher<S> {
589+
ctor public BoundedDiagnosingMatcher(Class<? extends S>!);
590+
ctor public BoundedDiagnosingMatcher(Class<? extends S>!, Class<? extends java.lang.Object!>!, Class<? extends java.lang.Object!>!...!);
591591
method public final void describeMismatch(Object!, org.hamcrest.Description!);
592592
method protected abstract void describeMoreTo(org.hamcrest.Description!);
593593
method public final void describeTo(org.hamcrest.Description!);
594594
method public final boolean matches(Object!);
595-
method protected abstract boolean matchesSafely(T!, org.hamcrest.Description!);
595+
method protected abstract boolean matchesSafely(T, org.hamcrest.Description!);
596596
}
597597

598-
public abstract class BoundedMatcher<T, S extends T> extends org.hamcrest.BaseMatcher<T!> {
599-
ctor public BoundedMatcher(Class<? extends S!>!);
598+
public abstract class BoundedMatcher<T, S extends T> extends org.hamcrest.BaseMatcher<T> {
599+
ctor public BoundedMatcher(Class<? extends S>!);
600600
ctor public BoundedMatcher(Class<? extends java.lang.Object!>!, Class<? extends java.lang.Object!>!, Class<? extends java.lang.Object!>!...!);
601601
method public final boolean matches(Object!);
602-
method protected abstract boolean matchesSafely(S!);
602+
method protected abstract boolean matchesSafely(S);
603603
}
604604

605605
public final class CursorMatchers {
@@ -681,8 +681,8 @@ package androidx.test.espresso.matcher {
681681
}
682682

683683
public final class ViewMatchers {
684-
method public static <T> void assertThat(String!, T!, org.hamcrest.Matcher<T!>!);
685-
method public static <T> void assertThat(T!, org.hamcrest.Matcher<T!>!);
684+
method public static <T> void assertThat(String!, T, org.hamcrest.Matcher<T>!);
685+
method public static <T> void assertThat(T, org.hamcrest.Matcher<T>!);
686686
method public static org.hamcrest.Matcher<android.view.View!>! doesNotHaveFocus();
687687
method public static org.hamcrest.Matcher<android.view.View!>! hasBackground(int);
688688
method public static org.hamcrest.Matcher<android.view.View!>! hasChildCount(int);
@@ -776,11 +776,11 @@ package androidx.test.espresso.remote {
776776
}
777777

778778
public static interface EspressoRemoteMessage.From<T, M> {
779-
method public T! fromProto(M!);
779+
method public T fromProto(M);
780780
}
781781

782782
public static interface EspressoRemoteMessage.To<M> {
783-
method public M! toProto();
783+
method public M toProto();
784784
}
785785

786786
public final class NoRemoteEspressoInstanceException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
@@ -839,18 +839,18 @@ package androidx.test.espresso.util {
839839
}
840840

841841
@Deprecated public final class EspressoOptional<T> {
842-
method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T!>! absent();
843-
method @Deprecated public java.util.Set<T!>! asSet();
844-
method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T!>! fromNullable(T!);
845-
method @Deprecated public T! get();
842+
method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T>! absent();
843+
method @Deprecated public java.util.Set<T>! asSet();
844+
method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T>! fromNullable(T);
845+
method @Deprecated public T get();
846846
method @Deprecated public boolean isPresent();
847-
method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T!>! of(T!);
848-
method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>! or(androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T!>!);
849-
method @Deprecated public T! or(androidx.test.espresso.core.internal.deps.guava.base.Supplier<? extends T!>!);
850-
method @Deprecated public T! or(T!);
851-
method @Deprecated public T! orNull();
852-
method @Deprecated public static <T> Iterable<T!>! presentInstances(Iterable<? extends androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T!>!>!);
853-
method @Deprecated public <V> androidx.test.espresso.core.internal.deps.guava.base.Optional<V!>! transform(androidx.test.espresso.core.internal.deps.guava.base.Function<? super T!,V!>!);
847+
method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T>! of(T);
848+
method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional<T>! or(androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T>!);
849+
method @Deprecated public T or(androidx.test.espresso.core.internal.deps.guava.base.Supplier<? extends T>!);
850+
method @Deprecated public T or(T);
851+
method @Deprecated public T orNull();
852+
method @Deprecated public static <T> Iterable<T>! presentInstances(Iterable<? extends androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T>!>!);
853+
method @Deprecated public <V> androidx.test.espresso.core.internal.deps.guava.base.Optional<V>! transform(androidx.test.espresso.core.internal.deps.guava.base.Function<? super T,V>!);
854854
}
855855

856856
public final class HumanReadables {
@@ -860,10 +860,10 @@ package androidx.test.espresso.util {
860860
method public static String! getViewHierarchyErrorMessage(android.view.View!, java.util.List<android.view.View!>!, String!, String!, int);
861861
}
862862

863-
public final class IterablesKt {
863+
@SuppressCompatibility public final class IterablesKt {
864864
}
865865

866-
public final class StringJoinerKt {
866+
@SuppressCompatibility public final class StringJoinerKt {
867867
}
868868

869869
public final class TreeIterables {

0 commit comments

Comments
 (0)