fixes #76 AssertToAssertions isJunitAssertMethod also checks declaring type

Author: pway99

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

@@ -53,6 +53,8 @@ protected TreeVisitor<?, ExecutionContext> getVisitor() {
 
     public static class AssertToAssertionsVisitor extends JavaIsoVisitor<ExecutionContext> {
 
+        private static JavaType ASSERTION_TYPE = JavaType.buildType("org.junit.Assert");
+
         @Override
         public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
             doAfterVisit(new ChangeType("org.junit.Assert", "org.junit.jupiter.api.Assertions"));
@@ -86,6 +88,9 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
         }
 
         private boolean isJunitAssertMethod(J.MethodInvocation method) {
+            if (method.getType() != null && TypeUtils.isAssignableTo(ASSERTION_TYPE, method.getType().getDeclaringType())) {
+                return true;
+            }
             if (!(method.getSelect() instanceof J.Identifier)) {
                 return false;
             }

src/test/kotlin/org/openrewrite/java/testing/junit5/AssertToAssertionsTest.kt

@@ -194,4 +194,27 @@ class AssertToAssertionsTest : JavaRecipeTest {
                 }
             """
     )
+
+    @Issue("#76")
+    @Test
+    fun isJUnitAssertMethodChecksDeclaringType() = assertChanged(
+        before = """
+            import static org.junit.Assert.assertNotNull;
+            class A {
+                Long l = 1L;
+                void testNestedPartitionStepStepReference() throws Throwable {
+                    assertNotNull("message", l);
+                }
+            }
+        """,
+        after = """
+            import static org.junit.jupiter.api.Assertions.assertNotNull;
+            class A {
+                Long l = 1L;
+                void testNestedPartitionStepStepReference() throws Throwable {
+                    assertNotNull(l, "message");
+                }
+            }
+        """
+    )
 }