Fix spotlessApply violation

neronsoda · neronsoda · commit 778e0bde00ee · 2024-11-28T23:29:54.000+09:00
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DisplayNameUtils.java
@@ -96,10 +96,10 @@ static String determineDisplayNameForMethod(Class<?> testClass, Method testMetho
 			createDisplayNameSupplierForMethod(testClass, testMethod, configuration));
 	}
 
-	static String determineDisplayNameForMethod(List<Class<?>> enclosingInstanceTypes, Class<?> testClass, Method testMethod,
-			JupiterConfiguration configuration) {
+	static String determineDisplayNameForMethod(List<Class<?>> enclosingInstanceTypes, Class<?> testClass,
+			Method testMethod, JupiterConfiguration configuration) {
 		return determineDisplayName(testMethod,
-				createDisplayNameSupplierForMethod(enclosingInstanceTypes, testClass, testMethod, configuration));
+			createDisplayNameSupplierForMethod(enclosingInstanceTypes, testClass, testMethod, configuration));
 	}
 
 	static Supplier<String> createDisplayNameSupplierForClass(Class<?> testClass, JupiterConfiguration configuration) {
@@ -113,10 +113,10 @@ static Supplier<String> createDisplayNameSupplierForNestedClass(Class<?> testCla
 			generator -> generator.generateDisplayNameForNestedClass(testClass));
 	}
 
-	static Supplier<String> createDisplayNameSupplierForNestedClass(List<Class<?>> enclosingInstanceTypes, Class<?> testClass,
-			JupiterConfiguration configuration) {
+	static Supplier<String> createDisplayNameSupplierForNestedClass(List<Class<?>> enclosingInstanceTypes,
+			Class<?> testClass, JupiterConfiguration configuration) {
 		return createDisplayNameSupplier(testClass, configuration,
-				generator -> generator.generateDisplayNameForNestedClass(enclosingInstanceTypes, testClass));
+			generator -> generator.generateDisplayNameForNestedClass(enclosingInstanceTypes, testClass));
 	}
 
 	private static Supplier<String> createDisplayNameSupplierForMethod(Class<?> testClass, Method testMethod,
@@ -125,10 +125,10 @@ private static Supplier<String> createDisplayNameSupplierForMethod(Class<?> test
 			generator -> generator.generateDisplayNameForMethod(testClass, testMethod));
 	}
 
-	private static Supplier<String> createDisplayNameSupplierForMethod(List<Class<?>> enclosingInstanceTypes, Class<?> testClass, Method testMethod,
-			JupiterConfiguration configuration) {
+	private static Supplier<String> createDisplayNameSupplierForMethod(List<Class<?>> enclosingInstanceTypes,
+			Class<?> testClass, Method testMethod, JupiterConfiguration configuration) {
 		return createDisplayNameSupplier(testClass, configuration,
-				generator -> generator.generateDisplayNameForMethod(enclosingInstanceTypes, testClass, testMethod));
+			generator -> generator.generateDisplayNameForMethod(enclosingInstanceTypes, testClass, testMethod));
 	}
 
 	private static Supplier<String> createDisplayNameSupplier(Class<?> testClass, JupiterConfiguration configuration,
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java
@@ -65,7 +65,7 @@ public abstract class MethodBasedTestDescriptor extends JupiterTestDescriptor im
 	MethodBasedTestDescriptor(UniqueId uniqueId, List<Class<?>> enclosingInstanceTypes, Class<?> testClass,
 			Method testMethod, JupiterConfiguration configuration) {
 		this(uniqueId, determineDisplayNameForMethod(enclosingInstanceTypes, testClass, testMethod, configuration),
-				testClass, testMethod, configuration);
+			testClass, testMethod, configuration);
 	}
 
 	MethodBasedTestDescriptor(UniqueId uniqueId, String displayName, Class<?> testClass, Method testMethod,
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/NestedClassTestDescriptor.java
@@ -50,8 +50,10 @@ public NestedClassTestDescriptor(UniqueId uniqueId, Class<?> testClass, JupiterC
 		super(uniqueId, testClass, createDisplayNameSupplierForNestedClass(testClass, configuration), configuration);
 	}
 
-	public NestedClassTestDescriptor(UniqueId uniqueId, List<Class<?>> enclosingInstanceTypes, Class<?> testClass, JupiterConfiguration configuration) {
-		super(uniqueId, testClass, createDisplayNameSupplierForNestedClass(enclosingInstanceTypes, testClass, configuration), configuration);
+	public NestedClassTestDescriptor(UniqueId uniqueId, List<Class<?>> enclosingInstanceTypes, Class<?> testClass,
+			JupiterConfiguration configuration) {
+		super(uniqueId, testClass,
+			createDisplayNameSupplierForNestedClass(enclosingInstanceTypes, testClass, configuration), configuration);
 	}
 
 	// --- TestDescriptor ------------------------------------------------------
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/ClassSelectorResolver.java
@@ -82,8 +82,9 @@ else if (isNestedTestClass.test(testClass)) {
 	@Override
 	public Resolution resolve(NestedClassSelector selector, Context context) {
 		if (isNestedTestClass.test(selector.getNestedClass())) {
-			return toResolution(context.addToParent(() -> selectClass(selector.getEnclosingClasses()),
-				parent -> Optional.of(newNestedClassTestDescriptor(parent, selector.getEnclosingClasses(), selector.getNestedClass()))));
+			return toResolution(
+				context.addToParent(() -> selectClass(selector.getEnclosingClasses()), parent -> Optional.of(
+					newNestedClassTestDescriptor(parent, selector.getEnclosingClasses(), selector.getNestedClass()))));
 		}
 		return unresolved();
 	}
@@ -127,10 +128,11 @@ private NestedClassTestDescriptor newNestedClassTestDescriptor(TestDescriptor pa
 			configuration);
 	}
 
-	private NestedClassTestDescriptor newNestedClassTestDescriptor(TestDescriptor parent, List<Class<?>> enclosingInstanceTypes, Class<?> testClass) {
+	private NestedClassTestDescriptor newNestedClassTestDescriptor(TestDescriptor parent,
+			List<Class<?>> enclosingInstanceTypes, Class<?> testClass) {
 		return new NestedClassTestDescriptor(
-				parent.getUniqueId().append(NestedClassTestDescriptor.SEGMENT_TYPE, testClass.getSimpleName()), enclosingInstanceTypes, testClass,
-				configuration);
+			parent.getUniqueId().append(NestedClassTestDescriptor.SEGMENT_TYPE, testClass.getSimpleName()),
+			enclosingInstanceTypes, testClass, configuration);
 	}
 
 	private Resolution toResolution(Optional<? extends ClassBasedTestDescriptor> testDescriptor) {
diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/discovery/MethodSelectorResolver.java
@@ -189,7 +189,8 @@ protected TestDescriptor createTestDescriptor(UniqueId uniqueId, Class<?> testCl
 			@Override
 			protected TestDescriptor createTestDescriptor(UniqueId uniqueId, List<Class<?>> enclosingInstanceTypes,
 					Class<?> testClass, Method method, JupiterConfiguration configuration) {
-				return new TestFactoryTestDescriptor(uniqueId, enclosingInstanceTypes, testClass, method, configuration);
+				return new TestFactoryTestDescriptor(uniqueId, enclosingInstanceTypes, testClass, method,
+					configuration);
 			}
 		},
 
@@ -204,7 +205,8 @@ protected TestDescriptor createTestDescriptor(UniqueId uniqueId, Class<?> testCl
 			@Override
 			protected TestDescriptor createTestDescriptor(UniqueId uniqueId, List<Class<?>> enclosingInstanceTypes,
 					Class<?> testClass, Method method, JupiterConfiguration configuration) {
-				return new TestTemplateTestDescriptor(uniqueId, enclosingInstanceTypes, testClass, method, configuration);
+				return new TestTemplateTestDescriptor(uniqueId, enclosingInstanceTypes, testClass, method,
+					configuration);
 			}
 		};
 
@@ -224,8 +226,8 @@ private Optional<TestDescriptor> resolve(List<Class<?>> enclosingClasses, Class<
 				return Optional.empty();
 			}
 			return context.addToParent(() -> selectClass(enclosingClasses, testClass), //
-				parent -> Optional.of(
-					createTestDescriptor(createUniqueId(method, parent), enclosingClasses, testClass, method, configuration)));
+				parent -> Optional.of(createTestDescriptor(createUniqueId(method, parent), enclosingClasses, testClass,
+					method, configuration)));
 		}
 
 		private DiscoverySelector selectClass(List<Class<?>> enclosingClasses, Class<?> testClass) {

Original file line number	Diff line number	Diff line change
`@@ -96,10 +96,10 @@ static String determineDisplayNameForMethod(Class<?> testClass, Method testMetho`
`96`	`96`	`createDisplayNameSupplierForMethod(testClass, testMethod, configuration));`
`97`	`97`	`}`
`98`	`98`
`99`		`- static String determineDisplayNameForMethod(List<Class<?>> enclosingInstanceTypes, Class<?> testClass, Method testMethod,`
`100`		`- JupiterConfiguration configuration) {`
	`99`	`+ static String determineDisplayNameForMethod(List<Class<?>> enclosingInstanceTypes, Class<?> testClass,`
	`100`	`+ Method testMethod, JupiterConfiguration configuration) {`
`101`	`101`	`return determineDisplayName(testMethod,`
`102`		`- createDisplayNameSupplierForMethod(enclosingInstanceTypes, testClass, testMethod, configuration));`
	`102`	`+ createDisplayNameSupplierForMethod(enclosingInstanceTypes, testClass, testMethod, configuration));`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`static Supplier<String> createDisplayNameSupplierForClass(Class<?> testClass, JupiterConfiguration configuration) {`
`@@ -113,10 +113,10 @@ static Supplier<String> createDisplayNameSupplierForNestedClass(Class<?> testCla`
`113`	`113`	`generator -> generator.generateDisplayNameForNestedClass(testClass));`
`114`	`114`	`}`
`115`	`115`
`116`		`- static Supplier<String> createDisplayNameSupplierForNestedClass(List<Class<?>> enclosingInstanceTypes, Class<?> testClass,`
`117`		`- JupiterConfiguration configuration) {`
	`116`	`+ static Supplier<String> createDisplayNameSupplierForNestedClass(List<Class<?>> enclosingInstanceTypes,`
	`117`	`+ Class<?> testClass, JupiterConfiguration configuration) {`
`118`	`118`	`return createDisplayNameSupplier(testClass, configuration,`
`119`		`- generator -> generator.generateDisplayNameForNestedClass(enclosingInstanceTypes, testClass));`
	`119`	`+ generator -> generator.generateDisplayNameForNestedClass(enclosingInstanceTypes, testClass));`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`private static Supplier<String> createDisplayNameSupplierForMethod(Class<?> testClass, Method testMethod,`
`@@ -125,10 +125,10 @@ private static Supplier<String> createDisplayNameSupplierForMethod(Class<?> test`
`125`	`125`	`generator -> generator.generateDisplayNameForMethod(testClass, testMethod));`
`126`	`126`	`}`
`127`	`127`
`128`		`- private static Supplier<String> createDisplayNameSupplierForMethod(List<Class<?>> enclosingInstanceTypes, Class<?> testClass, Method testMethod,`
`129`		`- JupiterConfiguration configuration) {`
	`128`	`+ private static Supplier<String> createDisplayNameSupplierForMethod(List<Class<?>> enclosingInstanceTypes,`
	`129`	`+ Class<?> testClass, Method testMethod, JupiterConfiguration configuration) {`
`130`	`130`	`return createDisplayNameSupplier(testClass, configuration,`
`131`		`- generator -> generator.generateDisplayNameForMethod(enclosingInstanceTypes, testClass, testMethod));`
	`131`	`+ generator -> generator.generateDisplayNameForMethod(enclosingInstanceTypes, testClass, testMethod));`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`private static Supplier<String> createDisplayNameSupplier(Class<?> testClass, JupiterConfiguration configuration,`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public abstract class MethodBasedTestDescriptor extends JupiterTestDescriptor im`
`65`	`65`	`MethodBasedTestDescriptor(UniqueId uniqueId, List<Class<?>> enclosingInstanceTypes, Class<?> testClass,`
`66`	`66`	`Method testMethod, JupiterConfiguration configuration) {`
`67`	`67`	`this(uniqueId, determineDisplayNameForMethod(enclosingInstanceTypes, testClass, testMethod, configuration),`
`68`		`- testClass, testMethod, configuration);`
	`68`	`+ testClass, testMethod, configuration);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`MethodBasedTestDescriptor(UniqueId uniqueId, String displayName, Class<?> testClass, Method testMethod,`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,10 @@ public NestedClassTestDescriptor(UniqueId uniqueId, Class<?> testClass, JupiterC`
`50`	`50`	`super(uniqueId, testClass, createDisplayNameSupplierForNestedClass(testClass, configuration), configuration);`
`51`	`51`	`}`
`52`	`52`
`53`		`- public NestedClassTestDescriptor(UniqueId uniqueId, List<Class<?>> enclosingInstanceTypes, Class<?> testClass, JupiterConfiguration configuration) {`
`54`		`- super(uniqueId, testClass, createDisplayNameSupplierForNestedClass(enclosingInstanceTypes, testClass, configuration), configuration);`
	`53`	`+ public NestedClassTestDescriptor(UniqueId uniqueId, List<Class<?>> enclosingInstanceTypes, Class<?> testClass,`
	`54`	`+ JupiterConfiguration configuration) {`
	`55`	`+ super(uniqueId, testClass,`
	`56`	`+ createDisplayNameSupplierForNestedClass(enclosingInstanceTypes, testClass, configuration), configuration);`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`// --- TestDescriptor ------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,9 @@ else if (isNestedTestClass.test(testClass)) {`
`82`	`82`	`@Override`
`83`	`83`	`public Resolution resolve(NestedClassSelector selector, Context context) {`
`84`	`84`	`if (isNestedTestClass.test(selector.getNestedClass())) {`
`85`		`- return toResolution(context.addToParent(() -> selectClass(selector.getEnclosingClasses()),`
`86`		`- parent -> Optional.of(newNestedClassTestDescriptor(parent, selector.getEnclosingClasses(), selector.getNestedClass()))));`
	`85`	`+ return toResolution(`
	`86`	`+ context.addToParent(() -> selectClass(selector.getEnclosingClasses()), parent -> Optional.of(`
	`87`	`+ newNestedClassTestDescriptor(parent, selector.getEnclosingClasses(), selector.getNestedClass()))));`
`87`	`88`	`}`
`88`	`89`	`return unresolved();`
`89`	`90`	`}`
`@@ -127,10 +128,11 @@ private NestedClassTestDescriptor newNestedClassTestDescriptor(TestDescriptor pa`
`127`	`128`	`configuration);`
`128`	`129`	`}`
`129`	`130`
`130`		`- private NestedClassTestDescriptor newNestedClassTestDescriptor(TestDescriptor parent, List<Class<?>> enclosingInstanceTypes, Class<?> testClass) {`
	`131`	`+ private NestedClassTestDescriptor newNestedClassTestDescriptor(TestDescriptor parent,`
	`132`	`+ List<Class<?>> enclosingInstanceTypes, Class<?> testClass) {`
`131`	`133`	`return new NestedClassTestDescriptor(`
`132`		`- parent.getUniqueId().append(NestedClassTestDescriptor.SEGMENT_TYPE, testClass.getSimpleName()), enclosingInstanceTypes, testClass,`
`133`		`- configuration);`
	`134`	`+ parent.getUniqueId().append(NestedClassTestDescriptor.SEGMENT_TYPE, testClass.getSimpleName()),`
	`135`	`+ enclosingInstanceTypes, testClass, configuration);`
`134`	`136`	`}`
`135`	`137`
`136`	`138`	`private Resolution toResolution(Optional<? extends ClassBasedTestDescriptor> testDescriptor) {`