From ddc20169fd0bb63431a36b772097cd7981d941bc Mon Sep 17 00:00:00 2001 From: Philzen Date: Sat, 22 Jun 2024 02:55:20 +0200 Subject: [PATCH] Fix trailing whitespace in text blocks --- .../MigrateDataProviderTest.java | 155 ++++++++---------- 1 file changed, 72 insertions(+), 83 deletions(-) diff --git a/src/test/java/io/github/mboegers/openrewrite/testngtojupiter/MigrateDataProviderTest.java b/src/test/java/io/github/mboegers/openrewrite/testngtojupiter/MigrateDataProviderTest.java index ccf04758..f77ec5f3 100644 --- a/src/test/java/io/github/mboegers/openrewrite/testngtojupiter/MigrateDataProviderTest.java +++ b/src/test/java/io/github/mboegers/openrewrite/testngtojupiter/MigrateDataProviderTest.java @@ -29,16 +29,14 @@ public void defaults(RecipeSpec spec) { .recipe(new MigrateDataProvider()); } + @Nested class WrapDataProvider { - @Nested - class WrapDataProvider { - @Test - void withName() { + @Test void withName() { @Language("java") String is = """ package de.boeg.tst.provider; - + import org.testng.annotations.DataProvider; - + public class BoxPrimitiveDataProvider { @DataProvider(name = "anotherBoxPrimitiveDataProvider") public static Object[][] boxPrimitiveDataProvider() { /*...*/ } @@ -46,15 +44,15 @@ public static Object[][] boxPrimitiveDataProvider() { /*...*/ } """; @Language("java") String should = """ package de.boeg.tst.provider; - + import org.junit.jupiter.params.provider.Arguments; - + import java.util.Arrays; import java.util.stream.Stream; - + public class BoxPrimitiveDataProvider { public static Object[][] boxPrimitiveDataProvider() { /*...*/ } - + public static Stream anotherBoxPrimitiveDataProvider() { return Arrays.stream(boxPrimitiveDataProvider()).map(Arguments::of); } @@ -63,12 +61,11 @@ public static Stream anotherBoxPrimitiveDataProvider() { rewriteRun(java(is, should)); } - @Test - void withDefaultName() { + @Test void withDefaultName() { @Language("java") String is = """ package de.boeg.tst.provider; import org.testng.annotations.DataProvider; - + public class BoxPrimitiveDataProvider { @DataProvider public static Object[][] boxPrimitiveDataProvider() { /*...*/ } @@ -77,13 +74,13 @@ public static Object[][] boxPrimitiveDataProvider() { /*...*/ } @Language("java") String should = """ package de.boeg.tst.provider; import org.junit.jupiter.params.provider.Arguments; - + import java.util.Arrays; import java.util.stream.Stream; - + public class BoxPrimitiveDataProvider { public static Object[][] boxPrimitiveDataProvider() { /*...*/ } - + public static Stream boxPrimitiveDataProvider() { return Arrays.stream(boxPrimitiveDataProvider()).map(Arguments::of); } @@ -91,20 +88,18 @@ public static Stream boxPrimitiveDataProvider() { """; rewriteRun(java(is, should)); } - } - @Nested - class NewTests { - @Test - void fullMigrate() { + @Nested class NewTests { + + @Test void fullMigrate() { rewriteRun( java( """ package de.boeg.tst.provider; import org.testng.annotations.DataProvider; - - public class BoxPrimitiveDataProvider { + + public class BoxPrimitiveDataProvider { @DataProvider public static Object[][] boxPrimitiveDataProvider() { /*...*/ } } @@ -112,13 +107,13 @@ public static Object[][] boxPrimitiveDataProvider() { /*...*/ } """ package de.boeg.tst.provider; import org.junit.jupiter.params.provider.Arguments; - + import java.util.Arrays; import java.util.stream.Stream; - + public class BoxPrimitiveDataProvider { public static Object[][] boxPrimitiveDataProvider() { /*...*/ } - + public static Stream boxPrimitiveDataProvider() { return Arrays.stream(boxPrimitiveDataProvider()).map(Arguments::of); } @@ -129,9 +124,9 @@ public static Stream boxPrimitiveDataProvider() { """ package de.boeg.tst.real; import org.testng.annotations.Test; - + import de.boeg.tst.provider.BoxPrimitiveDataProvider; - + public class HotSpotConstantReflectionProviderTest { @Test(dataProvider = "boxPrimitiveDataProvider", dataProviderClass = BoxPrimitiveDataProvider.class) public void testUnboxPrimitive(Object constant, Object expected) {/*...*/} @@ -141,9 +136,9 @@ public void testUnboxPrimitive(Object constant, Object expected) {/*...*/} import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.testng.annotations.Test; - + import de.boeg.tst.provider.BoxPrimitiveDataProvider; - + public class HotSpotConstantReflectionProviderTest { @Test @ParameterizedTest @@ -154,15 +149,14 @@ public void testUnboxPrimitive(Object constant, Object expected) {/*...*/} )); } - @Test - void WrapOnlyDataprovider() { + @Test void WrapOnlyDataprovider() { rewriteRun( java( """ package de.boeg.tst.provider; import org.testng.annotations.DataProvider; - - public class BoxPrimitiveDataProvider { + + public class BoxPrimitiveDataProvider { @DataProvider public static Object[][] boxPrimitiveDataProvider() { /*...*/ } } @@ -170,13 +164,13 @@ public static Object[][] boxPrimitiveDataProvider() { /*...*/ } """ package de.boeg.tst.provider; import org.junit.jupiter.params.provider.Arguments; - + import java.util.Arrays; import java.util.stream.Stream; - + public class BoxPrimitiveDataProvider { public static Object[][] boxPrimitiveDataProvider() { /*...*/ } - + public static Stream boxPrimitiveDataProvider() { return Arrays.stream(boxPrimitiveDataProvider()).map(Arguments::of); } @@ -187,14 +181,14 @@ public static Stream boxPrimitiveDataProvider() { """ package de.boeg.tst.real; import org.testng.annotations.Test; - + import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; - + import de.boeg.tst.provider.BoxPrimitiveDataProvider; - + class BoxPrimitiveDataProvider {} - + public class HotSpotConstantReflectionProviderTest { @Test @MethodSource("de.boeg.tst.provider.BoxPrimitiveDataProvider#boxPrimitiveDataProvider") @@ -205,20 +199,18 @@ public void testUnboxPrimitive(Object constant, Object expected) {/*...*/} )); } - @Test - void addsParameterizedTest() { - rewriteRun( - java( + @Test void addsParameterizedTest() { + rewriteRun(java( """ package de.boeg.tst.provider; import org.junit.jupiter.params.provider.Arguments; - + import java.util.Arrays; import java.util.stream.Stream; - + public class BoxPrimitiveDataProvider { public static Object[][] boxPrimitiveDataProvider() { /*...*/ } - + public static Stream boxPrimitiveDataProvider() { return Arrays.stream(boxPrimitiveDataProvider()).map(Arguments::of); } @@ -230,9 +222,9 @@ public static Stream boxPrimitiveDataProvider() { package de.boeg.tst.real; import org.testng.annotations.Test; import org.junit.jupiter.params.provider.MethodSource; - + import de.boeg.tst.provider.BoxPrimitiveDataProvider; - + public class HotSpotConstantReflectionProviderTest { @Test(dataProvider = "boxPrimitiveDataProvider", dataProviderClass = BoxPrimitiveDataProvider.class) @MethodSource("de.boeg.tst.provider.BoxPrimitiveDataProvider#boxPrimitiveDataProvider") @@ -243,9 +235,9 @@ public void testUnboxPrimitive(Object constant, Object expected) {/*...*/} import org.testng.annotations.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; - + import de.boeg.tst.provider.BoxPrimitiveDataProvider; - + public class HotSpotConstantReflectionProviderTest { @Test @MethodSource("de.boeg.tst.provider.BoxPrimitiveDataProvider#boxPrimitiveDataProvider") @@ -256,20 +248,19 @@ public void testUnboxPrimitive(Object constant, Object expected) {/*...*/} )); } - @Test - void addsMethodSource() { + @Test void addsMethodSource() { rewriteRun( java( """ package de.boeg.tst.provider; import org.junit.jupiter.params.provider.Arguments; - + import java.util.Arrays; import java.util.stream.Stream; - + public class BoxPrimitiveDataProvider { public static Object[][] boxPrimitiveDataProvider() { /*...*/ } - + public static Stream boxPrimitiveDataProvider() { return Arrays.stream(boxPrimitiveDataProvider()).map(Arguments::of); } @@ -280,25 +271,26 @@ public static Stream boxPrimitiveDataProvider() { """ package de.boeg.tst.real; import org.testng.annotations.Test; - + import org.junit.jupiter.params.ParameterizedTest; - + import de.boeg.tst.provider.BoxPrimitiveDataProvider; - + public class HotSpotConstantReflectionProviderTest { @Test(dataProvider = "boxPrimitiveDataProvider", dataProviderClass = BoxPrimitiveDataProvider.class) @ParameterizedTest public void testUnboxPrimitive(Object constant, Object expected) {/*...*/} } - """, """ + """, + """ package de.boeg.tst.real; import org.junit.jupiter.params.provider.MethodSource; import org.testng.annotations.Test; - + import org.junit.jupiter.params.ParameterizedTest; - + import de.boeg.tst.provider.BoxPrimitiveDataProvider; - + public class HotSpotConstantReflectionProviderTest { @Test @ParameterizedTest @@ -309,20 +301,19 @@ public void testUnboxPrimitive(Object constant, Object expected) {/*...*/} )); } - @Test - void removesTestNgAnnotationArguments() { + @Test void removesTestNgAnnotationArguments() { rewriteRun( java( """ package de.boeg.tst.provider; import org.junit.jupiter.params.provider.Arguments; - + import java.util.Arrays; import java.util.stream.Stream; - + public class BoxPrimitiveDataProvider { public static Object[][] boxPrimitiveDataProvider() { /*...*/ } - + public static Stream boxPrimitiveDataProvider() { return Arrays.stream(boxPrimitiveDataProvider()).map(Arguments::of); } @@ -333,11 +324,11 @@ public static Stream boxPrimitiveDataProvider() { """ package de.boeg.tst.real; import org.testng.annotations.Test; - + import org.junit.jupiter.params.ParameterizedTest; - + import de.boeg.tst.provider.BoxPrimitiveDataProvider; - + public class HotSpotConstantReflectionProviderTest { @Test(dataProvider = "boxPrimitiveDataProvider", dataProviderClass = BoxPrimitiveDataProvider.class) @ParameterizedTest @@ -347,11 +338,11 @@ public void testUnboxPrimitive(Object constant, Object expected) {/*...*/} package de.boeg.tst.real; import org.junit.jupiter.params.provider.MethodSource; import org.testng.annotations.Test; - + import org.junit.jupiter.params.ParameterizedTest; - + import de.boeg.tst.provider.BoxPrimitiveDataProvider; - + public class HotSpotConstantReflectionProviderTest { @Test @ParameterizedTest @@ -362,20 +353,18 @@ public void testUnboxPrimitive(Object constant, Object expected) {/*...*/} )); } - @Test - void doNothingIfNameMissing() { - rewriteRun( - java( + @Test void doNothingIfNameMissing() { + rewriteRun(java( """ package de.boeg.tst.provider; import org.junit.jupiter.params.provider.Arguments; - + import java.util.Arrays; import java.util.stream.Stream; - + public class BoxPrimitiveDataProvider { public static Object[][] boxPrimitiveDataProvider() { /*...*/ } - + public static Stream boxPrimitiveDataProvider() { return Arrays.stream(boxPrimitiveDataProvider()).map(Arguments::of); } @@ -386,7 +375,7 @@ public static Stream boxPrimitiveDataProvider() { """ package de.boeg.tst.real; import org.testng.annotations.Test; - + public class HotSpotConstantReflectionProviderTest { @Test(enabled = false) public void testUnboxPrimitive(Object constant, Object expected) {/*...*/}