Skip to content

Commit 81cf3cb

Browse files
Use Consumer instead of Function1 in DisplayDataMatcher.
PiperOrigin-RevId: 838903556
1 parent 6c2d53d commit 81cf3cb

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

espresso/core/java/androidx/test/espresso/DataInteraction.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
4242
import androidx.test.espresso.remote.annotation.RemoteMsgField;
4343
import androidx.test.espresso.util.EspressoOptional;
44+
import java.util.function.Consumer;
4445
import javax.annotation.CheckReturnValue;
45-
import kotlin.jvm.functions.Function1;
4646
import org.hamcrest.Description;
4747
import org.hamcrest.Matcher;
4848
import org.hamcrest.TypeSafeMatcher;
@@ -219,14 +219,13 @@ private DisplayDataMatcher(
219219
@NonNull Matcher<? extends Object> dataMatcher,
220220
@NonNull AdapterViewProtocol adapterViewProtocol,
221221
@NonNull AdapterDataLoaderAction adapterDataLoaderAction,
222-
@NonNull Function1<AdapterDataLoaderAction, ViewInteraction> loadDataFunction) {
222+
@NonNull Consumer<AdapterDataLoaderAction> loadDataFunction) {
223223
this.adapterMatcher = checkNotNull(adapterMatcher);
224224
this.dataMatcher = checkNotNull(dataMatcher);
225225
this.adapterViewProtocol = checkNotNull(adapterViewProtocol);
226226
this.adapterViewProtocolClass = adapterViewProtocol.getClass();
227227
this.adapterDataLoaderAction = checkNotNull(adapterDataLoaderAction);
228-
// TODO(b/223229374): This return value was unused, but likely should have been used.
229-
Object unused = checkNotNull(loadDataFunction).invoke(adapterDataLoaderAction);
228+
checkNotNull(loadDataFunction).accept(adapterDataLoaderAction);
230229
}
231230

232231
/**

espresso/remote/javatests/androidx/test/espresso/DisplayDataMatcherRemoteMsgTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private static DisplayDataMatcherProto toProto() {
7070
stringMatcher,
7171
adapterViewProtocol,
7272
adapterDataLoaderAction,
73-
adapterDataLoaderAction1 -> null);
73+
adapterDataLoaderAction1 -> {});
7474
return (DisplayDataMatcherProto) new GenericRemoteMessage(displayDataMatcher).toProto();
7575
}
7676

0 commit comments

Comments
 (0)