Fix Test for Latest Spring Framework 6.0

garyrussell · garyrussell · commit 38103d6950a5 · 2022-07-19T12:43:39.000-04:00
Nested runtime exception messages no longer include causes.
diff --git a/build.gradle b/build.gradle
@@ -64,7 +64,7 @@ ext {
 	reactorVersion = '2020.0.18'
 	snappyVersion = '1.1.8.4'
 	springDataVersion = '2022.0.0-M3'
-	springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M4'
+	springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
 	springRetryVersion = '1.3.3'
 	zstdJniVersion = '1.5.0-2'
 }
diff --git a/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitMessagingTemplateTests.java b/spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitMessagingTemplateTests.java
@@ -211,7 +211,7 @@ protected org.springframework.amqp.core.Message createMessage(Object object,
 
 		assertThatThrownBy(() -> messagingTemplate.convertAndSend("myQueue", "msg to convert"))
 			.isExactlyInstanceOf(org.springframework.messaging.converter.MessageConversionException.class)
-			.hasMessageContaining("Test exception");
+			.hasStackTraceContaining("Test exception");
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ ext {`
`64`	`64`	`reactorVersion = '2020.0.18'`
`65`	`65`	`snappyVersion = '1.1.8.4'`
`66`	`66`	`springDataVersion = '2022.0.0-M3'`
`67`		`- springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M4'`
	`67`	`+ springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'`
`68`	`68`	`springRetryVersion = '1.3.3'`
`69`	`69`	`zstdJniVersion = '1.5.0-2'`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ protected org.springframework.amqp.core.Message createMessage(Object object,`
`211`	`211`
`212`	`212`	`assertThatThrownBy(() -> messagingTemplate.convertAndSend("myQueue", "msg to convert"))`
`213`	`213`	`.isExactlyInstanceOf(org.springframework.messaging.converter.MessageConversionException.class)`
`214`		`- .hasMessageContaining("Test exception");`
	`214`	`+ .hasStackTraceContaining("Test exception");`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`@Test`