Merge branch '6.2.x'

sbrannen · sbrannen · commit a09f454dfc67 · 2025-02-07T18:27:34.000+01:00
diff --git a/spring-test/src/test/java/org/springframework/test/mockito/MockitoAssertions.java b/spring-test/src/test/java/org/springframework/test/mockito/MockitoAssertions.java
@@ -42,7 +42,7 @@ public static void assertIsNotMock(Object obj) {
 	}
 
 	public static void assertIsNotMock(Object obj, String message) {
-		assertThat(isSpy(obj)).as("%s is a Mockito mock", message).isFalse();
+		assertThat(isMock(obj)).as("%s is a Mockito mock", message).isFalse();
 	}
 
 	public static void assertIsSpy(Object obj) {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static void assertIsNotMock(Object obj) {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public static void assertIsNotMock(Object obj, String message) {`
`45`		`- assertThat(isSpy(obj)).as("%s is a Mockito mock", message).isFalse();`
	`45`	`+ assertThat(isMock(obj)).as("%s is a Mockito mock", message).isFalse();`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public static void assertIsSpy(Object obj) {`