SpringCloud/spring-cloud-connectors
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix RabbitMQ spring connector tests when run against RabbitMQ client 5.4.x.

Browse Source
This commit is contained in:
Scott Frederick
2018-09-10 12:27:35 -05:00
parent 3753bf6f20
commit 06cb0c5063
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@@ -175,7 +175,8 @@ ext {
"jedis29-redis20" : [jedisVersion: "2.9.0", springDataRedisVersion: "2.0.0.RELEASE"],
"lettuce5-redis20" : [lettuceVersion: "5.0.0.RELEASE", springDataRedisVersion: "2.0.0.RELEASE"],
"driver330-cass20" : [cassandraDriverVersion: "3.3.0", springDataCassandraVersion: "2.0.0.RELEASE"],
"amqp20" : [springAmqpVersion: "2.0.0.RELEASE"],
"amqp200" : [springAmqpVersion: "2.0.0.RELEASE"],
"amqp205-rabbit541" : [springAmqpVersion: "2.0.5.RELEASE", "rabbitClientVersion": "5.4.1"],
"spring50" : [springVersion: "5.0.0.RELEASE"],
"tomcat85" : [tomcatVersion: "8.5.13"],
]

2
spring-cloud-spring-service-connector/build.gradle
View File

@@ -5,6 +5,7 @@ ext {
tomcatVersion = "8.5.13"
springAmqpVersion = "2.0.0.RELEASE"
rabbitClientVersion = "5.0.0"
springDataMongoVersion = "2.0.0.RELEASE"
mongoDriverVersion = "3.4.2"
@@ -50,6 +51,7 @@ dependencies {
optional("com.zaxxer:HikariCP:${hikariCpVersion}")
optional("org.springframework.amqp:spring-rabbit:$springAmqpVersion")
optional("com.rabbitmq:amqp-client:$rabbitClientVersion")
optional("org.springframework.data:spring-data-redis:$springDataRedisVersion") {
exclude(group: 'org.springframework', module: 'spring-context-support')

4
spring-cloud-spring-service-connector/src/test/java/org/springframework/cloud/service/rabbit/RabbitConnectionFactoryCreatorTest.java
View File

@@ -76,8 +76,8 @@ public class RabbitConnectionFactoryCreatorTest {
com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory =
(com.rabbitmq.client.ConnectionFactory) ReflectionTestUtils.getField(connector, "rabbitConnectionFactory");
String[] userInfo = uri.getRawUserInfo().split(":");
assertEquals(userInfo[0], ReflectionTestUtils.getField(rabbitConnectionFactory, "username"));
assertEquals(userInfo[1], ReflectionTestUtils.getField(rabbitConnectionFactory, "password"));
assertEquals(userInfo[0], rabbitConnectionFactory.getUsername());
assertEquals(userInfo[1], rabbitConnectionFactory.getPassword());
assertTrue(uri.getPath().endsWith(connector.getVirtualHost()));
}