Get UpdateTestAnnotation tests passing again

Author: sambsnyd

src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java

@@ -66,7 +66,7 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
             if (!nameTreeSet.isEmpty()) {
                 // Update other references like `Test.class`.
                 c = (J.CompilationUnit) new ChangeType("org.junit.Test", "org.junit.jupiter.api.Test", true)
-                        .getVisitor().visit(cu, executionContext);
+                        .getVisitor().visitNonNull(c, executionContext);
             }
 
             maybeRemoveImport("org.junit.Test");
@@ -108,28 +108,6 @@ public J postVisit(J tree, ExecutionContext executionContext) {
             return c;
         }
 
-        @Override
-        protected JavadocVisitor<ExecutionContext> getJavadocVisitor() {
-            return new JavadocVisitor<ExecutionContext>(this) {
-                @Override
-                public Javadoc visitReference(Javadoc.Reference reference, ExecutionContext ctx) {
-                    if (reference.getTree() instanceof TypeTree &&
-                        TypeUtils.isOfClassType(((TypeTree) reference.getTree()).getType(), "org.junit.Test")) {
-                        getCursor().getParentOrThrow().putMessageOnFirstEnclosing(Javadoc.class, "testRef", true);
-                    }
-                    return reference;
-                }
-
-                @Override
-                public Javadoc postVisit(Javadoc tree, ExecutionContext executionContext) {
-                    if (getCursor().getMessage("testRef", false)) {
-                        return null;
-                    }
-                    return super.postVisit(tree, executionContext);
-                }
-            };
-        }
-
         @Override
         public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext ctx) {
             ChangeTestAnnotation cta = new ChangeTestAnnotation();

src/test/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotationJavaTest.java

@@ -478,4 +478,115 @@ public void foo() {
           )
         );
     }
+
+
+    @Test
+    void migrateDotClass() {
+        //language=java
+        rewriteRun(
+          java(
+            """
+                import org.junit.Test;
+                public class MyTest {
+                    Object o = Test.class;
+                }
+              """,
+            """
+                import org.junit.jupiter.api.Test;
+                
+                public class MyTest {
+                    Object o = Test.class;
+                }
+              """
+          )
+        );
+    }
+
+    @Test
+    void usedInJavadoc() {
+        //language=java
+        rewriteRun(
+          java(
+            """
+                import org.junit.Test;
+                
+                /** @see org.junit.Test */
+                public class MyTest {
+                    @Test
+                    public void test() {
+                    }
+                }
+              """,
+            """
+                import org.junit.jupiter.api.Test;
+                
+                /** @see org.junit.jupiter.api.Test */
+                public class MyTest {
+                    @Test
+                    void test() {
+                    }
+                }
+              """
+          )
+        );
+    }
+
+    @Test
+    void fullyQualified() {
+        rewriteRun(
+          //language=java
+          java(
+            """
+                public class MyTest {
+                    @org.junit.Test
+                    public void feature1() {
+                    }
+                }
+              """,
+            """
+                import org.junit.jupiter.api.Test;
+                
+                public class MyTest {
+                    @org.junit.jupiter.api.Test
+                    void feature1() {
+                    }
+                }
+              """
+          )
+        );
+    }
+
+    @Test
+    void mixedFullyQualifiedAndNot() {
+        rewriteRun(
+          //language=java
+          java(
+            """
+              import org.junit.Test;
+              public class MyTest {
+                  @org.junit.Test
+                  public void feature1() {
+                  }
+                  
+                  @Test
+                  void feature2() {
+                  }
+              }
+              """,
+            """
+              import org.junit.jupiter.api.Test;
+                            
+              public class MyTest {
+                  @org.junit.jupiter.api.Test
+                  void feature1() {
+                  }
+                  
+                  @Test
+                  void feature2() {
+                  }
+              }
+              """
+          )
+        );
+    }
 }