Added support for generic instanceof checks (#734)

Author: JohannisK

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

@@ -95,15 +95,16 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
 
 
                 JavaTemplate template = JavaTemplate
-                    .builder("assertInstanceOf(#{}.class, #{any(java.lang.Object)}" + (reason != null ? ", #{any(java.lang.String)})" : ")"))
+                    .builder("assertInstanceOf(#{any(java.lang.Object)}.class, #{any(java.lang.Object)}" + (reason != null ? ", #{any(java.lang.String)})" : ")"))
                     .javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "junit-jupiter-api-5", "junit-4"))
                     .staticImports("org.junit.jupiter.api.Assertions.assertInstanceOf")
                     .imports(String.valueOf(clazz.getType()))
                     .build();
 
+                J rawClazz = clazz instanceof J.ParameterizedType ? ((J.ParameterizedType) clazz).getClazz() : clazz;
                 J.MethodInvocation methodd = reason != null ?
-                    template.apply(getCursor(), mi.getCoordinates().replace(), clazz.toString(), expression, reason) :
-                    template.apply(getCursor(), mi.getCoordinates().replace(), clazz.toString(), expression);
+                    template.apply(getCursor(), mi.getCoordinates().replace(), rawClazz, expression, reason) :
+                    template.apply(getCursor(), mi.getCoordinates().replace(), rawClazz, expression);
                 maybeAddImport("org.junit.jupiter.api.Assertions", "assertInstanceOf");
                 return methodd;
             }

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

@@ -185,4 +185,42 @@ void testJUnit5() {
               """
           ));
     }
+
+    @Test
+    void jUnit4GenericInstanceOf() {
+        //language=java
+        rewriteRun(
+          java(
+            """
+              import org.junit.jupiter.api.Test;
+              import java.util.ArrayList;
+              import java.util.List;
+
+              import static org.junit.Assert.assertTrue;
+
+              class ATest {
+                  @Test
+                  void testJUnit5() {
+                      List<String> list = new ArrayList<>();
+                      assertTrue(list instanceof List<?>);
+                  }
+              }
+              """,
+            """
+              import org.junit.jupiter.api.Test;
+              import java.util.ArrayList;
+              import java.util.List;
+
+              import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+
+              class ATest {
+                  @Test
+                  void testJUnit5() {
+                      List<String> list = new ArrayList<>();
+                      assertInstanceOf(List.class, list);
+                  }
+              }
+              """
+          ));
+    }
 }