Suggestions

google · Jun 19, 2023 · 2d859ec · 2d859ec
1 parent e0cd928
commit 2d859ec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/core/src/test/java/com/google/errorprone/refaster/UFreeIdentTest.java b/core/src/test/java/com/google/errorprone/refaster/UFreeIdentTest.java
@@ -25,9 +25,9 @@
 import com.google.errorprone.CompilationTestHelper;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.BugChecker;
-import com.google.errorprone.bugpatterns.BugChecker.ExpressionStatementTreeMatcher;
+import com.google.errorprone.bugpatterns.BugChecker.MethodInvocationTreeMatcher;
 import com.google.errorprone.matchers.Description;
-import com.sun.source.tree.ExpressionStatementTree;
+import com.sun.source.tree.MethodInvocationTree;
 import com.sun.tools.javac.util.Context;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -66,16 +66,14 @@ public void binds() {
       summary = "Verify that unifying the expression results in the correct binding",
       explanation = "For test purposes only",
       severity = SUGGESTION)
-  public static class UnificationChecker extends BugChecker
-      implements ExpressionStatementTreeMatcher {
+  public static class UnificationChecker extends BugChecker implements MethodInvocationTreeMatcher {
     @Override
-    public Description matchExpressionStatement(ExpressionStatementTree tree, VisitorState state) {
+    public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
       Unifier unifier = new Unifier(new Context());
       UFreeIdent ident = UFreeIdent.create("foo");
 
-      assertThat(ident.unify(tree.getExpression(), unifier)).isNotNull();
-      assertThat(unifier.getBindings())
-          .containsExactly(new UFreeIdent.Key("foo"), tree.getExpression());
+      assertThat(ident.unify(tree, unifier)).isNotNull();
+      assertThat(unifier.getBindings()).containsExactly(new UFreeIdent.Key("foo"), tree);
 
       return Description.NO_MATCH;
     }

diff --git a/core/src/test/java/com/google/errorprone/refaster/URepeatedTest.java b/core/src/test/java/com/google/errorprone/refaster/URepeatedTest.java
@@ -25,9 +25,9 @@
 import com.google.errorprone.CompilationTestHelper;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.BugChecker;
-import com.google.errorprone.bugpatterns.BugChecker.ExpressionStatementTreeMatcher;
+import com.google.errorprone.bugpatterns.BugChecker.MethodInvocationTreeMatcher;
 import com.google.errorprone.matchers.Description;
-import com.sun.source.tree.ExpressionStatementTree;
+import com.sun.source.tree.MethodInvocationTree;
 import com.sun.tools.javac.util.Context;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -56,16 +56,14 @@ public void unifies() {
       summary = "Verify that unifying the expression results in the correct binding",
       explanation = "For test purposes only",
       severity = SUGGESTION)
-  public static class UnificationChecker extends BugChecker
-      implements ExpressionStatementTreeMatcher {
+  public static class UnificationChecker extends BugChecker implements MethodInvocationTreeMatcher {
     @Override
-    public Description matchExpressionStatement(ExpressionStatementTree tree, VisitorState state) {
+    public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
       Unifier unifier = new Unifier(new Context());
       URepeated ident = URepeated.create("foo", UFreeIdent.create("foo"));
 
-      assertThat(ident.unify(tree.getExpression(), unifier)).isNotNull();
-      assertThat(unifier.getBindings())
-          .containsExactly(new UFreeIdent.Key("foo"), tree.getExpression());
+      assertThat(ident.unify(tree, unifier)).isNotNull();
+      assertThat(unifier.getBindings()).containsExactly(new UFreeIdent.Key("foo"), tree);
 
       return Description.NO_MATCH;
     }