Migrate away from deprecated Truth APIs.
This is a transitional step towards truth 1.0.1, where these APIs have
been completely removed.
Bug: 168765701
Test: m checkbuild
Merged-In: Ice3df1dd062641a01b60b1fb42a954b1e833bd39
Change-Id: Ice3df1dd062641a01b60b1fb42a954b1e833bd39
(cherry picked from commit 41377d7d3dbcddc63ec89754b2ca689c179c985a)
diff --git a/tests/robotests/src/com/android/car/rotary/NavigatorTest.java b/tests/robotests/src/com/android/car/rotary/NavigatorTest.java
index b6e2156..47313c1 100644
--- a/tests/robotests/src/com/android/car/rotary/NavigatorTest.java
+++ b/tests/robotests/src/com/android/car/rotary/NavigatorTest.java
@@ -94,7 +94,7 @@
AccessibilityNodeInfo root = new NodeBuilder().build();
setRootNodeForWindow(root, window);
- assertThat(window.getRoot()).isSameAs(root);
+ assertThat(window.getRoot()).isSameInstanceAs(root);
}
/**
@@ -137,22 +137,22 @@
// Rotate once, the focus should move from button1 to button2.
FindRotateTargetResult target = mNavigator.findRotateTarget(button1, null, direction, 1);
- assertThat(target.node).isSameAs(button2);
+ assertThat(target.node).isSameInstanceAs(button2);
assertThat(target.advancedCount).isEqualTo(1);
// Rotate twice, the focus should move from button1 to button3.
target = mNavigator.findRotateTarget(button1, null, direction, 2);
- assertThat(target.node).isSameAs(button3);
+ assertThat(target.node).isSameInstanceAs(button3);
assertThat(target.advancedCount).isEqualTo(2);
// Rotate 3 times and exceed the boundary, the focus should stay at the boundary.
target = mNavigator.findRotateTarget(button1, null, direction, 3);
- assertThat(target.node).isSameAs(button3);
+ assertThat(target.node).isSameInstanceAs(button3);
assertThat(target.advancedCount).isEqualTo(2);
// Rotate once, skipping button2; the focus should move to button3.
target = mNavigator.findRotateTarget(button1, button2, direction, 1);
- assertThat(target.node).isSameAs(button3);
+ assertThat(target.node).isSameInstanceAs(button3);
assertThat(target.advancedCount).isEqualTo(1);
}
@@ -323,18 +323,18 @@
// Rotate once, the focus should move from button1 to button2.
FindRotateTargetResult target = mNavigator.findRotateTarget(button1, null, direction, 1);
- assertThat(target.node).isSameAs(button2);
+ assertThat(target.node).isSameInstanceAs(button2);
assertThat(target.advancedCount).isEqualTo(1);
// Rotate twice, the focus should move from button1 to button2 since button3 is out of
// bounds.
target = mNavigator.findRotateTarget(button1, null, direction, 2);
- assertThat(target.node).isSameAs(button2);
+ assertThat(target.node).isSameInstanceAs(button2);
assertThat(target.advancedCount).isEqualTo(1);
// Rotate three times should do the same.
target = mNavigator.findRotateTarget(button1, null, direction, 3);
- assertThat(target.node).isSameAs(button2);
+ assertThat(target.node).isSameInstanceAs(button2);
assertThat(target.advancedCount).isEqualTo(1);
}
@@ -514,7 +514,7 @@
// Nudge within the same window.
AccessibilityNodeInfo target =
mNavigator.findNudgeTarget(windows, topLeft1, View.FOCUS_DOWN);
- assertThat(target).isSameAs(bottomLeft1);
+ assertThat(target).isSameInstanceAs(bottomLeft1);
// Reach to the boundary.
target = mNavigator.findNudgeTarget(windows, topLeft1, View.FOCUS_UP);
@@ -522,7 +522,7 @@
// Nudge to a different window.
target = mNavigator.findNudgeTarget(windows, topRight1, View.FOCUS_LEFT);
- assertThat(target).isSameAs(topLeft2);
+ assertThat(target).isSameInstanceAs(topLeft2);
// When nudging back, the focus should return to the previously focused node within the
// previous focus area, rather than the geometrically close node or focus area.
@@ -531,10 +531,10 @@
mNavigator.saveFocusedNode(bottomLeft1);
// Then nudge to right.
target = mNavigator.findNudgeTarget(windows, bottomLeft1, View.FOCUS_RIGHT);
- assertThat(target).isSameAs(topRight1);
+ assertThat(target).isSameInstanceAs(topRight1);
// Then nudge back.
target = mNavigator.findNudgeTarget(windows, topRight1, View.FOCUS_LEFT);
- assertThat(target).isSameAs(bottomLeft1);
+ assertThat(target).isSameInstanceAs(bottomLeft1);
}
/**
@@ -647,7 +647,7 @@
// Nudge from left window to right window.
AccessibilityNodeInfo target = mNavigator.findNudgeTarget(windows, left, View.FOCUS_RIGHT);
- assertThat(target).isSameAs(right);
+ assertThat(target).isSameInstanceAs(right);
}
/**
@@ -799,16 +799,16 @@
// source and target overlap so geometric targeting fails. We should fall back to using the
// first focusable view in the HUN.
AccessibilityNodeInfo target = mNavigator.findNudgeTarget(windows, topLeft, View.FOCUS_UP);
- assertThat(target).isSameAs(hunLeft);
+ assertThat(target).isSameInstanceAs(hunLeft);
target = mNavigator.findNudgeTarget(windows, topRight, View.FOCUS_UP);
- assertThat(target).isSameAs(hunLeft);
+ assertThat(target).isSameInstanceAs(hunLeft);
// Nudging up from the bottom left or right view should go to the corresponding button in
// the HUN, skipping over the top focus area. Geometric targeting should work.
target = mNavigator.findNudgeTarget(windows, bottomLeft, View.FOCUS_UP);
- assertThat(target).isSameAs(hunLeft);
+ assertThat(target).isSameInstanceAs(hunLeft);
target = mNavigator.findNudgeTarget(windows, bottomRight, View.FOCUS_UP);
- assertThat(target).isSameAs(hunRight);
+ assertThat(target).isSameInstanceAs(hunRight);
}
/**
@@ -902,7 +902,7 @@
// Nudge from sourceView to right, and it should go to view1.
AccessibilityNodeInfo target
= mNavigator.findNudgeTarget(windows, sourceView, View.FOCUS_RIGHT);
- assertThat(target).isSameAs(view1);
+ assertThat(target).isSameInstanceAs(view1);
}
/**
@@ -985,7 +985,7 @@
// Nudge down from sourceView, and it should go to targetView.
AccessibilityNodeInfo target
= mNavigator.findNudgeTarget(windows, sourceView, View.FOCUS_DOWN);
- assertThat(target).isSameAs(targetView);
+ assertThat(target).isSameInstanceAs(targetView);
}
/**
@@ -1069,7 +1069,7 @@
// Nudge down from sourceView, and it should go to viewContainer.
AccessibilityNodeInfo target
= mNavigator.findNudgeTarget(windows, sourceView, View.FOCUS_DOWN);
- assertThat(target).isSameAs(viewContainer);
+ assertThat(target).isSameInstanceAs(viewContainer);
}
/**
@@ -1133,12 +1133,12 @@
// Search forward from the focus area.
when(focusArea1.focusSearch(direction)).thenReturn(button2);
AccessibilityNodeInfo target = mNavigator.findFirstFocusDescendant(root);
- assertThat(target).isSameAs(button2);
+ assertThat(target).isSameInstanceAs(button2);
// Fall back to tree traversal.
when(focusArea1.focusSearch(direction)).thenReturn(null);
target = mNavigator.findFirstFocusDescendant(root);
- assertThat(target).isSameAs(button1);
+ assertThat(target).isSameInstanceAs(button1);
}
/**
@@ -1190,12 +1190,12 @@
// Search forward from the focus area.
when(focusArea.focusSearch(direction)).thenReturn(button2);
AccessibilityNodeInfo target = mNavigator.findFirstFocusDescendant(root);
- assertThat(target).isSameAs(button2);
+ assertThat(target).isSameInstanceAs(button2);
// Fall back to tree traversal.
when(focusArea.focusSearch(direction)).thenReturn(null);
target = mNavigator.findFirstFocusDescendant(root);
- assertThat(target).isSameAs(button1);
+ assertThat(target).isSameInstanceAs(button1);
}
/**
@@ -1245,7 +1245,7 @@
.build();
AccessibilityNodeInfo target = mNavigator.findScrollableContainer(button1);
- assertThat(target).isSameAs(scrollableContainer);
+ assertThat(target).isSameInstanceAs(scrollableContainer);
target = mNavigator.findScrollableContainer(button2);
assertThat(target).isNull();
}
@@ -1310,11 +1310,11 @@
AccessibilityNodeInfo target =
Navigator.findPreviousFocusableDescendant(container2, button4);
- assertThat(target).isSameAs(button3);
+ assertThat(target).isSameInstanceAs(button3);
target = Navigator.findPreviousFocusableDescendant(container2, button3);
assertThat(target).isNull();
target = Navigator.findPreviousFocusableDescendant(container1, button2);
- assertThat(target).isSameAs(button1);
+ assertThat(target).isSameInstanceAs(button1);
target = Navigator.findPreviousFocusableDescendant(container1, button1);
assertThat(target).isNull();
}
@@ -1378,11 +1378,11 @@
when(button4.focusSearch(direction)).thenReturn(null);
AccessibilityNodeInfo target = mNavigator.findNextFocusableDescendant(container1, button1);
- assertThat(target).isSameAs(button2);
+ assertThat(target).isSameInstanceAs(button2);
target = mNavigator.findNextFocusableDescendant(container1, button2);
assertThat(target).isNull();
target = mNavigator.findNextFocusableDescendant(container2, button3);
- assertThat(target).isSameAs(button4);
+ assertThat(target).isSameInstanceAs(button4);
target = mNavigator.findNextFocusableDescendant(container2, button4);
assertThat(target).isNull();
}
@@ -1441,7 +1441,7 @@
.build();
AccessibilityNodeInfo target = mNavigator.findFirstFocusableDescendant(root);
- assertThat(target).isSameAs(button3);
+ assertThat(target).isSameInstanceAs(button3);
}
/**
@@ -1498,7 +1498,7 @@
.build();
AccessibilityNodeInfo target = mNavigator.findLastFocusableDescendant(root);
- assertThat(target).isSameAs(button2);
+ assertThat(target).isSameInstanceAs(button2);
}
/** Sets the {@code root} node in the {@code window}'s hierarchy. */
diff --git a/tests/robotests/src/com/android/car/rotary/NodeBuilderTest.java b/tests/robotests/src/com/android/car/rotary/NodeBuilderTest.java
index 73d92c0..f112ec4 100644
--- a/tests/robotests/src/com/android/car/rotary/NodeBuilderTest.java
+++ b/tests/robotests/src/com/android/car/rotary/NodeBuilderTest.java
@@ -51,7 +51,7 @@
.setBoundsInScreen(bounds)
.build();
- assertThat(parent.getWindow()).isSameAs(window);
+ assertThat(parent.getWindow()).isSameInstanceAs(window);
assertThat(parent.getClassName()).isEqualTo(FOCUS_AREA_CLASS_NAME);
assertThat(parent.isFocusable()).isTrue();
assertThat(parent.isVisibleToUser()).isTrue();
@@ -69,10 +69,10 @@
.setNodeList(nodeList)
.setParent(parent).build();
- assertThat(child1.getParent()).isSameAs(parent);
+ assertThat(child1.getParent()).isSameInstanceAs(parent);
assertThat(parent.getChildCount()).isEqualTo(2);
- assertThat(parent.getChild(0)).isSameAs(child1);
- assertThat(parent.getChild(1)).isSameAs(child2);
+ assertThat(parent.getChild(0)).isSameInstanceAs(child1);
+ assertThat(parent.getChild(1)).isSameInstanceAs(child2);
assertThat(parent.getChild(2)).isNull();
}
}
diff --git a/tests/robotests/src/com/android/car/rotary/TreeTraverserTest.java b/tests/robotests/src/com/android/car/rotary/TreeTraverserTest.java
index c84c462..69d0852 100644
--- a/tests/robotests/src/com/android/car/rotary/TreeTraverserTest.java
+++ b/tests/robotests/src/com/android/car/rotary/TreeTraverserTest.java
@@ -104,17 +104,17 @@
// Should check the node itself.
AccessibilityNodeInfo result = mTreeTraverser.findNodeOrAncestor(node0,
/* stopPredicate= */ null, /* targetPredicate= */ node -> node == node0);
- assertThat(result).isSameAs(node0);
+ assertThat(result).isSameInstanceAs(node0);
// Parent.
result = mTreeTraverser.findNodeOrAncestor(node1, /* stopPredicate= */ null,
/* targetPredicate= */ node -> node == node0);
- assertThat(result).isSameAs(node0);
+ assertThat(result).isSameInstanceAs(node0);
// Grandparent.
result = mTreeTraverser.findNodeOrAncestor(node2, /* stopPredicate= */ null,
/* targetPredicate= */ node -> node == node0);
- assertThat(result).isSameAs(node0);
+ assertThat(result).isSameInstanceAs(node0);
// No ancestor found.
result = mTreeTraverser.findNodeOrAncestor(node2, /* stopPredicate= */ null,
@@ -189,17 +189,17 @@
// Find root.
result = mTreeTraverser.depthFirstSearch(node0, /* skipPredicate= */ null,
/* targetPredicate= */ node -> node == node0);
- assertThat(result).isSameAs(node0);
+ assertThat(result).isSameInstanceAs(node0);
// Find child.
result = mTreeTraverser.depthFirstSearch(node0, /* skipPredicate= */ null,
/* targetPredicate= */ node -> node == node4);
- assertThat(result).isSameAs(node4);
+ assertThat(result).isSameInstanceAs(node4);
// Find grandchild.
result = mTreeTraverser.depthFirstSearch(node0, /* skipPredicate= */ null,
/* targetPredicate= */ node -> node == node6);
- assertThat(result).isSameAs(node6);
+ assertThat(result).isSameInstanceAs(node6);
// Iterate in depth-first order, skipping a subtree containing the target
List<AccessibilityNodeInfo> skipPredicateCalledWithNodes = new ArrayList<>();
@@ -278,15 +278,15 @@
// Find root.
result = mTreeTraverser.reverseDepthFirstSearch(node0, node -> node == node0);
- assertThat(result).isSameAs(node0);
+ assertThat(result).isSameInstanceAs(node0);
// Find child.
result = mTreeTraverser.reverseDepthFirstSearch(node0, node -> node == node1);
- assertThat(result).isSameAs(node1);
+ assertThat(result).isSameInstanceAs(node1);
// Find grandchild.
result = mTreeTraverser.reverseDepthFirstSearch(node0, node -> node == node2);
- assertThat(result).isSameAs(node2);
+ assertThat(result).isSameInstanceAs(node2);
}
/**
diff --git a/tests/robotests/src/com/android/car/rotary/WindowBuilderTest.java b/tests/robotests/src/com/android/car/rotary/WindowBuilderTest.java
index 4da5b82..6af1dae 100644
--- a/tests/robotests/src/com/android/car/rotary/WindowBuilderTest.java
+++ b/tests/robotests/src/com/android/car/rotary/WindowBuilderTest.java
@@ -38,7 +38,7 @@
.setType(AccessibilityWindowInfo.TYPE_SYSTEM)
.build();
- assertThat(window.getRoot()).isSameAs(root);
+ assertThat(window.getRoot()).isSameInstanceAs(root);
Rect boundsInScreen = new Rect();
window.getBoundsInScreen(boundsInScreen);
