From ab20a189c55f0adb3665e085588fa8ae0adb38ed Mon Sep 17 00:00:00 2001
From: Sam Brannen <sbrannen@vmware.com>
Date: Sun, 28 Aug 2022 16:09:38 +0200
Subject: [PATCH] Consistent logging for skipped TestExecutionListeners

With this commit we now log an identical message (without a stack
trace) for a TestExecutionListener skipped due to a
ClassNotFoundException like we already do for a listener skipped due to
a NoClassDefFoundError.
---
 .../AbstractTestContextBootstrapper.java      | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java
index d699a6f289..d127e46e03 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java
@@ -217,8 +217,9 @@ public abstract class AbstractTestContextBootstrapper implements TestContextBoot
 				listeners.add(BeanUtils.instantiateClass(listenerClass));
 			}
 			catch (BeanInstantiationException ex) {
-				if (ex.getCause() instanceof NoClassDefFoundError noClassDefFoundError) {
-					handleNoClassDefFoundError(listenerClass.getName(), noClassDefFoundError);
+				Throwable cause = ex.getCause();
+				if (cause instanceof ClassNotFoundException || cause instanceof NoClassDefFoundError) {
+					logSkippedListener(listenerClass.getName(), cause);
 				}
 				else {
 					throw ex;
@@ -233,11 +234,12 @@ public abstract class AbstractTestContextBootstrapper implements TestContextBoot
 
 		Throwable ex = (failure instanceof InvocationTargetException ite ?
 				ite.getTargetException() : failure);
-		if (ex instanceof LinkageError || ex instanceof ClassNotFoundException) {
-			if (ex instanceof NoClassDefFoundError noClassDefFoundError) {
-				handleNoClassDefFoundError(listenerClassName, noClassDefFoundError);
-			}
-			else if (logger.isDebugEnabled()) {
+
+		if (ex instanceof ClassNotFoundException || ex instanceof NoClassDefFoundError) {
+			logSkippedListener(listenerClassName, ex);
+		}
+		else if (ex instanceof LinkageError) {
+			if (logger.isDebugEnabled()) {
 				logger.debug("""
 						Could not load default TestExecutionListener [%s]. Specify custom \
 						listener classes or make the default listener classes available."""
@@ -256,14 +258,14 @@ public abstract class AbstractTestContextBootstrapper implements TestContextBoot
 		}
 	}
 
-	private void handleNoClassDefFoundError(String listenerClassName, NoClassDefFoundError error) {
+	private void logSkippedListener(String listenerClassName, Throwable ex) {
 		// TestExecutionListener not applicable due to a missing dependency
 		if (logger.isDebugEnabled()) {
 			logger.debug("""
 					Skipping candidate TestExecutionListener [%s] due to a missing dependency. \
 					Specify custom listener classes or make the default listener classes \
 					and their required dependencies available. Offending class: [%s]"""
-						.formatted(listenerClassName, error.getMessage()));
+						.formatted(listenerClassName, ex.getMessage()));
 		}
 	}