Merge "Fix master build"

This commit is contained in:
Fan Zhang
2017-06-06 20:23:08 +00:00
committed by Android (Google) Code Review

View File

@@ -45,7 +45,6 @@ import java.util.Objects;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -162,9 +161,10 @@ public class IntentSearchViewHolderTest {
public void testBindElements_dynamicSummary_visibilityIsGone() { public void testBindElements_dynamicSummary_visibilityIsGone() {
String dynamicSummary = "%s"; String dynamicSummary = "%s";
SearchResult result = new Builder() SearchResult result = new Builder()
.addTitle(TITLE) .setTitle(TITLE)
.addSummary(dynamicSummary) .setSummary(dynamicSummary)
.addPayload(new IntentPayload(null)) .setPayload(new ResultPayload(null))
.setStableId(1)
.build(); .build();
mHolder.onBind(mFragment, result); mHolder.onBind(mFragment, result);