Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56f3f411 authored by Colin Cross's avatar Colin Cross
Browse files

Update SettingsRoboTests for truth 0.42 

SubjectFactory has been replaced with Subject.Factory.

Subject.getDisplaySubject has been replaced with
actualCustomStringRepresentation.

Bug: 130435731
Test: m checkbuild
Change-Id: I2799badfb79432ec70cb928b77294d6940cfc019
Merged-In: I32cb2fcf6094675f79d2fc24702ef6298a9691e4
parent c99fddfe

tests/robotests/src/com/android/settings/testutils/ResIdSubject.java

+10 −10
Original line number Diff line number Diff line
@@ -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) {