Spring/spring-amqp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Work Around HOP/REST Incompatibility in Test

Browse Source
This commit is contained in:
Gary Russell
2022-05-16 11:03:40 -04:00
parent 1ebde8eceb
commit 58d4e72d92
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/StatelessRetryOperationsInterceptorFactoryBean.java
View File

@@ -67,6 +67,7 @@ public class StatelessRetryOperationsInterceptorFactoryBean extends AbstractRetr
return this::recover;
}
@SuppressWarnings("unchecked")
protected Object recover(Object[] args, Throwable cause) {
MessageRecoverer messageRecoverer = getMessageRecoverer();
Object arg = args[1];

10
spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitRestApiTests.java
View File

@@ -17,8 +17,10 @@
package org.springframework.amqp.rabbit.core;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.awaitility.Awaitility.await;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.util.Collections;
@@ -29,6 +31,7 @@ import java.util.UUID;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.springframework.amqp.AmqpException;
import org.springframework.amqp.core.Binding;
import org.springframework.amqp.core.BindingBuilder;
import org.springframework.amqp.core.DirectExchange;
@@ -217,7 +220,12 @@ public class RabbitRestApiTests {
assertThat(exchangeToAssert.getName()).isEqualTo(testExchange.getName());
assertThat(exchangeToAssert.getType()).isEqualTo(testExchange.getType());
this.rabbitRestClient.deleteExchange("/", testExchange.getName());
assertThat(this.rabbitRestClient.getExchange("/", exchangeName)).isNull();
// 6.0.0 REST compatibility
// assertThat(this.rabbitRestClient.getExchange("/", exchangeName)).isNull();
RabbitTemplate template = new RabbitTemplate(this.connectionFactory);
assertThatExceptionOfType(AmqpException.class)
.isThrownBy(() -> template.execute(channel -> channel.exchangeDeclarePassive(exchangeName)))
.withCauseExactlyInstanceOf(IOException.class);
}
}