Fixed tests.

traceyyoshima · traceyyoshima · commit f3e3b76fb384 · 2021-08-26T11:54:35.000-07:00
diff --git a/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThatTest.kt b/src/test/kotlin/org/openrewrite/java/testing/assertj/JUnitAssertArrayEqualsToAssertThatTest.kt
@@ -325,7 +325,7 @@ class JUnitAssertArrayEqualsToAssertThatTest : JavaRecipeTest {
                     assertThat(notification()).withFailMessage(() -> "These should be close").containsExactly(expected);
                 }
                 private String[] notification() {
-                    return new String[] {"Fred", "Alice", "Mary"};        
+                    return new String[] {"Fred", "Alice", "Mary"};
                 }
             }
         """,
diff --git a/src/test/kotlin/org/openrewrite/java/testing/cleanup/TestsShouldIncludeAssertionsTest.kt b/src/test/kotlin/org/openrewrite/java/testing/cleanup/TestsShouldIncludeAssertionsTest.kt
@@ -197,7 +197,7 @@ class TestsShouldIncludeAssertionsTest : JavaRecipeTest {
             class AaTest {
                 @Mock
                 MyMathService myMathService;
-                
+            
                 @Test
                 public void methodTest() {
                     assertDoesNotThrow(() -> {
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/AssertToAssertionsTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/AssertToAssertionsTest.kt
@@ -96,7 +96,7 @@ class AssertToAssertionsTest : JavaRecipeTest {
                 public void test() {
                     assertFalse(A.class.isAssignableFrom(t.getClass()), t.getName());
                 }
-                
+            
                 class T {
                     String getName() {
                         return "World";
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterizedTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterizedTest.kt
@@ -405,7 +405,7 @@ class ParameterizedRunnerToParameterizedTest : JavaRecipeTest {
                 @BeforeClass
                 public static void setup() {
                 }
-                
+            
                 public static abstract class T1 extends NestedTests {
                     final String path;
                     public T1(String path) {
@@ -416,13 +416,13 @@ class ParameterizedRunnerToParameterizedTest : JavaRecipeTest {
                         Assert.assertNotNull(path);
                     }
                 }
-                
+            
                 static List<Object[]> valuesDataProvider() {
                     List<Object[]> params = new ArrayList<>();
                         params.add(new Object[] { "1", "2" });
                         return params;
                 }
-                
+            
                 public static class I1 extends T1 {
                     public static Collection<Object[]> data1() {
                         return valuesDataProvider();
@@ -439,7 +439,7 @@ class ParameterizedRunnerToParameterizedTest : JavaRecipeTest {
                         Assert.assertNotNull(path);
                     }
                 }
-                
+            
                 public static class I2 extends NestedTests {
                     public static Collection<Object[]> data2() {
                         return valuesDataProvider();
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDirTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDirTest.kt
@@ -54,7 +54,7 @@ class TemporaryFolderToTempDirTest : JavaRecipeTest {
             public class A {
                 @TempDir
                 public File tmpFolder;
-                
+            
                 @After
                 public void tearDown() {
                     tmpFolder.delete();
@@ -167,7 +167,7 @@ class TemporaryFolderToTempDirTest : JavaRecipeTest {
             
                 @TempDir
                 File tempDir;
-                
+            
                 void foo() {
                     File root = tempDir;
                 }
@@ -261,16 +261,16 @@ class TemporaryFolderToTempDirTest : JavaRecipeTest {
             
                 @TempDir
                 File tempDir1;
-                
+            
                 @Test
                 public void someTest() {
                     File subDir = newFolder(tempDir1, "sub");
                     File subDirs = newFolder(tempDir1, "foo", "bar", "baz");
-                    
+            
                     String last = "z";
                     File subDirs2 = newFolder(tempDir1, "v", "w", getSubFolderName(), "y", last);
                 }
-                
+            
                 String getSubFolderName() {
                     return "x";
                 }
@@ -304,7 +304,7 @@ class TemporaryFolderToTempDirTest : JavaRecipeTest {
                 String s1 = "foo";
                 String s2 = "bar";
                 String s3 = "baz";
-                
+            
                 @Test
                 public void someTest() {
                     File subDir = tempDir1.newFolder("sub");
@@ -326,7 +326,7 @@ class TemporaryFolderToTempDirTest : JavaRecipeTest {
                 String s1 = "foo";
                 String s2 = "bar";
                 String s3 = "baz";
-                
+            
                 @Test
                 public void someTest() {
                     File subDir = newFolder(tempDir1, "sub");
@@ -357,7 +357,7 @@ class TemporaryFolderToTempDirTest : JavaRecipeTest {
             public class T {
                 @Rule
                 TemporaryFolder tempFolder = new TemporaryFolder();
-                
+            
                 @Test
                 public void newNamedFileIsCreatedUnderRootFolder() throws IOException {
                     final String fileName = "SampleFile.txt";
@@ -376,7 +376,7 @@ class TemporaryFolderToTempDirTest : JavaRecipeTest {
             public class T {
                 @TempDir
                 File tempFolder;
-                
+            
                 @Test
                 public void newNamedFileIsCreatedUnderRootFolder() throws IOException {
                     final String fileName = "SampleFile.txt";
@@ -425,7 +425,7 @@ class TemporaryFolderToTempDirTest : JavaRecipeTest {
                 static File tempFolder;
                 @TempDir
                 File tempFolder2;
-                
+            
                 @Test
                 public void newNamedFileIsCreatedUnderRootFolder() throws IOException {
                     final String fileName = "SampleFile.txt";
@@ -461,7 +461,7 @@ class TemporaryFolderToTempDirTest : JavaRecipeTest {
             public class T {
                 @TempDir
                 public static final File temporaryFolder;
-                
+            
                 public static void init() {
                     File aDir = temporaryFolder;
                 }
diff --git a/src/test/kotlin/org/openrewrite/java/testing/junit5/TestRuleToTestInfoTest.kt b/src/test/kotlin/org/openrewrite/java/testing/junit5/TestRuleToTestInfoTest.kt
@@ -47,12 +47,12 @@ class TestRuleToTestInfoTest : JavaRecipeTest {
             import org.junit.jupiter.api.TestInfo;
             
             public class SomeTest {
-                
+            
                 public String name;
                 protected String randomName() {
                     return name;
                 }
-                
+            
                 private static class SomeInnerClass {
                 }
             
@@ -97,7 +97,7 @@ class TestRuleToTestInfoTest : JavaRecipeTest {
             
             public class SomeTest {
                 protected int count;
-                
+            
                 public String name;
                 protected String randomName() {
                     return name;
@@ -111,7 +111,7 @@ class TestRuleToTestInfoTest : JavaRecipeTest {
                     }
                     count++;
                 }
-                
+            
                 private static class SomeInnerClass {
                 }
             }
diff --git a/src/test/kotlin/org/openrewrite/java/testing/mockito/JunitMockitoUpgradeIntegrationTest.kt b/src/test/kotlin/org/openrewrite/java/testing/mockito/JunitMockitoUpgradeIntegrationTest.kt
@@ -257,9 +257,9 @@ class JunitMockitoUpgradeIntegrationTest : JavaRecipeTest {
         after = """
             import org.junit.jupiter.api.extension.ExtendWith;
             import org.mockito.junit.jupiter.MockitoExtension;
-        
+            
             @ExtendWith(MockitoExtension.class)
-            public class ExampleTest { }
+            public class ExampleTest {}
         """
     )
 }

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ class JUnitAssertArrayEqualsToAssertThatTest : JavaRecipeTest {`
`325`	`325`	`assertThat(notification()).withFailMessage(() -> "These should be close").containsExactly(expected);`
`326`	`326`	`}`
`327`	`327`	`private String[] notification() {`
`328`		`- return new String[] {"Fred", "Alice", "Mary"};`
	`328`	`+ return new String[] {"Fred", "Alice", "Mary"};`
`329`	`329`	`}`
`330`	`330`	`}`
`331`	`331`	`""",`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class AssertToAssertionsTest : JavaRecipeTest {`
`96`	`96`	`public void test() {`
`97`	`97`	`assertFalse(A.class.isAssignableFrom(t.getClass()), t.getName());`
`98`	`98`	`}`
`99`		`-`
	`99`	`+`
`100`	`100`	`class T {`
`101`	`101`	`String getName() {`
`102`	`102`	`return "World";`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ class ParameterizedRunnerToParameterizedTest : JavaRecipeTest {`
`405`	`405`	`@BeforeClass`
`406`	`406`	`public static void setup() {`
`407`	`407`	`}`
`408`		`-`
	`408`	`+`
`409`	`409`	`public static abstract class T1 extends NestedTests {`
`410`	`410`	`final String path;`
`411`	`411`	`public T1(String path) {`
`@@ -416,13 +416,13 @@ class ParameterizedRunnerToParameterizedTest : JavaRecipeTest {`
`416`	`416`	`Assert.assertNotNull(path);`
`417`	`417`	`}`
`418`	`418`	`}`
`419`		`-`
	`419`	`+`
`420`	`420`	`static List<Object[]> valuesDataProvider() {`
`421`	`421`	`List<Object[]> params = new ArrayList<>();`
`422`	`422`	`params.add(new Object[] { "1", "2" });`
`423`	`423`	`return params;`
`424`	`424`	`}`
`425`		`-`
	`425`	`+`
`426`	`426`	`public static class I1 extends T1 {`
`427`	`427`	`public static Collection<Object[]> data1() {`
`428`	`428`	`return valuesDataProvider();`
`@@ -439,7 +439,7 @@ class ParameterizedRunnerToParameterizedTest : JavaRecipeTest {`
`439`	`439`	`Assert.assertNotNull(path);`
`440`	`440`	`}`
`441`	`441`	`}`
`442`		`-`
	`442`	`+`
`443`	`443`	`public static class I2 extends NestedTests {`
`444`	`444`	`public static Collection<Object[]> data2() {`
`445`	`445`	`return valuesDataProvider();`
Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,12 @@ class TestRuleToTestInfoTest : JavaRecipeTest {`
`47`	`47`	`import org.junit.jupiter.api.TestInfo;`
`48`	`48`
`49`	`49`	`public class SomeTest {`
`50`		`-`
	`50`	`+`
`51`	`51`	`public String name;`
`52`	`52`	`protected String randomName() {`
`53`	`53`	`return name;`
`54`	`54`	`}`
`55`		`-`
	`55`	`+`
`56`	`56`	`private static class SomeInnerClass {`
`57`	`57`	`}`
`58`	`58`
`@@ -97,7 +97,7 @@ class TestRuleToTestInfoTest : JavaRecipeTest {`
`97`	`97`
`98`	`98`	`public class SomeTest {`
`99`	`99`	`protected int count;`
`100`		`-`
	`100`	`+`
`101`	`101`	`public String name;`
`102`	`102`	`protected String randomName() {`
`103`	`103`	`return name;`
`@@ -111,7 +111,7 @@ class TestRuleToTestInfoTest : JavaRecipeTest {`
`111`	`111`	`}`
`112`	`112`	`count++;`
`113`	`113`	`}`
`114`		`-`
	`114`	`+`
`115`	`115`	`private static class SomeInnerClass {`
`116`	`116`	`}`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -257,9 +257,9 @@ class JunitMockitoUpgradeIntegrationTest : JavaRecipeTest {`
`257`	`257`	`after = """`
`258`	`258`	`import org.junit.jupiter.api.extension.ExtendWith;`
`259`	`259`	`import org.mockito.junit.jupiter.MockitoExtension;`
`260`		`-`
	`260`	`+`
`261`	`261`	`@ExtendWith(MockitoExtension.class)`
`262`		`- public class ExampleTest { }`
	`262`	`+ public class ExampleTest {}`
`263`	`263`	`"""`
`264`	`264`	`)`
`265`	`265`	`}`