Skip to content

Commit c0d6fac

Browse files
omkreddyijuma
authored andcommitted
MINOR: Remove deprecated assertThat usage from KafkaLog4jAppenderTest (apache#6257)
Replace `Assert.assertThat` with `MatcherAssert.assertThat`. Two commits (08036fa and c7f99bc) were merged at a similar time and they passed the build in isolation, but not together. Reviewers: Rajini Sivaram <[email protected]>, Ismael Juma <[email protected]>
1 parent c7f99bc commit c0d6fac

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

log4j-appender/src/test/java/org/apache/kafka/log4jappender/KafkaLog4jAppenderTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static org.hamcrest.CoreMatchers.equalTo;
2020
import static org.hamcrest.CoreMatchers.hasItem;
2121
import static org.hamcrest.CoreMatchers.not;
22+
import static org.hamcrest.MatcherAssert.assertThat;
2223

2324
import org.apache.kafka.clients.producer.MockProducer;
2425
import org.apache.kafka.clients.producer.RecordMetadata;
@@ -89,9 +90,9 @@ public void testSetSaslMechanism() {
8990
PropertyConfigurator.configure(props);
9091

9192
MockKafkaLog4jAppender mockKafkaLog4jAppender = getMockKafkaLog4jAppender();
92-
Assert.assertThat(
93-
mockKafkaLog4jAppender.getProducerProperties().getProperty(SaslConfigs.SASL_MECHANISM),
94-
equalTo("PLAIN"));
93+
assertThat(
94+
mockKafkaLog4jAppender.getProducerProperties().getProperty(SaslConfigs.SASL_MECHANISM),
95+
equalTo("PLAIN"));
9596
}
9697

9798
@Test
@@ -106,9 +107,9 @@ public void testSetJaasConfig() {
106107
PropertyConfigurator.configure(props);
107108

108109
MockKafkaLog4jAppender mockKafkaLog4jAppender = getMockKafkaLog4jAppender();
109-
Assert.assertThat(
110-
mockKafkaLog4jAppender.getProducerProperties().getProperty(SaslConfigs.SASL_JAAS_CONFIG),
111-
equalTo("jaas-config"));
110+
assertThat(
111+
mockKafkaLog4jAppender.getProducerProperties().getProperty(SaslConfigs.SASL_JAAS_CONFIG),
112+
equalTo("jaas-config"));
112113
}
113114

114115
@Test
@@ -119,7 +120,7 @@ public void testJaasConfigNotSet() {
119120
private void testProducerPropertyNotSet(String name) {
120121
PropertyConfigurator.configure(getLog4jConfig(false));
121122
MockKafkaLog4jAppender mockKafkaLog4jAppender = getMockKafkaLog4jAppender();
122-
Assert.assertThat(mockKafkaLog4jAppender.getProducerProperties().stringPropertyNames(), not(hasItem(name)));
123+
assertThat(mockKafkaLog4jAppender.getProducerProperties().stringPropertyNames(), not(hasItem(name)));
123124
}
124125

125126
@Test

0 commit comments

Comments
 (0)