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
Change-Id: Ice3df1dd062641a01b60b1fb42a954b1e833bd39
diff --git a/tests/robotests/src/com/android/car/rotary/NavigatorTest.java b/tests/robotests/src/com/android/car/rotary/NavigatorTest.java
index 75bc6c3..364526a 100644
--- a/tests/robotests/src/com/android/car/rotary/NavigatorTest.java
+++ b/tests/robotests/src/com/android/car/rotary/NavigatorTest.java
@@ -71,7 +71,7 @@
AccessibilityNodeInfo root = mNodeBuilder.build();
setRootNodeForWindow(root, window);
- assertThat(window.getRoot()).isSameAs(root);
+ assertThat(window.getRoot()).isSameInstanceAs(root);
}
/**
@@ -101,17 +101,17 @@
// Rotate once, the focus should move from button1 to button2.
FindRotateTargetResult target = mNavigator.findRotateTarget(button1, 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, 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, direction, 3);
- assertThat(target.node).isSameAs(button3);
+ assertThat(target.node).isSameInstanceAs(button3);
assertThat(target.advancedCount).isEqualTo(2);
}
@@ -200,7 +200,7 @@
// Rotate from button1, it shouldn't skip the invisible view.
FindRotateTargetResult target = mNavigator.findRotateTarget(button1, direction, 1);
- assertThat(target.node).isSameAs(invisible);
+ assertThat(target.node).isSameInstanceAs(invisible);
}
/**
@@ -229,7 +229,7 @@
// Rotate from button1, it should skip the empty view.
FindRotateTargetResult target = mNavigator.findRotateTarget(button1, direction, 1);
- assertThat(target.node).isSameAs(button2);
+ assertThat(target.node).isSameInstanceAs(button2);
}
/**
@@ -265,7 +265,7 @@
when(recyclerView.focusSearch(direction)).thenReturn(button2);
FindRotateTargetResult target = mNavigator.findRotateTarget(button1, direction, 1);
- assertThat(target.node).isSameAs(recyclerView);
+ assertThat(target.node).isSameInstanceAs(recyclerView);
}
/**
@@ -295,7 +295,7 @@
when(recyclerView.focusSearch(direction)).thenReturn(button2);
FindRotateTargetResult target = mNavigator.findRotateTarget(button1, direction, 1);
- assertThat(target.node).isSameAs(button2);
+ assertThat(target.node).isSameInstanceAs(button2);
}
/**
@@ -329,7 +329,7 @@
when(recyclerView.focusSearch(direction)).thenReturn(focusParkingView);
FindRotateTargetResult target = mNavigator.findRotateTarget(focusable2, direction, 2);
- assertThat(target.node).isSameAs(focusable1);
+ assertThat(target.node).isSameInstanceAs(focusable1);
assertThat(target.advancedCount).isEqualTo(1);
}
@@ -409,18 +409,18 @@
// Rotate once, the focus should move from button1 to button2.
FindRotateTargetResult target = mNavigator.findRotateTarget(button1, 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 not a
// descendant of the scrollable container.
target = mNavigator.findRotateTarget(button1, 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, direction, 3);
- assertThat(target.node).isSameAs(button2);
+ assertThat(target.node).isSameInstanceAs(button2);
assertThat(target.advancedCount).isEqualTo(1);
}
@@ -484,18 +484,18 @@
// Rotate once, the focus should move from button1 to button2.
FindRotateTargetResult target = mNavigator.findRotateTarget(button1, 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 off the
// screen.
target = mNavigator.findRotateTarget(button1, 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, direction, 3);
- assertThat(target.node).isSameAs(button2);
+ assertThat(target.node).isSameInstanceAs(button2);
assertThat(target.advancedCount).isEqualTo(1);
}
@@ -640,7 +640,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);
@@ -648,7 +648,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.
@@ -657,10 +657,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);
}
/**
@@ -753,7 +753,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);
}
/**
@@ -879,16 +879,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);
}
/**
@@ -968,7 +968,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);
}
/**
@@ -1052,11 +1052,11 @@
// Nudge up from controlButton, it should go to listItem1.
AccessibilityNodeInfo target
= mNavigator.findNudgeTarget(windows, controlButton, View.FOCUS_UP);
- assertThat(target).isSameAs(listItem1);
+ assertThat(target).isSameInstanceAs(listItem1);
// Nudge up from listItem1, it should go to tab.
target = mNavigator.findNudgeTarget(windows, listItem1, View.FOCUS_UP);
- assertThat(target).isSameAs(tab);
+ assertThat(target).isSameInstanceAs(tab);
// Disable cache.
mNavigator = new Navigator(
@@ -1076,7 +1076,7 @@
// Nudge down from listItem1, it should go to controlButton.
target = mNavigator.findNudgeTarget(windows, listItem1, View.FOCUS_DOWN);
- assertThat(target).isSameAs(controlButton);
+ assertThat(target).isSameInstanceAs(controlButton);
}
/**
@@ -1148,7 +1148,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);
}
/**
@@ -1219,7 +1219,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);
}
/**
@@ -1327,7 +1327,7 @@
// EditText they were editing.
AccessibilityNodeInfo target
= mNavigator.findNudgeTarget(windows, sourceView, View.FOCUS_UP, targetView);
- assertThat(target).isSameAs(targetView);
+ assertThat(target).isSameInstanceAs(targetView);
}
/**
@@ -1412,7 +1412,7 @@
// Nudge from left window to right window.
AccessibilityNodeInfo target = mNavigator.findNudgeTarget(windows, left, View.FOCUS_RIGHT);
- assertThat(target).isSameAs(recyclerView);
+ assertThat(target).isSameInstanceAs(recyclerView);
}
/**
@@ -1504,7 +1504,7 @@
// Nudge from left window to right window.
AccessibilityNodeInfo target = mNavigator.findNudgeTarget(windows, left, View.FOCUS_RIGHT);
- assertThat(target).isSameAs(recyclerView);
+ assertThat(target).isSameInstanceAs(recyclerView);
}
/**
@@ -1588,7 +1588,7 @@
// Nudge from left window to right window.
AccessibilityNodeInfo target = mNavigator.findNudgeTarget(windows, left, View.FOCUS_RIGHT);
- assertThat(target).isSameAs(null);
+ assertThat(target).isSameInstanceAs(null);
}
@@ -1673,7 +1673,7 @@
// Nudge from left window to right window.
AccessibilityNodeInfo target = mNavigator.findNudgeTarget(windows, left, View.FOCUS_RIGHT);
- assertThat(target).isSameAs(focusable);
+ assertThat(target).isSameInstanceAs(focusable);
}
/**
@@ -1768,7 +1768,7 @@
// Nudge down from tab, it should go to contact list.
AccessibilityNodeInfo target
= mNavigator.findNudgeTarget(windows, tab, View.FOCUS_DOWN);
- assertThat(target).isSameAs(contactList);
+ assertThat(target).isSameInstanceAs(contactList);
}
/**
@@ -1850,7 +1850,7 @@
// Nudge up from view3, it should go to view2.
AccessibilityNodeInfo target
= mNavigator.findNudgeTarget(windows, view3, View.FOCUS_UP);
- assertThat(target).isSameAs(view2);
+ assertThat(target).isSameInstanceAs(view2);
}
/**
@@ -1881,12 +1881,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);
}
/**
@@ -1915,12 +1915,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);
}
/**
@@ -1955,7 +1955,7 @@
AccessibilityNodeInfo button2 = mNodeBuilder.setParent(focusArea).build();
AccessibilityNodeInfo target = mNavigator.findScrollableContainer(button1);
- assertThat(target).isSameAs(scrollableContainer);
+ assertThat(target).isSameInstanceAs(scrollableContainer);
target = mNavigator.findScrollableContainer(button2);
assertThat(target).isNull();
}
@@ -1991,13 +1991,13 @@
AccessibilityNodeInfo target = mNavigator.findFocusableDescendantInDirection(
container2, button4, View.FOCUS_BACKWARD);
- assertThat(target).isSameAs(button3);
+ assertThat(target).isSameInstanceAs(button3);
target = mNavigator.findFocusableDescendantInDirection(container2, button3,
View.FOCUS_BACKWARD);
assertThat(target).isNull();
target = mNavigator.findFocusableDescendantInDirection(container1, button2,
View.FOCUS_BACKWARD);
- assertThat(target).isSameAs(button1);
+ assertThat(target).isSameInstanceAs(button1);
target = mNavigator.findFocusableDescendantInDirection(container1, button1,
View.FOCUS_BACKWARD);
assertThat(target).isNull();
@@ -2034,13 +2034,13 @@
AccessibilityNodeInfo target = mNavigator.findFocusableDescendantInDirection(
container1, button1, View.FOCUS_FORWARD);
- assertThat(target).isSameAs(button2);
+ assertThat(target).isSameInstanceAs(button2);
target = mNavigator.findFocusableDescendantInDirection(container1, button2,
View.FOCUS_FORWARD);
assertThat(target).isNull();
target = mNavigator.findFocusableDescendantInDirection(container2, button3,
View.FOCUS_FORWARD);
- assertThat(target).isSameAs(button4);
+ assertThat(target).isSameInstanceAs(button4);
target = mNavigator.findFocusableDescendantInDirection(container2, button4,
View.FOCUS_FORWARD);
assertThat(target).isNull();
@@ -2078,16 +2078,16 @@
AccessibilityNodeInfo target = mNavigator.findFocusableDescendantInDirection(container,
button1, View.FOCUS_FORWARD);
- assertThat(target).isSameAs(button2);
+ assertThat(target).isSameInstanceAs(button2);
target = mNavigator.findFocusableDescendantInDirection(container, button2,
View.FOCUS_FORWARD);
- assertThat(target).isSameAs(button1);
+ assertThat(target).isSameInstanceAs(button1);
target = mNavigator.findFocusableDescendantInDirection(container, button3,
View.FOCUS_FORWARD);
- assertThat(target).isSameAs(button1);
+ assertThat(target).isSameInstanceAs(button1);
target = mNavigator.findFocusableDescendantInDirection(container, button4,
View.FOCUS_FORWARD);
- assertThat(target).isSameAs(button1);
+ assertThat(target).isSameInstanceAs(button1);
}
/**
@@ -2126,7 +2126,7 @@
AccessibilityNodeInfo button4 = mNodeBuilder.setParent(container2).build();
AccessibilityNodeInfo target = mNavigator.findFirstFocusableDescendant(root);
- assertThat(target).isSameAs(button3);
+ assertThat(target).isSameInstanceAs(button3);
}
/**
@@ -2165,7 +2165,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 af7da8e..d531b03 100644
--- a/tests/robotests/src/com/android/car/rotary/NodeBuilderTest.java
+++ b/tests/robotests/src/com/android/car/rotary/NodeBuilderTest.java
@@ -103,7 +103,7 @@
public void testSetWindow() {
AccessibilityWindowInfo window = new WindowBuilder().build();
AccessibilityNodeInfo node = mNodeBuilder.setWindow(window).build();
- assertThat(node.getWindow()).isSameAs(window);
+ assertThat(node.getWindow()).isSameInstanceAs(window);
}
@Test
@@ -143,10 +143,10 @@
AccessibilityNodeInfo child1 = mNodeBuilder.setParent(parent).build();
AccessibilityNodeInfo child2 = mNodeBuilder.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 ba6e0ba..d7700b4 100644
--- a/tests/robotests/src/com/android/car/rotary/TreeTraverserTest.java
+++ b/tests/robotests/src/com/android/car/rotary/TreeTraverserTest.java
@@ -67,17 +67,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,
@@ -137,17 +137,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<>();
@@ -208,15 +208,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 7b2d9ce..01c0768 100644
--- a/tests/robotests/src/com/android/car/rotary/WindowBuilderTest.java
+++ b/tests/robotests/src/com/android/car/rotary/WindowBuilderTest.java
@@ -42,7 +42,7 @@
public void testSetRoot() {
AccessibilityNodeInfo root = new NodeBuilder(new ArrayList<>()).build();
AccessibilityWindowInfo window = new WindowBuilder().setRoot(root).build();
- assertThat(window.getRoot()).isSameAs(root);
+ assertThat(window.getRoot()).isSameInstanceAs(root);
}
@Test
