From f72bf0c177a298972699b59c8746fc7e7b8c9803 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 22 Oct 2023 13:04:23 +0200
Subject: [PATCH] Revert "Skipping duplicate test classes during test AOT
 processing"

This reverts commit 1281f03b96a99ee3b6e7086208b187be7baa2094.
---
 .../context/aot/TestContextAotGenerator.java  | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java b/spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java
index baab2455e81..25e27f7b2f4 100644
--- a/spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java
+++ b/spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java
@@ -17,7 +17,6 @@
 package org.springframework.test.context.aot;
 
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -179,27 +178,18 @@ public class TestContextAotGenerator {
 
 			MultiValueMap<MergedContextConfiguration, Class<?>> mergedConfigMappings = new LinkedMultiValueMap<>();
 			ClassLoader classLoader = getClass().getClassLoader();
-			Set<String> visitedTestClassNames = new HashSet<>();
 			testClasses.forEach(testClass -> {
-				String testClassName = testClass.getName();
-				if (visitedTestClassNames.add(testClassName)) {
-					MergedContextConfiguration mergedConfig = buildMergedContextConfiguration(testClass);
-					mergedConfigMappings.add(mergedConfig, testClass);
-					collectRuntimeHintsRegistrarClasses(testClass, coreRuntimeHintsRegistrarClasses);
-					reflectiveRuntimeHintsRegistrar.registerRuntimeHints(this.runtimeHints, testClass);
-					this.testRuntimeHintsRegistrars.forEach(registrar -> {
-						if (logger.isTraceEnabled()) {
-							logger.trace("Processing RuntimeHints contribution from class [%s]"
-									.formatted(registrar.getClass().getCanonicalName()));
-						}
-						registrar.registerHints(this.runtimeHints, testClass, classLoader);
-					});
-				}
-				else {
-					if (logger.isDebugEnabled()) {
-						logger.debug("Skipping duplicate test class: " + testClassName);
+				MergedContextConfiguration mergedConfig = buildMergedContextConfiguration(testClass);
+				mergedConfigMappings.add(mergedConfig, testClass);
+				collectRuntimeHintsRegistrarClasses(testClass, coreRuntimeHintsRegistrarClasses);
+				reflectiveRuntimeHintsRegistrar.registerRuntimeHints(this.runtimeHints, testClass);
+				this.testRuntimeHintsRegistrars.forEach(registrar -> {
+					if (logger.isTraceEnabled()) {
+						logger.trace("Processing RuntimeHints contribution from class [%s]"
+								.formatted(registrar.getClass().getCanonicalName()));
 					}
-				}
+					registrar.registerHints(this.runtimeHints, testClass, classLoader);
+				});
 			});
 
 			coreRuntimeHintsRegistrarClasses.stream()