From 1536f34fff25c1a8f7d9c7504e45e1c29d1eeee2 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Mon, 3 Jun 2024 14:40:13 +0200 Subject: [PATCH] Fix broken tests --- .../convention/FailingTestBeanInheritanceIntegrationTests.java | 2 +- .../override/convention/TestBeanOverrideProcessorTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/FailingTestBeanInheritanceIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/FailingTestBeanInheritanceIntegrationTests.java index 701ed3a372..b02ced0a63 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/FailingTestBeanInheritanceIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/FailingTestBeanInheritanceIntegrationTests.java @@ -58,7 +58,7 @@ class FailingTestBeanInheritanceIntegrationTests { message(""" Found 2 competing static test bean factory methods in %s with return type %s \ whose name matches one of the supported candidates \ - [thirdBeanTestOverride, anotherBeanTestOverride]""" + [anotherBeanTestOverride, thirdBeanTestOverride]""" .formatted(testClass.getName(), AbstractTestBeanIntegrationTestCase.Pojo.class.getName()))))); } diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideProcessorTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideProcessorTests.java index d9d2bb1c79..90f45c4f1c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideProcessorTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideProcessorTests.java @@ -129,7 +129,7 @@ class TestBeanOverrideProcessorTests { .withMessage(""" Failed to find a static test bean factory method in %s with return type %s \ whose name matches one of the supported candidates %s""", - clazz.getName(), returnType.getName(), List.of("someFieldTestOverride", "fieldTestOverride")); + clazz.getName(), returnType.getName(), List.of("fieldTestOverride", "someFieldTestOverride")); } @Test