fix-issue-441 (#442)

magicwerk · Thomas Mauch · web-flow · commit e7f0148a563b · 2023-12-18T12:06:42.000+01:00
Co-authored-by: Thomas Mauch &lt;thomas.mauch@swisslog.com&gt;
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java b/src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java
@@ -116,10 +116,6 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
             ChangeTestAnnotation cta = new ChangeTestAnnotation();
             J.MethodDeclaration m = (J.MethodDeclaration) cta.visitNonNull(method, ctx, getCursor().getParentOrThrow());
             if (m != method) {
-                if (Boolean.FALSE.equals(TypeUtils.isOverride(m.getMethodType()))) {
-                    m = (J.MethodDeclaration) new ChangeMethodAccessLevelVisitor<ExecutionContext>(new MethodMatcher(m), null)
-                            .visitNonNull(m, ctx, getCursor().getParentOrThrow());
-                }
                 if (cta.expectedException != null) {
                     m = JavaTemplate.builder("org.junit.jupiter.api.function.Executable o = () -> #{};")
                             .contextSensitive()
diff --git a/src/test/java/org/openrewrite/java/testing/junit5/JUnit5MigrationTest.java b/src/test/java/org/openrewrite/java/testing/junit5/JUnit5MigrationTest.java
@@ -98,7 +98,7 @@ public void filterShouldRemoveUnusedConfig() {
               public class SampleTest {
                   @SuppressWarnings("ALL")
                   @Test
-                  void filterShouldRemoveUnusedConfig() {
+                  public void filterShouldRemoveUnusedConfig() {
                       assertThat(asList("1", "2", "3"),
                               containsInAnyOrder("3", "2", "1"));
                   }
diff --git a/src/test/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotationTest.java b/src/test/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotationTest.java
@@ -60,7 +60,7 @@ public void test_printLine() {
               public class MyTest {
               
                   @Test
-                  void test_printLine() {
+                  public void test_printLine() {
                       assertDoesNotThrow(() -> {
                           int arr = new int[]{0}[0];
                       });
@@ -95,7 +95,7 @@ public void test() {
               public class MyTest {
               
                   @Test
-                  void test() {
+                  public void test() {
                       assertThrows(IllegalArgumentException.class, () -> {
                           throw new IllegalArgumentException("boom");
                       });
@@ -131,7 +131,7 @@ public void test() {
               public class MyTest {
               
                   @Test
-                  void test() {
+                  public void test() {
                       assertThrows(IndexOutOfBoundsException.class, () -> {
                           int arr = new int[]{}[0];
                       });
@@ -167,7 +167,7 @@ public void test() {
               public class MyTest {
               
                   @Test
-                  void test() {
+                  public void test() {
                       assertThrows(IllegalArgumentException.class, () -> {
                           String foo = "foo";
                           throw new IllegalArgumentException("boom");
@@ -200,7 +200,7 @@ public void test() {
               public class MyTest {
               
                   @Test
-                  void test() {
+                  public void test() {
                   }
               }
               """
@@ -253,17 +253,17 @@ public class MyTest {
                   // some comments
                   @Issue("some issue")
                   @Test
-                  void test() {
+                  public void test() {
                   }
               
                   // some comments
                   @Test
-                  void test1() {
+                  public void test1() {
                   }
               
-                  // some comments
                   @Test
-                  void test2() {
+                  // some comments
+                  public void test2() {
                   }
               }
               """
@@ -294,7 +294,7 @@ public class MyTest {
               
                   @Test
                   @Timeout(500)
-                  void test() {
+                  public void test() {
                   }
               }
               """
@@ -338,7 +338,7 @@ public void test() {
               public class MyTest {
               
                   @Test
-                  void test() {
+                  public void test() {
                       assertThrows(MyException.class, () -> {
                           throw new MyException("my exception");
                       });
@@ -375,7 +375,7 @@ public class MyTest {
               
                   @Test
                   @Timeout(500)
-                  void test() {
+                  public void test() {
                       assertThrows(IllegalArgumentException.class, () -> {
                           throw new IllegalArgumentException("boom");
                       });
@@ -386,66 +386,6 @@ void test() {
         );
     }
 
-    @Issue("https://github.com/openrewrite/rewrite/issues/150")
-    @Test
-    void protectedToPackageVisibility() {
-        //language=java
-        rewriteRun(
-          java(
-            """
-              import org.junit.Test;
-
-              public class MyTest {
-              
-                  @Test
-                  protected void test() {
-                  }
-              }
-              """,
-            """
-              import org.junit.jupiter.api.Test;
-
-              public class MyTest {
-
-                  @Test
-                  void test() {
-                  }
-              }
-              """
-          )
-        );
-    }
-
-    @SuppressWarnings("JUnitMalformedDeclaration")
-    @Test
-    void privateToPackageVisibility() {
-        //language=java
-        rewriteRun(
-          java(
-            """
-              import org.junit.Test;
-              
-              public class MyTest {
-              
-                  @Test
-                  private void test() {
-                  }
-              }
-              """,
-            """
-              import org.junit.jupiter.api.Test;
-              
-              public class MyTest {
-              
-                  @Test
-                  void test() {
-                  }
-              }
-              """
-          )
-        );
-    }
-
     @Test
     void preservesVisibilityOnTestMethodThatIsAnOverride() {
         //language=java
@@ -532,7 +472,7 @@ public void test() {
               /** @see org.junit.jupiter.api.Test */
               public class MyTest {
                   @Test
-                  void test() {
+                  public void test() {
                   }
               }
               """
@@ -557,7 +497,7 @@ public void feature1() {
               
               public class MyTest {
                   @org.junit.jupiter.api.Test
-                  void feature1() {
+                  public void feature1() {
                   }
               }
               """
@@ -587,7 +527,7 @@ void feature2() {
                             
               public class MyTest {
                   @org.junit.jupiter.api.Test
-                  void feature1() {
+                  public void feature1() {
                   }
                   
                   @Test
diff --git a/src/test/java/org/openrewrite/java/testing/mockito/JunitMockitoUpgradeIntegrationTest.java b/src/test/java/org/openrewrite/java/testing/mockito/JunitMockitoUpgradeIntegrationTest.java
@@ -108,7 +108,7 @@ public void initMocks() {
                   }
               
                   @Test
-                  void usingAnnotationBasedMock() {
+                  public void usingAnnotationBasedMock() {
               
                       mockedList.add("one");
                       mockedList.clear();

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public void filterShouldRemoveUnusedConfig() {`
`98`	`98`	`public class SampleTest {`
`99`	`99`	`@SuppressWarnings("ALL")`
`100`	`100`	`@Test`
`101`		`- void filterShouldRemoveUnusedConfig() {`
	`101`	`+ public void filterShouldRemoveUnusedConfig() {`
`102`	`102`	`assertThat(asList("1", "2", "3"),`
`103`	`103`	`containsInAnyOrder("3", "2", "1"));`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public void initMocks() {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`@Test`
`111`		`- void usingAnnotationBasedMock() {`
	`111`	`+ public void usingAnnotationBasedMock() {`
`112`	`112`
`113`	`113`	`mockedList.add("one");`
`114`	`114`	`mockedList.clear();`