Fix @EnabledIf/@DisabledIf unit tests

Author: sbrannen

junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/MethodBasedCondition.java

@@ -19,6 +19,7 @@
 import java.lang.reflect.Method;
 import java.util.Optional;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import org.junit.jupiter.api.extension.ConditionEvaluationResult;
 import org.junit.jupiter.api.extension.ExecutionCondition;
@@ -91,12 +92,13 @@ private boolean acceptsExtensionContextOrNoArguments(Method method) {
 	}
 
 	private ConditionEvaluationResult buildConditionEvaluationResult(boolean methodResult, A annotation) {
-		String defaultReason = format("Condition provided in %s evaluated to %s", this.annotationType, methodResult);
+		Supplier<String> defaultReason = () -> format("@%s(\"%s\") evaluated to %s",
+			this.annotationType.getSimpleName(), this.methodName.apply(annotation), methodResult);
 		if (isEnabled(methodResult)) {
-			return enabled(defaultReason);
+			return enabled(defaultReason.get());
 		}
 		String customReason = this.customDisabledReason.apply(annotation);
-		return StringUtils.isNotBlank(customReason) ? disabled(customReason) : disabled(defaultReason);
+		return StringUtils.isNotBlank(customReason) ? disabled(customReason) : disabled(defaultReason.get());
 	}
 
 	protected abstract boolean isEnabled(boolean methodResult);

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfConditionTests.java

@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.api.condition;
 
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 
@@ -61,7 +60,8 @@ void disabledBecauseStaticConditionMethodReturnsTrue() {
 	void enabledBecauseStaticConditionMethodReturnsFalse() {
 		evaluateCondition();
 		assertEnabled();
-		assertReasonContains("Condition provided in @DisabledIf evaluates to false");
+		assertReasonContains("""
+				@DisabledIf("staticMethodThatReturnsFalse") evaluated to false""");
 	}
 
 	/**
@@ -71,7 +71,8 @@ void enabledBecauseStaticConditionMethodReturnsFalse() {
 	void disabledBecauseConditionMethodReturnsTrue() {
 		evaluateCondition();
 		assertDisabled();
-		assertReasonContains("Condition provided in @DisabledIf evaluates to true");
+		assertReasonContains("""
+				@DisabledIf("methodThatReturnsTrue") evaluated to true""");
 	}
 
 	/**
@@ -81,32 +82,31 @@ void disabledBecauseConditionMethodReturnsTrue() {
 	void enabledBecauseConditionMethodReturnsFalse() {
 		evaluateCondition();
 		assertEnabled();
-		assertReasonContains("Condition provided in @DisabledIf evaluates to false");
+		assertReasonContains("""
+				@DisabledIf("methodThatReturnsFalse") evaluated to false""");
 	}
 
-	@Nested
-	class ExternalConditionMethod {
-
-		/**
-		 * @see DisabledIfIntegrationTests.ExternalConditionMethod#disabledBecauseConditionMethodReturnsTrue()
-		 */
-		@Test
-		void disabledBecauseConditionMethodReturnsTrue() {
-			evaluateCondition();
-			assertDisabled();
-			assertReasonContains("Condition provided in @DisabledIf evaluates to true");
-		}
-
-		/**
-		 * @see DisabledIfIntegrationTests.ExternalConditionMethod#enabledBecauseConditionMethodReturnsFalse()
-		 */
-		@Test
-		void enabledBecauseConditionMethodReturnsFalse() {
-			evaluateCondition();
-			assertEnabled();
-			assertReasonContains("Condition provided in @DisabledIf evaluates to false");
-		}
+	/**
+	 * @see DisabledIfIntegrationTests.ExternalConditionMethod#disabledBecauseStaticExternalConditionMethodReturnsTrue()
+	 */
+	@Test
+	void disabledBecauseStaticExternalConditionMethodReturnsTrue() {
+		evaluateCondition();
+		assertDisabled();
+		assertReasonContains("""
+				@DisabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue") evaluated to true""");
+	}
 
+	/**
+	 * @see DisabledIfIntegrationTests.ExternalConditionMethod#enabledBecauseStaticExternalConditionMethodReturnsFalse()
+	 */
+	@Test
+	void enabledBecauseStaticExternalConditionMethodReturnsFalse() {
+		evaluateCondition();
+		assertEnabled();
+		assertReasonContains(
+			"""
+					@DisabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse") evaluated to false""");
 	}
 
 }

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledIfIntegrationTests.java

@@ -50,20 +50,15 @@ void disabledBecauseConditionMethodReturnsTrue() {
 	void enabledBecauseConditionMethodReturnsFalse() {
 	}
 
-	@Nested
-	class ExternalConditionMethod {
-
-		@Test
-		@DisabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue")
-		void disabledBecauseConditionMethodReturnsTrue() {
-			fail("Should be disabled");
-		}
-
-		@Test
-		@DisabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse")
-		void enabledBecauseConditionMethodReturnsFalse() {
-		}
+	@Test
+	@DisabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue")
+	void disabledBecauseStaticExternalConditionMethodReturnsTrue() {
+		fail("Should be disabled");
+	}
 
+	@Test
+	@DisabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse")
+	void enabledBecauseStaticExternalConditionMethodReturnsFalse() {
 	}
 
 	@Nested

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfConditionTests.java

@@ -10,7 +10,6 @@
 
 package org.junit.jupiter.api.condition;
 
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 
@@ -51,7 +50,8 @@ void enabledBecauseAnnotationIsNotPresent() {
 	void enabledBecauseStaticConditionMethodReturnsTrue() {
 		evaluateCondition();
 		assertEnabled();
-		assertReasonContains("Condition provided in @EnabledIf evaluates to true");
+		assertReasonContains("""
+				@EnabledIf("staticMethodThatReturnsTrue") evaluated to true""");
 	}
 
 	/**
@@ -71,7 +71,8 @@ void disabledBecauseStaticConditionMethodReturnsFalse() {
 	void enabledBecauseConditionMethodReturnsTrue() {
 		evaluateCondition();
 		assertEnabled();
-		assertReasonContains("Condition provided in @EnabledIf evaluates to true");
+		assertReasonContains("""
+				@EnabledIf("methodThatReturnsTrue") evaluated to true""");
 	}
 
 	/**
@@ -81,32 +82,31 @@ void enabledBecauseConditionMethodReturnsTrue() {
 	void disabledBecauseConditionMethodReturnsFalse() {
 		evaluateCondition();
 		assertDisabled();
-		assertReasonContains("Condition provided in @EnabledIf evaluates to false");
+		assertReasonContains("""
+				@EnabledIf("methodThatReturnsFalse") evaluated to false""");
 	}
 
-	@Nested
-	class ExternalConditionMethod {
-
-		/**
-		 * @see EnabledIfIntegrationTests.ExternalConditionMethod#enabledBecauseConditionMethodReturnsTrue()
-		 */
-		@Test
-		void enabledBecauseConditionMethodReturnsTrue() {
-			evaluateCondition();
-			assertEnabled();
-			assertReasonContains("Condition provided in @EnabledIf evaluates to true");
-		}
-
-		/**
-		 * @see EnabledIfIntegrationTests.ExternalConditionMethod#disabledBecauseConditionMethodReturnsFalse()
-		 */
-		@Test
-		void disabledBecauseConditionMethodReturnsFalse() {
-			evaluateCondition();
-			assertDisabled();
-			assertReasonContains("Condition provided in @EnabledIf evaluates to false");
-		}
+	/**
+	 * @see EnabledIfIntegrationTests.ExternalConditionMethod#enabledBecauseStaticExternalConditionMethodReturnsTrue()
+	 */
+	@Test
+	void enabledBecauseStaticExternalConditionMethodReturnsTrue() {
+		evaluateCondition();
+		assertEnabled();
+		assertReasonContains("""
+				@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue") evaluated to true""");
+	}
 
+	/**
+	 * @see EnabledIfIntegrationTests.ExternalConditionMethod#disabledBecauseStaticExternalConditionMethodReturnsFalse()
+	 */
+	@Test
+	void disabledBecauseStaticExternalConditionMethodReturnsFalse() {
+		evaluateCondition();
+		assertDisabled();
+		assertReasonContains(
+			"""
+					@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse") evaluated to false""");
 	}
 
 }

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledIfIntegrationTests.java

@@ -50,28 +50,23 @@ void disabledBecauseConditionMethodReturnsFalse() {
 		fail("Should be disabled");
 	}
 
-	@Nested
-	class ExternalConditionMethod {
-
-		@Test
-		@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue")
-		void enabledBecauseConditionMethodReturnsTrue() {
-		}
-
-		@Test
-		@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse")
-		void disabledBecauseConditionMethodReturnsFalse() {
-			fail("Should be disabled");
-		}
+	@Test
+	@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsTrue")
+	void enabledBecauseStaticExternalConditionMethodReturnsTrue() {
+	}
 
+	@Test
+	@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse")
+	void disabledBecauseStaticExternalConditionMethodReturnsFalse() {
+		fail("Should be disabled");
 	}
 
 	@Nested
 	@EnabledIf("org.junit.jupiter.api.condition.StaticConditionMethods#returnsFalse")
 	class ConditionallyDisabledClass {
 
 		@Test
-		void disabledBecauseConditionMethodReturnsTrue() {
+		void disabledBecauseConditionMethodReturnsFalse() {
 			fail("Should be disabled");
 		}