Consistently include leading slash for classpath: resources in the TCF

Author: sbrannen

spring-test/src/main/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,6 +98,8 @@
  */
 public class SqlScriptsTestExecutionListener extends AbstractTestExecutionListener {
 
+	private static final String SLASH = "/";
+
 	private static final Log logger = LogFactory.getLog(SqlScriptsTestExecutionListener.class);
 
 
@@ -343,7 +345,7 @@ private String detectDefaultScript(TestContext testContext, boolean classLevel)
 		}
 		resourcePath += ".sql";
 
-		String prefixedResourcePath = ResourceUtils.CLASSPATH_URL_PREFIX + resourcePath;
+		String prefixedResourcePath = ResourceUtils.CLASSPATH_URL_PREFIX + SLASH + resourcePath;
 		ClassPathResource classPathResource = new ClassPathResource(resourcePath);
 
 		if (classPathResource.exists()) {

spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java

@@ -67,6 +67,8 @@
  */
 public abstract class AbstractContextLoader implements SmartContextLoader {
 
+	private static final String SLASH = "/";
+
 	private static final String[] EMPTY_STRING_ARRAY = new String[0];
 
 	private static final Log logger = LogFactory.getLog(AbstractContextLoader.class);
@@ -252,7 +254,7 @@ protected String[] generateDefaultLocations(Class<?> clazz) {
 			String resourcePath = ClassUtils.convertClassNameToResourcePath(clazz.getName()) + suffix;
 			ClassPathResource classPathResource = new ClassPathResource(resourcePath);
 			if (classPathResource.exists()) {
-				String prefixedResourcePath = ResourceUtils.CLASSPATH_URL_PREFIX + resourcePath;
+				String prefixedResourcePath = ResourceUtils.CLASSPATH_URL_PREFIX + SLASH + resourcePath;
 				if (logger.isInfoEnabled()) {
 					logger.info(String.format("Detected default resource location \"%s\" for test class [%s]",
 							prefixedResourcePath, clazz.getName()));

spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceAttributes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,6 +50,8 @@
  */
 class TestPropertySourceAttributes {
 
+	private static final String SLASH = "/";
+
 	private static final Log logger = LogFactory.getLog(TestPropertySourceAttributes.class);
 
 
@@ -156,7 +158,7 @@ private String detectDefaultPropertiesFile(Class<?> testClass) {
 			logger.error(msg);
 			throw new IllegalStateException(msg);
 		}
-		String prefixedResourcePath = ResourceUtils.CLASSPATH_URL_PREFIX + resourcePath;
+		String prefixedResourcePath = ResourceUtils.CLASSPATH_URL_PREFIX + SLASH + resourcePath;
 		if (logger.isInfoEnabled()) {
 			logger.info(String.format("Detected default properties file \"%s\" for test class [%s]",
 					prefixedResourcePath, testClass.getName()));

spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java

@@ -73,7 +73,7 @@ void buildMergedConfigWithBareAnnotations() {
 		assertMergedConfig(
 			mergedConfig,
 			testClass,
-			array("classpath:org/springframework/test/context/support/AbstractContextConfigurationUtilsTests$BareAnnotations-context.xml"),
+			array("classpath:/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests$BareAnnotations-context.xml"),
 			EMPTY_CLASS_ARRAY, DelegatingSmartContextLoader.class);
 	}
 

spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java

@@ -78,7 +78,7 @@ static Stream<Arguments> contextConfigurationLocationsData() {
 			args(ClasspathNonExistentDefaultLocationsTestCase.class, array()),
 
 			args(ClasspathExistentDefaultLocationsTestCase.class, array(
-				"classpath:org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$ClasspathExistentDefaultLocationsTestCase-context.xml")),
+				"classpath:/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests$ClasspathExistentDefaultLocationsTestCase-context.xml")),
 
 			args(ImplicitClasspathLocationsTestCase.class,
 				array("classpath:/org/springframework/test/context/support/context1.xml",