Merge "Update frameworks tests for truth 0.42" into qt-dev-plus-aosp

2 files changed, 18 insertions, 20 deletions

diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTraceSubject.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTraceSubject.java
index b4c97e4fc4f2..4085810a213d 100644
--- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTraceSubject.java
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/LayersTraceSubject.java
@@ -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;
     }
 
diff --git a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WmTraceSubject.java b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WmTraceSubject.java
index 1fc7d591d2bb..e76da6e90834 100644
--- a/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WmTraceSubject.java
+++ b/tests/FlickerTests/lib/src/com/android/server/wm/flicker/WmTraceSubject.java
@@ -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;
     }