Skip to content

Commit 586fa83

Browse files
committed
Fix AssertJ conflicts in new Appender tests
1 parent 98cb7a1 commit 586fa83

File tree

2 files changed

+47
-29
lines changed

2 files changed

+47
-29
lines changed

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/log4j2/AmqpAppenderTests.java

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
import com.rabbitmq.client.ConnectionFactory;
6565
import com.rabbitmq.client.DefaultSaslConfig;
6666
import com.rabbitmq.client.JDKSaslConfig;
67+
import com.rabbitmq.client.SaslConfig;
6768
import com.rabbitmq.client.impl.CRDemoMechanism;
6869

6970
/**
@@ -196,26 +197,34 @@ public void testSaslConfig() {
196197
Logger logger = LogManager.getLogger("sasl");
197198
AmqpAppender appender = (AmqpAppender) TestUtils.getPropertyValue(logger, "context.configuration.appenders",
198199
Map.class).get("sasl1");
199-
assertThat(TestUtils.getPropertyValue(appender, "manager.connectionFactory.rabbitConnectionFactory",
200-
ConnectionFactory.class).getSaslConfig())
201-
.isInstanceOf(DefaultSaslConfig.class)
202-
.hasFieldOrPropertyWithValue("mechanism", "PLAIN");
200+
SaslConfig saslConfig =
201+
TestUtils.getPropertyValue(appender, "manager.connectionFactory.rabbitConnectionFactory",
202+
ConnectionFactory.class)
203+
.getSaslConfig();
204+
assertThat(saslConfig, instanceOf(DefaultSaslConfig.class));
205+
assertEquals("PLAIN", TestUtils.getPropertyValue(saslConfig, "mechanism"));
203206
appender = (AmqpAppender) TestUtils.getPropertyValue(logger, "context.configuration.appenders",
204207
Map.class).get("sasl2");
205-
assertThat(TestUtils.getPropertyValue(appender, "manager.connectionFactory.rabbitConnectionFactory",
206-
ConnectionFactory.class).getSaslConfig())
207-
.isInstanceOf(DefaultSaslConfig.class)
208-
.hasFieldOrPropertyWithValue("mechanism", "EXTERNAL");
208+
saslConfig =
209+
TestUtils.getPropertyValue(appender, "manager.connectionFactory.rabbitConnectionFactory",
210+
ConnectionFactory.class)
211+
.getSaslConfig();
212+
assertThat(saslConfig, instanceOf(DefaultSaslConfig.class));
213+
assertEquals("EXTERNAL", TestUtils.getPropertyValue(saslConfig, "mechanism"));
209214
appender = (AmqpAppender) TestUtils.getPropertyValue(logger, "context.configuration.appenders",
210215
Map.class).get("sasl3");
211-
assertThat(TestUtils.getPropertyValue(appender, "manager.connectionFactory.rabbitConnectionFactory",
212-
ConnectionFactory.class).getSaslConfig())
213-
.isInstanceOf(JDKSaslConfig.class);
216+
saslConfig =
217+
TestUtils.getPropertyValue(appender, "manager.connectionFactory.rabbitConnectionFactory",
218+
ConnectionFactory.class)
219+
.getSaslConfig();
220+
assertThat(saslConfig, instanceOf(JDKSaslConfig.class));
214221
appender = (AmqpAppender) TestUtils.getPropertyValue(logger, "context.configuration.appenders",
215222
Map.class).get("sasl4");
216-
assertThat(TestUtils.getPropertyValue(appender, "manager.connectionFactory.rabbitConnectionFactory",
217-
ConnectionFactory.class).getSaslConfig())
218-
.isInstanceOf(CRDemoMechanism.CRDemoSaslConfig.class);
223+
saslConfig =
224+
TestUtils.getPropertyValue(appender, "manager.connectionFactory.rabbitConnectionFactory",
225+
ConnectionFactory.class)
226+
.getSaslConfig();
227+
assertThat(saslConfig, instanceOf(CRDemoMechanism.CRDemoSaslConfig.class));
219228
}
220229

221230
@Test

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/logback/AmqpAppenderTests.java

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@
1616

1717
package org.springframework.amqp.rabbit.logback;
1818

19+
import static org.hamcrest.Matchers.containsString;
20+
import static org.hamcrest.Matchers.instanceOf;
21+
import static org.junit.Assert.assertEquals;
1922
import static org.junit.Assert.assertFalse;
20-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
23+
import static org.junit.Assert.assertThat;
2124
import static org.mockito.ArgumentMatchers.any;
2225
import static org.mockito.ArgumentMatchers.anyBoolean;
2326
import static org.mockito.ArgumentMatchers.anyString;
@@ -35,6 +38,7 @@
3538

3639
import org.springframework.amqp.UncategorizedAmqpException;
3740
import org.springframework.amqp.rabbit.connection.RabbitConnectionFactoryBean;
41+
import org.springframework.amqp.utils.test.TestUtils;
3842
import org.springframework.core.io.ClassPathResource;
3943
import org.springframework.test.util.ReflectionTestUtils;
4044

@@ -47,6 +51,7 @@
4751
*
4852
* @author Stephen Oakey
4953
* @author Artem Bilan
54+
* @author Gary Russell
5055
*
5156
* @since 2.0
5257
*/
@@ -214,30 +219,34 @@ public void testSasl() {
214219
verify(bean).setUseSSL(eq(true));
215220
ArgumentCaptor<SaslConfig> captor = ArgumentCaptor.forClass(SaslConfig.class);
216221
verify(bean).setSaslConfig(captor.capture());
217-
assertThat(captor.getValue())
218-
.isInstanceOf(DefaultSaslConfig.class)
219-
.hasFieldOrPropertyWithValue("mechanism", "PLAIN");
222+
SaslConfig saslConfig = captor.getValue();
223+
assertThat(saslConfig, instanceOf(DefaultSaslConfig.class));
224+
assertEquals("PLAIN", TestUtils.getPropertyValue(saslConfig, "mechanism"));
220225
appender.setSaslConfig("DefaultSaslConfig.EXTERNAL");
221226
appender.configureRabbitConnectionFactory(bean);
222227
verify(bean, times(2)).setSaslConfig(captor.capture());
223-
assertThat(captor.getValue())
224-
.isInstanceOf(DefaultSaslConfig.class)
225-
.hasFieldOrPropertyWithValue("mechanism", "EXTERNAL");
228+
saslConfig = captor.getValue();
229+
assertThat(saslConfig, instanceOf(DefaultSaslConfig.class));
230+
assertEquals("EXTERNAL", TestUtils.getPropertyValue(saslConfig, "mechanism"));
226231
appender.setSaslConfig("JDKSaslConfig");
227232
appender.configureRabbitConnectionFactory(bean);
228233
verify(bean, times(3)).setSaslConfig(captor.capture());
229-
assertThat(captor.getValue())
230-
.isInstanceOf(JDKSaslConfig.class);
234+
assertThat(captor.getValue(), instanceOf(JDKSaslConfig.class));
231235
appender.setSaslConfig("CRDemoSaslConfig");
232236
appender.configureRabbitConnectionFactory(bean);
233237
verify(bean, times(4)).setSaslConfig(captor.capture());
234-
assertThat(captor.getValue())
235-
.isInstanceOf(CRDemoMechanism.CRDemoSaslConfig.class);
238+
assertThat(captor.getValue(), instanceOf(CRDemoMechanism.CRDemoSaslConfig.class));
236239
appender.setSaslConfig("junk");
237-
assertThatThrownBy(() -> appender.configureRabbitConnectionFactory(bean))
238-
.isInstanceOf(UncategorizedAmqpException.class)
239-
.hasCauseInstanceOf(IllegalStateException.class)
240-
.withFailMessage("Unrecognized SaslConfig: junk");
240+
241+
242+
try {
243+
appender.configureRabbitConnectionFactory(bean);
244+
}
245+
catch (Exception e) {
246+
assertThat(e, instanceOf(UncategorizedAmqpException.class));
247+
assertThat(e.getCause(), instanceOf(IllegalStateException.class));
248+
assertThat(e.getMessage(), containsString("Unrecognized SaslConfig: junk"));
249+
}
241250
}
242251

243252

0 commit comments

Comments
 (0)