Use expression lambdas

Author: marcphilipp

platform-tests/src/test/java/org/junit/platform/commons/util/CollectionUtilsTests.java

@@ -47,17 +47,14 @@ class CollectionUtilsTests {
 
 	@Test
 	void getOnlyElementWithNullCollection() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class, () -> {
-			CollectionUtils.getOnlyElement(null);
-		});
+		var exception = assertThrows(PreconditionViolationException.class, () -> CollectionUtils.getOnlyElement(null));
 		assertEquals("collection must not be null", exception.getMessage());
 	}
 
 	@Test
 	void getOnlyElementWithEmptyCollection() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class, () -> {
-			CollectionUtils.getOnlyElement(emptySet());
-		});
+		var exception = assertThrows(PreconditionViolationException.class,
+			() -> CollectionUtils.getOnlyElement(emptySet()));
 		assertEquals("collection must contain exactly one element: []", exception.getMessage());
 	}
 
@@ -70,9 +67,8 @@ void getOnlyElementWithSingleElementCollection() {
 
 	@Test
 	void getOnlyElementWithMultiElementCollection() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class, () -> {
-			CollectionUtils.getOnlyElement(asList("foo", "bar"));
-		});
+		var exception = assertThrows(PreconditionViolationException.class,
+			() -> CollectionUtils.getOnlyElement(asList("foo", "bar")));
 		assertEquals("collection must contain exactly one element: [foo, bar]", exception.getMessage());
 	}
 

platform-tests/src/test/java/org/junit/platform/commons/util/FunctionUtilsTests.java

@@ -30,17 +30,13 @@ class FunctionUtilsTests {
 
 	@Test
 	void whereWithNullFunction() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class, () -> {
-			FunctionUtils.where(null, o -> true);
-		});
+		var exception = assertThrows(PreconditionViolationException.class, () -> FunctionUtils.where(null, o -> true));
 		assertEquals("function must not be null", exception.getMessage());
 	}
 
 	@Test
 	void whereWithNullPredicate() {
-		PreconditionViolationException exception = assertThrows(PreconditionViolationException.class, () -> {
-			FunctionUtils.where(o -> o, null);
-		});
+		var exception = assertThrows(PreconditionViolationException.class, () -> FunctionUtils.where(o -> o, null));
 		assertEquals("predicate must not be null", exception.getMessage());
 	}
 

platform-tests/src/test/java/org/junit/platform/commons/util/ToStringBuilderTests.java

@@ -28,16 +28,12 @@ class ToStringBuilderTests {
 
 	@Test
 	void withNullObject() {
-		assertThrows(PreconditionViolationException.class, () -> {
-			new ToStringBuilder((Object) null);
-		});
+		assertThrows(PreconditionViolationException.class, () -> new ToStringBuilder((Object) null));
 	}
 
 	@Test
 	void withNullClass() {
-		assertThrows(PreconditionViolationException.class, () -> {
-			new ToStringBuilder((Class<?>) null);
-		});
+		assertThrows(PreconditionViolationException.class, () -> new ToStringBuilder((Class<?>) null));
 	}
 
 	@Test

platform-tests/src/test/java/org/junit/platform/launcher/listeners/discovery/AbstractLauncherDiscoveryListenerTests.java

@@ -24,10 +24,9 @@ protected TestEngineStub createEngineThatCannotResolveAnything(String engineId)
 		return new TestEngineStub(engineId) {
 			@Override
 			public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
-				discoveryRequest.getSelectorsByType(DiscoverySelector.class).forEach(selector -> {
-					discoveryRequest.getDiscoveryListener().selectorProcessed(uniqueId, selector,
-						SelectorResolutionResult.unresolved());
-				});
+				discoveryRequest.getSelectorsByType(DiscoverySelector.class) //
+						.forEach(selector -> discoveryRequest.getDiscoveryListener().selectorProcessed(uniqueId,
+							selector, SelectorResolutionResult.unresolved()));
 				return new EngineDescriptor(uniqueId, "Some Engine");
 			}
 		};
@@ -37,10 +36,9 @@ protected TestEngineStub createEngineThatFailsToResolveAnything(String engineId,
 		return new TestEngineStub(engineId) {
 			@Override
 			public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
-				discoveryRequest.getSelectorsByType(DiscoverySelector.class).forEach(selector -> {
-					discoveryRequest.getDiscoveryListener().selectorProcessed(uniqueId, selector,
-						SelectorResolutionResult.failed(rootCause));
-				});
+				discoveryRequest.getSelectorsByType(DiscoverySelector.class) //
+						.forEach(selector -> discoveryRequest.getDiscoveryListener().selectorProcessed(uniqueId,
+							selector, SelectorResolutionResult.failed(rootCause)));
 				return new EngineDescriptor(uniqueId, "Some Engine");
 			}
 		};