Merge branch '7.0.x'

Author: sbrannen

spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java

@@ -74,7 +74,12 @@ void findBridgedMethodInHierarchy() throws Exception {
 		assertThat(bridgedMethod.isBridge()).isFalse();
 		assertThat(bridgedMethod.getName()).isEqualTo("add");
 		assertThat(bridgedMethod.getParameterCount()).isEqualTo(1);
-		assertThat(bridgedMethod.getParameterTypes()[0]).isEqualTo(Date.class);
+		if (IdeUtils.runningInEclipse()) {
+			assertThat(bridgedMethod.getParameterTypes()).containsOnly(Serializable.class);
+		}
+		else {
+			assertThat(bridgedMethod.getParameterTypes()).containsOnly(Date.class);
+		}
 	}
 
 	@Test
@@ -490,10 +495,12 @@ interface InterfaceMethods<T> {
 
 	interface DefaultMethods extends InterfaceMethods<Integer> {
 
+		@Override
 		default Integer getValue() {
 			return 0;
 		}
 
+		@Override
 		default Integer[] getValues() {
 			return new Integer[0];
 		}

spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java

@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.expression.ConstructorResolver;
@@ -41,6 +42,11 @@
  */
 class ConstructorInvocationTests extends AbstractExpressionTests {
 
+	@BeforeEach
+	void resetCounter() {
+		Tester.counter = 0;
+	}
+
 	@Test
 	void constructorWithArgument() {
 		evaluate("new String('hello world')", "hello world", String.class);

spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java

@@ -2967,6 +2967,7 @@ void opEq() {
 		assertThat((Boolean) expression.getValue(tvar)).isFalse();
 
 		TestClass7 tc7 = new TestClass7();
+		TestClass7.reset();
 		expression = parse("property == 'UK'");
 		assertThat((Boolean) expression.getValue(tc7)).isTrue();
 		TestClass7.property = null;

spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java

@@ -38,6 +38,7 @@
 
 import org.assertj.core.api.InstanceOfAssertFactories;
 import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.MethodParameter;
@@ -85,6 +86,12 @@ class SpelReproTests extends AbstractExpressionTests {
 	private static final ParserContext DOLLARSQUARE_TEMPLATE_PARSER_CONTEXT = new TemplateParserContext("$[", "]");
 
 
+	@BeforeEach
+	void resetGoo() {
+		Goo.reset();
+	}
+
+
 	@Test
 	void NPE_SPR5661() {
 		evaluate("joinThreeStrings('a',null,'c')", "anullc", String.class);
@@ -1879,7 +1886,11 @@ public void setPayload(String payload) {
 
 	static class Goo {
 
-		public static Goo instance = new Goo();
+		public static Goo instance;
+
+		static void reset() {
+			instance = new Goo();
+		}
 
 		public String bar = "key";
 

spring-test/src/test/java/org/springframework/test/util/MethodAssertTests.java

@@ -65,7 +65,7 @@ void hasDeclaringClass() {
 	}
 
 	@Test
-	void haDeclaringClassWithWrongClass() {
+	void hasDeclaringClassWithWrongClass() {
 		Method method = ReflectionUtils.findMethod(TestData.class, "counter");
 		assertThatExceptionOfType(AssertionError.class)
 				.isThrownBy(() -> assertThat(method).hasDeclaringClass(Method.class))