PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update SettingsRoboTests for truth 0.42"

Browse Source
This commit is contained in:
Colin Cross
2019-04-17 23:16:08 +00:00
committed by Gerrit Code Review
parent 1d518f422b 56f3f41115
commit 1e342c5be6
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/robotests/src/com/android/settings/testutils/ResIdSubject.java
View File

@@ -23,8 +23,8 @@ import static org.robolectric.RuntimeEnvironment.application;
import androidx.annotation.Nullable;
import com.google.common.truth.ComparableSubject;
import com.google.common.truth.FailureStrategy;
import com.google.common.truth.SubjectFactory;
import com.google.common.truth.FailureMetadata;
import com.google.common.truth.Subject;
/**
* Custom subject for use with {@link com.google.common.truth.Truth}, to provide a more readable
@@ -38,12 +38,12 @@ import com.google.common.truth.SubjectFactory;
*/
public class ResIdSubject extends ComparableSubject<ResIdSubject, Integer> {
public static final SubjectFactory<ResIdSubject, Integer> FACTORY =
new SubjectFactory<ResIdSubject, Integer>() {
public static final Subject.Factory<ResIdSubject, Integer> FACTORY =
new Subject.Factory<ResIdSubject, Integer>() {
@Override
public ResIdSubject getSubject(
FailureStrategy failureStrategy, Integer integer) {
return new ResIdSubject(failureStrategy, integer);
public ResIdSubject createSubject(
FailureMetadata failureMetadata, Integer integer) {
return new ResIdSubject(failureMetadata, integer);
}
};
@@ -52,9 +52,9 @@ public class ResIdSubject extends ComparableSubject<ResIdSubject, Integer> {
}
public ResIdSubject(
FailureStrategy failureStrategy,
FailureMetadata failureMetadata,
@Nullable Integer integer) {
super(failureStrategy, integer);
super(failureMetadata, integer);
}
public void isEqualTo(int other) {
@@ -65,7 +65,7 @@ public class ResIdSubject extends ComparableSubject<ResIdSubject, Integer> {
}
@Override
protected String getDisplaySubject() {
protected String actualCustomStringRepresentation() {
String resourceName = "<" + resIdToString(getSubject()) + ">";
String customName = internalCustomName();
if (customName != null) {