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]>
amcrn · Feb 12, 2019 · c0d6fac · c0d6fac
1 parent c7f99bc
commit c0d6fac
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/log4j-appender/src/test/java/org/apache/kafka/log4jappender/KafkaLog4jAppenderTest.java b/log4j-appender/src/test/java/org/apache/kafka/log4jappender/KafkaLog4jAppenderTest.java
@@ -19,6 +19,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.apache.kafka.clients.producer.MockProducer;
 import org.apache.kafka.clients.producer.RecordMetadata;
@@ -89,9 +90,9 @@ public void testSetSaslMechanism() {
         PropertyConfigurator.configure(props);
 
         MockKafkaLog4jAppender mockKafkaLog4jAppender = getMockKafkaLog4jAppender();
-        Assert.assertThat(
-            mockKafkaLog4jAppender.getProducerProperties().getProperty(SaslConfigs.SASL_MECHANISM),
-            equalTo("PLAIN"));
+        assertThat(
+                mockKafkaLog4jAppender.getProducerProperties().getProperty(SaslConfigs.SASL_MECHANISM),
+                equalTo("PLAIN"));
     }
 
     @Test
@@ -106,9 +107,9 @@ public void testSetJaasConfig() {
         PropertyConfigurator.configure(props);
 
         MockKafkaLog4jAppender mockKafkaLog4jAppender = getMockKafkaLog4jAppender();
-        Assert.assertThat(
-            mockKafkaLog4jAppender.getProducerProperties().getProperty(SaslConfigs.SASL_JAAS_CONFIG),
-            equalTo("jaas-config"));
+        assertThat(
+                mockKafkaLog4jAppender.getProducerProperties().getProperty(SaslConfigs.SASL_JAAS_CONFIG),
+                equalTo("jaas-config"));
     }
 
     @Test
@@ -119,7 +120,7 @@ public void testJaasConfigNotSet() {
     private void testProducerPropertyNotSet(String name) {
         PropertyConfigurator.configure(getLog4jConfig(false));
         MockKafkaLog4jAppender mockKafkaLog4jAppender = getMockKafkaLog4jAppender();
-        Assert.assertThat(mockKafkaLog4jAppender.getProducerProperties().stringPropertyNames(), not(hasItem(name)));
+        assertThat(mockKafkaLog4jAppender.getProducerProperties().stringPropertyNames(), not(hasItem(name)));
     }
 
     @Test