Consistent declaration of if-blocks

sbrannen · sbrannen · commit 6511e30c589a · 2025-05-30T11:47:42.000+02:00
diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/converter/AnnotationBasedArgumentConverter.java
@@ -45,7 +45,7 @@ public AnnotationBasedArgumentConverter() {
 	@Override
 	public final void accept(A annotation) {
 		this.annotation = Preconditions.notNull(annotation, "annotation must not be null");
-		;
+
 	}
 
 	@Override
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/DefaultDiscoveryIssue.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/DefaultDiscoveryIssue.java
@@ -59,8 +59,9 @@ public Optional<Throwable> cause() {
 
 	@Override
 	public boolean equals(Object o) {
-		if (o == null || getClass() != o.getClass())
+		if (o == null || getClass() != o.getClass()) {
 			return false;
+		}
 		DefaultDiscoveryIssue that = (DefaultDiscoveryIssue) o;
 		return this.severity == that.severity //
 				&& Objects.equals(this.message, that.message) //
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/EnableRuleMigrationSupportWithBothRuleTypesTests.java
@@ -80,10 +80,12 @@ void beforeMethodOfBothRule2WasExecuted() {
 	static void afterMethodsOfBothRulesWereExecuted() {
 		assertEquals(1, numberOfRule1InstancesCreated);
 		assertEquals(1, numberOfRule2InstancesCreated);
-		if (!afterOfRule1WasExecuted)
+		if (!afterOfRule1WasExecuted) {
 			fail();
-		if (!afterOfRule2WasExecuted)
+		}
+		if (!afterOfRule2WasExecuted) {
 			fail();
+		}
 	}
 
 }
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForDifferentDeclaredReturnTypesRulesTests.java
@@ -57,10 +57,12 @@ void beforeMethodsOfBothRulesWereExecuted() {
 
 	@AfterAll
 	static void afterMethodsOfBothRulesWereExecuted() {
-		if (!afterOfRule1WasExecuted)
+		if (!afterOfRule1WasExecuted) {
 			fail();
-		if (!afterOfRule2WasExecuted)
+		}
+		if (!afterOfRule2WasExecuted) {
 			fail();
+		}
 	}
 
 	private static class MyExternalResource1 extends ExternalResource {
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMixedMethodAndFieldRulesTests.java
@@ -70,8 +70,9 @@ void constructorsAndBeforeEachMethodsOfAllRulesWereExecuted() {
 	@AfterAll
 	static void afterMethodsOfAllRulesWereExecuted() {
 		// beforeEach methods of rules from methods are run before those from fields but in reverse order
-		if (!asList(initEvents.get(2), initEvents.get(3), initEvents.get(0), initEvents.get(1)).equals(afterEvents))
+		if (!asList(initEvents.get(2), initEvents.get(3), initEvents.get(0), initEvents.get(1)).equals(afterEvents)) {
 			fail();
+		}
 	}
 
 	static class MyExternalResource extends ExternalResource {
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleFieldRulesTests.java
@@ -62,10 +62,12 @@ void beforeMethodsOfBothRulesWereExecuted() {
 
 	@AfterAll
 	static void afterMethodsOfBothRulesWereExecuted() {
-		if (!afterOfRule1WasExecuted)
+		if (!afterOfRule1WasExecuted) {
 			fail();
-		if (!afterOfRule2WasExecuted)
+		}
+		if (!afterOfRule2WasExecuted) {
 			fail();
+		}
 	}
 
 }
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/ExternalResourceSupportForMultipleMethodRulesTests.java
@@ -66,10 +66,12 @@ void beforeMethodsOfBothRulesWereExecuted() {
 
 	@AfterAll
 	static void afterMethodsOfBothRulesWereExecuted() {
-		if (!afterOfRule1WasExecuted)
+		if (!afterOfRule1WasExecuted) {
 			fail();
-		if (!afterOfRule2WasExecuted)
+		}
+		if (!afterOfRule2WasExecuted) {
 			fail();
+		}
 	}
 
 }
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/VerifierSupportForMixedMethodAndFieldRulesTests.java
@@ -53,10 +53,12 @@ void testNothing() {
 
 	@AfterAll
 	static void afterMethodsOfBothRulesWereExecuted() {
-		if (!afterOfRule1WasExecuted)
+		if (!afterOfRule1WasExecuted) {
 			fail();
-		if (!afterOfRule2WasExecuted)
+		}
+		if (!afterOfRule2WasExecuted) {
 			fail();
+		}
 	}
 
 }
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierFieldTests.java
@@ -39,8 +39,9 @@ void testNothing() {
 
 	@AfterAll
 	static void afterMethodOfRuleWasNotExecuted() {
-		if (afterOfRule1WasExecuted)
+		if (afterOfRule1WasExecuted) {
 			fail();
+		}
 	}
 
 }
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/migrationsupport/rules/WrongExtendWithForVerifierMethodTests.java
@@ -43,8 +43,9 @@ void testNothing() {
 
 	@AfterAll
 	static void afterMethodsOfBothRulesWereExecuted() {
-		if (afterOfRule1WasExecuted)
+		if (afterOfRule1WasExecuted) {
 			fail();
+		}
 	}
 
 }
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedTestIntegrationTests.java
@@ -2667,8 +2667,9 @@ static class ExceptionInStaticInitializerTestCase {
 
 		static {
 			//noinspection ConstantValue
-			if (true)
+			if (true) {
 				throw new RuntimeException("boom");
+			}
 		}
 
 		private static Stream<String> getArguments() {
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestDescriptorTests.java
@@ -111,8 +111,9 @@ void visitAllNodes() {
 	@Test
 	void pruneLeaf() {
 		TestDescriptor.Visitor visitor = descriptor -> {
-			if (descriptor.getUniqueId().equals(UniqueId.root("leaf", "leaf1-1")))
+			if (descriptor.getUniqueId().equals(UniqueId.root("leaf", "leaf1-1"))) {
 				descriptor.removeFromHierarchy();
+			}
 		};
 		engineDescriptor.accept(visitor);
 
@@ -128,8 +129,9 @@ void pruneLeaf() {
 	void pruneGroup() {
 		final var countVisited = new AtomicInteger();
 		TestDescriptor.Visitor visitor = descriptor -> {
-			if (descriptor.getUniqueId().equals(UniqueId.root("group", "group1")))
+			if (descriptor.getUniqueId().equals(UniqueId.root("group", "group1"))) {
 				descriptor.removeFromHierarchy();
+			}
 			countVisited.incrementAndGet();
 		};
 		engineDescriptor.accept(visitor);

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public AnnotationBasedArgumentConverter() {`
`45`	`45`	`@Override`
`46`	`46`	`public final void accept(A annotation) {`
`47`	`47`	`this.annotation = Preconditions.notNull(annotation, "annotation must not be null");`
`48`		`- ;`
	`48`	`+`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,12 @@ void beforeMethodOfBothRule2WasExecuted() {`
`80`	`80`	`static void afterMethodsOfBothRulesWereExecuted() {`
`81`	`81`	`assertEquals(1, numberOfRule1InstancesCreated);`
`82`	`82`	`assertEquals(1, numberOfRule2InstancesCreated);`
`83`		`- if (!afterOfRule1WasExecuted)`
	`83`	`+ if (!afterOfRule1WasExecuted) {`
`84`	`84`	`fail();`
`85`		`- if (!afterOfRule2WasExecuted)`
	`85`	`+ }`
	`86`	`+ if (!afterOfRule2WasExecuted) {`
`86`	`87`	`fail();`
	`88`	`+ }`
`87`	`89`	`}`
`88`	`90`
`89`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,12 @@ void beforeMethodsOfBothRulesWereExecuted() {`
`62`	`62`
`63`	`63`	`@AfterAll`
`64`	`64`	`static void afterMethodsOfBothRulesWereExecuted() {`
`65`		`- if (!afterOfRule1WasExecuted)`
	`65`	`+ if (!afterOfRule1WasExecuted) {`
`66`	`66`	`fail();`
`67`		`- if (!afterOfRule2WasExecuted)`
	`67`	`+ }`
	`68`	`+ if (!afterOfRule2WasExecuted) {`
`68`	`69`	`fail();`
	`70`	`+ }`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,12 @@ void beforeMethodsOfBothRulesWereExecuted() {`
`66`	`66`
`67`	`67`	`@AfterAll`
`68`	`68`	`static void afterMethodsOfBothRulesWereExecuted() {`
`69`		`- if (!afterOfRule1WasExecuted)`
	`69`	`+ if (!afterOfRule1WasExecuted) {`
`70`	`70`	`fail();`
`71`		`- if (!afterOfRule2WasExecuted)`
	`71`	`+ }`
	`72`	`+ if (!afterOfRule2WasExecuted) {`
`72`	`73`	`fail();`
	`74`	`+ }`
`73`	`75`	`}`
`74`	`76`
`75`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,12 @@ void testNothing() {`
`53`	`53`
`54`	`54`	`@AfterAll`
`55`	`55`	`static void afterMethodsOfBothRulesWereExecuted() {`
`56`		`- if (!afterOfRule1WasExecuted)`
	`56`	`+ if (!afterOfRule1WasExecuted) {`
`57`	`57`	`fail();`
`58`		`- if (!afterOfRule2WasExecuted)`
	`58`	`+ }`
	`59`	`+ if (!afterOfRule2WasExecuted) {`
`59`	`60`	`fail();`
	`61`	`+ }`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,9 @@ void testNothing() {`
`39`	`39`
`40`	`40`	`@AfterAll`
`41`	`41`	`static void afterMethodOfRuleWasNotExecuted() {`
`42`		`- if (afterOfRule1WasExecuted)`
	`42`	`+ if (afterOfRule1WasExecuted) {`
`43`	`43`	`fail();`
	`44`	`+ }`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,9 @@ void testNothing() {`
`43`	`43`
`44`	`44`	`@AfterAll`
`45`	`45`	`static void afterMethodsOfBothRulesWereExecuted() {`
`46`		`- if (afterOfRule1WasExecuted)`
	`46`	`+ if (afterOfRule1WasExecuted) {`
`47`	`47`	`fail();`
	`48`	`+ }`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`}`