Make ActualValueInference see through casts and also recognize some of Kotlin's collection-factory methods as having names that are "boring."

cpovirk · Google Java Core Libraries · commit 7261f7209375 · 2025-09-04T06:47:23.000-07:00
RELNOTES=n/a
PiperOrigin-RevId: 803004852
diff --git a/core/src/main/java/com/google/common/truth/ActualValueInference.java b/core/src/main/java/com/google/common/truth/ActualValueInference.java
@@ -149,6 +149,8 @@ StackEntry actualValue() {
     @Nullable String description() {
       return null;
     }
+
+    abstract StackEntry withType(InferredType newType);
   }
 
   /** An entry that we know nothing about except for its type. */
@@ -157,6 +159,11 @@ StackEntry actualValue() {
   @GwtIncompatible
   @J2ktIncompatible
   abstract static class OpaqueEntry extends StackEntry {
+    @Override
+    StackEntry withType(InferredType newType) {
+      return opaque(newType);
+    }
+
     @Override
     public final String toString() {
       return "unknown";
@@ -177,6 +184,11 @@ private static StackEntry opaque(InferredType type) {
   @GwtIncompatible
   @J2ktIncompatible
   abstract static class DescribedEntry extends StackEntry {
+    @Override
+    StackEntry withType(InferredType newType) {
+      return described(newType, description());
+    }
+
     @Override
     abstract String description();
 
@@ -203,6 +215,11 @@ private static StackEntry described(InferredType type, String description) {
   @GwtIncompatible
   @J2ktIncompatible
   abstract static class SubjectEntry extends StackEntry {
+    @Override
+    StackEntry withType(InferredType newType) {
+      return subjectFor(newType, actualValue());
+    }
+
     @Override
     abstract StackEntry actualValue();
 
@@ -698,8 +715,7 @@ public void visitTypeInsn(int opcode, String type) {
           pushDescriptor('[' + descriptor);
           break;
         case Opcodes.CHECKCAST:
-          pop();
-          pushDescriptor(descriptor);
+          push(pop().withType(InferredType.create(convertToDescriptor(type))));
           break;
         case Opcodes.INSTANCEOF:
           pop();
@@ -1445,6 +1461,8 @@ public void visit(
    */
   private static final ImmutableSet<String> BORING_NAMES =
       ImmutableSet.of(
+          // keep-sorted start
+          "_build",
           "asList",
           "build",
           "collect",
@@ -1453,10 +1471,17 @@ public void visit(
           "from",
           "get",
           "iterator",
+          "listOf",
+          "mapOf",
           "of",
+          "setOf",
+          "sortedMapOf",
+          "sortedSetOf",
           "toArray",
           "toString",
-          "valueOf");
+          "valueOf"
+          // keep-sorted end
+          );
 
   private static boolean isThatOrAssertThat(String owner, String name) {
     /*
diff --git a/core/src/test/java/com/google/common/truth/ActualValueInferenceTest.java b/core/src/test/java/com/google/common/truth/ActualValueInferenceTest.java
@@ -61,6 +61,14 @@ public void simple() {
     assertThat(e).factValue("value of").isEqualTo("instanceOneArg(...)");
   }
 
+  @Test
+  public void cast() {
+    AssertionError e;
+
+    e = expectFailure(whenTesting -> whenTesting.that((String) secretlyString()).isEqualTo("b"));
+    assertThat(e).factValue("value of").isEqualTo("secretlyString()");
+  }
+
   @Test
   public void autoBox() {
     AssertionError e;
@@ -264,4 +272,8 @@ char someChar() {
   String someNumberString() {
     return "0";
   }
+
+  Object secretlyString() {
+    return "a";
+  }
 }
