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

Commit b6cf22da authored by Colin Cross's avatar Colin Cross
Browse files

Update frameworks tests for truth 0.42 

SubjectFactory has been replaced with Subject.Factory.

Bug: 130435731
Test: m checkbuild
Change-Id: I5ae4009aeeab54518c5169a5cd37948cb056058e
parent bb59cf5a

packages/ExtServices/tests/src/android/ext/services/notification/SmartActionsHelperTest.java

+8 −9
Original line number Diff line number Diff line
@@ -49,9 +49,8 @@ import android.view.textclassifier.TextClassifierEvent; 
import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import com.google.common.truth.FailureStrategy;

import com.google.common.truth.FailureMetadata;

import com.google.common.truth.Subject;

import com.google.common.truth.SubjectFactory;



import org.junit.Before;

import org.junit.Test;
@@ -500,19 +499,19 @@ public class SmartActionsHelperTest { 
    private static final class MessageSubject

            extends Subject<MessageSubject, ConversationActions.Message> {



        private static final SubjectFactory<MessageSubject, ConversationActions.Message> FACTORY =

                new SubjectFactory<MessageSubject, ConversationActions.Message>() {

        private static final Subject.Factory<MessageSubject, ConversationActions.Message> FACTORY =

                new Subject.Factory<MessageSubject, ConversationActions.Message>() {

                    @Override

                    public MessageSubject getSubject(

                            @NonNull FailureStrategy failureStrategy,

                    public MessageSubject createSubject(

                            @NonNull FailureMetadata failureMetadata,

                            @NonNull ConversationActions.Message subject) {

                        return new MessageSubject(failureStrategy, subject);

                        return new MessageSubject(failureMetadata, subject);

                    }

                };



        private MessageSubject(

                FailureStrategy failureStrategy, @Nullable ConversationActions.Message subject) {

            super(failureStrategy, subject);

                FailureMetadata failureMetadata, @Nullable ConversationActions.Message subject) {

            super(failureMetadata, subject);

        }



        private void hasText(String text) {

tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTraceSubject.java

+9 −10
Original line number Diff line number Diff line
@@ -26,9 +26,8 @@ import com.android.server.wm.flicker.Assertions.Result; 
import com.android.server.wm.flicker.LayersTrace.Entry;

import com.android.server.wm.flicker.TransitionRunner.TransitionResult;



import com.google.common.truth.FailureStrategy;

import com.google.common.truth.FailureMetadata;

import com.google.common.truth.Subject;

import com.google.common.truth.SubjectFactory;



import java.util.List;

import java.util.stream.Collectors;
@@ -38,19 +37,19 @@ import java.util.stream.Collectors; 
 */

public class LayersTraceSubject extends Subject<LayersTraceSubject, LayersTrace> {

    // Boiler-plate Subject.Factory for LayersTraceSubject

    private static final SubjectFactory<LayersTraceSubject, LayersTrace> FACTORY =

            new SubjectFactory<LayersTraceSubject, LayersTrace>() {

    private static final Subject.Factory<LayersTraceSubject, LayersTrace> FACTORY =

            new Subject.Factory<LayersTraceSubject, LayersTrace>() {

                @Override

                public LayersTraceSubject getSubject(

                        FailureStrategy fs, @Nullable LayersTrace target) {

                    return new LayersTraceSubject(fs, target);

                public LayersTraceSubject createSubject(

                        FailureMetadata fm, @Nullable LayersTrace target) {

                    return new LayersTraceSubject(fm, target);

                }

            };



    private AssertionsChecker<Entry> mChecker = new AssertionsChecker<>();



    private LayersTraceSubject(FailureStrategy fs, @Nullable LayersTrace subject) {

        super(fs, subject);

    private LayersTraceSubject(FailureMetadata fm, @Nullable LayersTrace subject) {

        super(fm, subject);

    }



    // User-defined entry point
@@ -66,7 +65,7 @@ public class LayersTraceSubject extends Subject<LayersTraceSubject, LayersTrace> 
    }



    // Static method for getting the subject factory (for use with assertAbout())

    public static SubjectFactory<LayersTraceSubject, LayersTrace> entries() {

    public static Subject.Factory<LayersTraceSubject, LayersTrace> entries() {

        return FACTORY;

    }

tests/FlickerTests/lib/src/com/android/server/wm/flicker/WmTraceSubject.java

+9 −10
Original line number Diff line number Diff line
@@ -24,9 +24,8 @@ import android.annotation.Nullable; 
import com.android.server.wm.flicker.Assertions.Result;

import com.android.server.wm.flicker.TransitionRunner.TransitionResult;



import com.google.common.truth.FailureStrategy;

import com.google.common.truth.FailureMetadata;

import com.google.common.truth.Subject;

import com.google.common.truth.SubjectFactory;



import java.nio.file.Path;

import java.util.List;
@@ -38,19 +37,19 @@ import java.util.stream.Collectors; 
 */

public class WmTraceSubject extends Subject<WmTraceSubject, WindowManagerTrace> {

    // Boiler-plate Subject.Factory for WmTraceSubject

    private static final SubjectFactory<WmTraceSubject, WindowManagerTrace> FACTORY =

            new SubjectFactory<WmTraceSubject, WindowManagerTrace>() {

    private static final Subject.Factory<WmTraceSubject, WindowManagerTrace> FACTORY =

            new Subject.Factory<WmTraceSubject, WindowManagerTrace>() {

                @Override

                public WmTraceSubject getSubject(

                        FailureStrategy fs, @Nullable WindowManagerTrace target) {

                    return new WmTraceSubject(fs, target);

                public WmTraceSubject createSubject(

                        FailureMetadata fm, @Nullable WindowManagerTrace target) {

                    return new WmTraceSubject(fm, target);

                }

            };



    private AssertionsChecker<WindowManagerTrace.Entry> mChecker = new AssertionsChecker<>();



    private WmTraceSubject(FailureStrategy fs, @Nullable WindowManagerTrace subject) {

        super(fs, subject);

    private WmTraceSubject(FailureMetadata fm, @Nullable WindowManagerTrace subject) {

        super(fm, subject);

    }



    // User-defined entry point
@@ -66,7 +65,7 @@ public class WmTraceSubject extends Subject<WmTraceSubject, WindowManagerTrace> 
    }



    // Static method for getting the subject factory (for use with assertAbout())

    public static SubjectFactory<WmTraceSubject, WindowManagerTrace> entries() {

    public static Subject.Factory<WmTraceSubject, WindowManagerTrace> entries() {

        return FACTORY;

    }