Add unit to @Timeout (#451)

Fixes #450
openrewrite · Jan 4, 2024 · af84b02 · af84b02
1 parent 326c048
commit af84b02
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java b/src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java
@@ -151,16 +151,17 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                     }
                 }
                 if (cta.timeout != null) {
-                    m = JavaTemplate.builder("@Timeout(#{any(long)})")
+                    m = JavaTemplate.builder("@Timeout(value = #{any(long)}, unit = TimeUnit.MILLISECONDS)")
                             .javaParser(javaParser(ctx))
-                            .imports("org.junit.jupiter.api.Timeout")
+                            .imports("org.junit.jupiter.api.Timeout", "java.util.concurrent.TimeUnit")
                             .build()
                             .apply(
                                     updateCursor(m),
                                     m.getCoordinates().addAnnotation(Comparator.comparing(J.Annotation::getSimpleName)),
                                     cta.timeout
                             );
                     maybeAddImport("org.junit.jupiter.api.Timeout");
+                    maybeAddImport("java.util.concurrent.TimeUnit");
                 }
                 maybeAddImport("org.junit.jupiter.api.Test");
             }

diff --git a/src/test/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotationTest.java b/src/test/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotationTest.java
@@ -272,6 +272,7 @@ public void test2() {
     }
 
     @Test
+    @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/issues/450")
     void annotationWithTimeout() {
         //language=java
         rewriteRun(
@@ -290,10 +291,12 @@ public void test() {
               import org.junit.jupiter.api.Test;
               import org.junit.jupiter.api.Timeout;
               
+              import java.util.concurrent.TimeUnit;
+              
               public class MyTest {
               
                   @Test
-                  @Timeout(500)
+                  @Timeout(value = 500, unit = TimeUnit.MILLISECONDS)
                   public void test() {
                   }
               }
@@ -369,12 +372,14 @@ public void test() {
               import org.junit.jupiter.api.Test;
               import org.junit.jupiter.api.Timeout;
               
+              import java.util.concurrent.TimeUnit;
+              
               import static org.junit.jupiter.api.Assertions.assertThrows;
               
               public class MyTest {
               
                   @Test
-                  @Timeout(500)
+                  @Timeout(value = 500, unit = TimeUnit.MILLISECONDS)
                   public void test() {
                       assertThrows(IllegalArgumentException.class, () -> {
                           throw new IllegalArgumentException("boom");
@@ -518,7 +523,7 @@ public void feature1() {
                   }
                   
                   @Test
-                  void feature2() {
+                  public void feature2() {
                   }
               }
               """,
@@ -531,7 +536,7 @@ public void feature1() {
                   }
                   
                   @Test
-                  void feature2() {
+                  public void feature2() {
                   }
               }
               """