Merge branch '1.4.x' into 1.5.x

spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerTests.java

@@ -18,6 +18,7 @@ package org.springframework.boot.test.context;
 
 import kotlin.Metadata;
 import org.junit.Test;
+import org.spockframework.runtime.model.SpecMetadata;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -35,6 +36,13 @@ public class ImportsContextCustomizerTests {
 						SecondKotlinAnnotatedTestClass.class));
 	}
 
+	@Test
+	public void customizersForTestClassesWithDifferentSpockMetadataAreEqual() {
+		assertThat(new ImportsContextCustomizer(FirstSpockAnnotatedTestClass.class))
+				.isEqualTo(new ImportsContextCustomizer(
+						SecondSpockAnnotatedTestClass.class));
+	}
+
 	@Metadata(d2 = "foo")
 	static class FirstKotlinAnnotatedTestClass {
 
@@ -45,4 +53,14 @@ public class ImportsContextCustomizerTests {
 
 	}
 
+	@SpecMetadata(filename = "foo", line = 10)
+	static class FirstSpockAnnotatedTestClass {
+
+	}
+
+	@SpecMetadata(filename = "bar", line = 10)
+	static class SecondSpockAnnotatedTestClass {
+
+	}
+
 }