fix TestRuleToTestInfo scope check when inserting new before each method declaration.

Author: pway99

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

@@ -125,21 +125,16 @@ public J.NewClass visitNewClass(J.NewClass newClass, ExecutionContext executionC
                 return nc;
             }
 
-            @Override
-            public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext executionContext) {
-                J.MethodDeclaration md = super.visitMethodDeclaration(method, executionContext);
-                if (md.getLeadingAnnotations().stream().anyMatch(this::isBeforeAnnotation)) {
-                    //noinspection ConstantConditions
-                    getCursor().putMessage("before-method", getCursor().firstEnclosing(J.ClassDeclaration.class));
-                }
-                return md;
-            }
+            //FIXME. add TestMethod statements.
+//            @Override
+//            public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext executionContext) {
+//                J.MethodDeclaration md = super.visitMethodDeclaration(method, executionContext);
+//                return md;
+//            }
 
             private boolean isBeforeAnnotation(J.Annotation annotation) {
                 return TypeUtils.isOfClassType(annotation.getType(), "org.junit.Before") || TypeUtils.isOfClassType(annotation.getType(), "org.junit.jupiter.api.BeforeEach");
             }
-
-
         };
     }
 
@@ -155,7 +150,7 @@ public AddBeforeEachMethod(J.VariableDeclarations varDecls, J.ClassDeclaration e
         @Override
         public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext executionContext) {
             J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, executionContext);
-            if (getCursor().isScopeInPath(enclosingClass)) {
+            if (enclosingClass.getId().equals(cd.getId())) {
                 String t = "@BeforeEach\n" +
                         "public void setup(TestInfo testInfo) {\n" +
                         "   Optional<Method> testMethod = testInfo.getTestMethod();\n" +

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

@@ -37,6 +37,9 @@ class TestRuleToTestInfoTest : JavaRecipeTest {
                 protected String randomName() {
                     return name.getMethodName();
                 }
+                
+                private static class SomeInnerClass {
+                }
             }
         """,
         after = """
@@ -48,6 +51,9 @@ class TestRuleToTestInfoTest : JavaRecipeTest {
                 protected String randomName() {
                     return name;
                 }
+                
+                private static class SomeInnerClass {
+                }
             
                 @BeforeEach
                 public void setup(TestInfo testInfo) {
@@ -59,4 +65,4 @@ class TestRuleToTestInfoTest : JavaRecipeTest {
             }
         """
     )
-}
+}