Skip to content

Commit 099c9b3

Browse files
CrimCrim
authored
Fix deprecation warnings in tests (#123)
* Fix deprecation warnings in tests * add additional poll time
1 parent 466a3ed commit 099c9b3

File tree

7 files changed

+43
-37
lines changed

7 files changed

+43
-37
lines changed

‎kafka-webview-ui/src/test/java/org/sourcelab/kafka/webview/ui/controller/api/ApiControllerTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.apache.kafka.clients.admin.AdminClient;
2929
import org.apache.kafka.clients.admin.ConsumerGroupListing;
3030
import org.apache.kafka.clients.admin.ListConsumerGroupsResult;
31+
import org.apache.kafka.clients.consumer.ConsumerConfig;
3132
import org.apache.kafka.clients.consumer.KafkaConsumer;
3233
import org.apache.kafka.common.serialization.StringDeserializer;
3334
import org.junit.ClassRule;
@@ -44,6 +45,7 @@
4445
import org.springframework.test.web.servlet.MvcResult;
4546
import org.springframework.transaction.annotation.Transactional;
4647

48+
import java.time.Duration;
4749
import java.util.Collection;
4850
import java.util.Collections;
4951
import java.util.Optional;
@@ -461,6 +463,7 @@ public void test_specificConsumerOffsetsWithTailOffsets() throws Exception {
461463
* @return Consumer group id created.
462464
*/
463465
private String createConsumerWithState() {
466+
final int totalRecords = 10;
464467
final String consumerId = "test-consumer-id-" + System.currentTimeMillis();
465468

466469
// Define our new topic name
@@ -472,20 +475,20 @@ private String createConsumerWithState() {
472475
// Publish records into topic
473476
sharedKafkaTestResource
474477
.getKafkaTestUtils()
475-
.produceRecords(10, newTopic, 0);
478+
.produceRecords(totalRecords, newTopic, 0);
476479

477480
// Create a consumer and consume from the records, maintaining state.
478481
final Properties consumerProperties = new Properties();
479-
consumerProperties.put("client.id", consumerId);
480-
consumerProperties.put("group.id", consumerId);
482+
consumerProperties.put(ConsumerConfig.CLIENT_ID_CONFIG, consumerId);
483+
consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, consumerId);
481484

482485
try (final KafkaConsumer consumer = sharedKafkaTestResource
483486
.getKafkaTestUtils()
484487
.getKafkaConsumer(StringDeserializer.class, StringDeserializer.class, consumerProperties)) {
485488

486489
// Consume
487490
consumer.subscribe(Collections.singleton(newTopic));
488-
consumer.poll(2000L);
491+
consumer.poll(Duration.ofSeconds(5));
489492

490493
// Save state.
491494
consumer.commitSync();

‎kafka-webview-ui/src/test/java/org/sourcelab/kafka/webview/ui/controller/configuration/messageformat/MessageFormatControllerTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
import static org.junit.Assert.assertTrue;
5959
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
6060
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
61-
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.fileUpload;
6261
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
62+
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart;
6363
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
6464
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
6565
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@@ -159,7 +159,7 @@ public void testPostUpdate_newMessageFormat() throws Exception {
159159

160160
// Hit index.
161161
mockMvc
162-
.perform(fileUpload("/configuration/messageFormat/update")
162+
.perform(multipart("/configuration/messageFormat/update")
163163
.file(jarUpload)
164164
.with(user(adminUserDetails))
165165
.with(csrf())
@@ -207,7 +207,7 @@ public void testPostUpdate_createNewMessageFormatMissingFile() throws Exception
207207

208208
// Hit page.
209209
mockMvc
210-
.perform(fileUpload("/configuration/messageFormat/update")
210+
.perform(multipart("/configuration/messageFormat/update")
211211
.file(jarUpload)
212212
.with(user(adminUserDetails))
213213
.with(csrf())
@@ -237,7 +237,7 @@ public void testPostUpdate_createNewMessageFormatInvalidJar() throws Exception {
237237

238238
// Hit page.
239239
mockMvc
240-
.perform(fileUpload("/configuration/messageFormat/update")
240+
.perform(multipart("/configuration/messageFormat/update")
241241
.file(jarUpload)
242242
.with(user(adminUserDetails))
243243
.with(csrf())
@@ -268,7 +268,7 @@ public void testPostUpdate_updatingExistingButWithBadMessageFormatId() throws Ex
268268

269269
// Hit page.
270270
final MvcResult result = mockMvc
271-
.perform(fileUpload("/configuration/messageFormat/update")
271+
.perform(multipart("/configuration/messageFormat/update")
272272
.file(jarUpload)
273273
.with(user(adminUserDetails))
274274
.with(csrf())
@@ -314,7 +314,7 @@ public void testPostUpdate_updatingExistingButWithInvalidJar() throws Exception
314314

315315
// Hit page.
316316
mockMvc
317-
.perform(fileUpload("/configuration/messageFormat/update")
317+
.perform(multipart("/configuration/messageFormat/update")
318318
.file(jarUpload)
319319
.with(user(adminUserDetails))
320320
.with(csrf())
@@ -373,7 +373,7 @@ public void testPostUpdate_updatingExistingNoJarUploaded() throws Exception {
373373

374374
// Hit page.
375375
mockMvc
376-
.perform(fileUpload("/configuration/messageFormat/update")
376+
.perform(multipart("/configuration/messageFormat/update")
377377
.file(jarUpload)
378378
.with(user(adminUserDetails))
379379
.with(csrf())
@@ -437,7 +437,7 @@ public void testPostUpdate_updatingExistingWithValidJarSameName() throws Excepti
437437

438438
// Hit page.
439439
mockMvc
440-
.perform(fileUpload("/configuration/messageFormat/update")
440+
.perform(multipart("/configuration/messageFormat/update")
441441
.file(jarUpload)
442442
.with(user(adminUserDetails))
443443
.with(csrf())

‎kafka-webview-ui/src/test/java/org/sourcelab/kafka/webview/ui/manager/kafka/AbstractKafkaClusterTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.sourcelab.kafka.webview.ui.manager.kafka.dto.NodeList;
4343
import org.sourcelab.kafka.webview.ui.model.Cluster;
4444

45+
import java.time.Duration;
4546
import java.util.ArrayList;
4647
import java.util.Collection;
4748
import java.util.Map;
@@ -177,11 +178,11 @@ public void testBasicConsumeWithSaslAuthentication() {
177178
final KafkaConsumerFactory kafkaConsumerFactory = buildKafkaConsumerFactory();
178179
try (final KafkaConsumer<String, String> consumer = kafkaConsumerFactory.createConsumerAndSubscribe(clientConfig)) {
179180
// Attempt to consume, should pull first 10
180-
ConsumerRecords<String, String> records = consumer.poll(2000L);
181+
ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(2));
181182
assertEquals("Should have 10 records", maxRecordsPerPoll, records.count());
182183

183184
// Attempt to consume, should pull 2nd 10
184-
records = consumer.poll(2000L);
185+
records = consumer.poll(Duration.ofSeconds(2));
185186
assertEquals("Should have 10 records", maxRecordsPerPoll, records.count());
186187
}
187188
}

‎kafka-webview-ui/src/test/java/org/sourcelab/kafka/webview/ui/manager/kafka/KafkaConsumerFactoryTest.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.sourcelab.kafka.webview.ui.manager.socket.StartingPosition;
4444
import org.sourcelab.kafka.webview.ui.plugin.filter.RecordFilter;
4545

46+
import java.time.Duration;
4647
import java.util.HashMap;
4748
import java.util.Map;
4849

@@ -113,11 +114,11 @@ public void testBasicConsumerMultiplePartitions() {
113114
// Create consumer
114115
try (final KafkaConsumer<String, String> consumer = kafkaConsumerFactory.createConsumerAndSubscribe(clientConfig)) {
115116
// Attempt to consume, should pull first 10
116-
ConsumerRecords<String, String> records = consumer.poll(2000L);
117+
ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(2));
117118
assertEquals("Should have found " + maxRecordsPerPoll + " records", maxRecordsPerPoll, records.count());
118119

119120
// Attempt to consume, should pull 2nd 10
120-
records = consumer.poll(2000L);
121+
records = consumer.poll(Duration.ofSeconds(2));
121122
assertEquals("Should have found " + maxRecordsPerPoll + " records", maxRecordsPerPoll, records.count());
122123
}
123124
}
@@ -171,15 +172,15 @@ public void testBasicConsumerExcludePartitions() {
171172
// Create consumer
172173
try (final KafkaConsumer<String, String> consumer = kafkaConsumerFactory.createConsumerAndSubscribe(clientConfig)) {
173174
// Attempt to consume, should pull first 10
174-
ConsumerRecords<String, String> records = consumer.poll(2000L);
175+
ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(2));
175176
assertEquals("Should have found " + maxRecordsPerPoll + " records", maxRecordsPerPoll, records.count());
176177

177178
for (final ConsumerRecord<String, String> record: records) {
178179
assertEquals("Should be from parittion 1 only", 1, record.partition());
179180
}
180181

181182
// Attempt to consume, should come up empty
182-
records = consumer.poll(2000L);
183+
records = consumer.poll(Duration.ofSeconds(2));
183184
assertTrue("Should be empty", records.isEmpty());
184185
}
185186
}
@@ -188,7 +189,7 @@ public void testBasicConsumerExcludePartitions() {
188189
* Simple Smoke Test, using RecordFilter to filter everything from partition 0.
189190
*/
190191
@Test
191-
public void testBasicConsumerWithRecordFilter() throws InterruptedException {
192+
public void testBasicConsumerWithRecordFilter() {
192193
final int maxRecordsPerPoll = 10;
193194

194195
// Create a topic with 2 partitions, (partitionId 0, 1)
@@ -238,15 +239,15 @@ public void testBasicConsumerWithRecordFilter() throws InterruptedException {
238239
// Create consumer
239240
try (final KafkaConsumer<String, String> consumer = kafkaConsumerFactory.createConsumerAndSubscribe(clientConfig)) {
240241
// Attempt to consume, should pull first 10
241-
ConsumerRecords<String, String> records = consumer.poll(10000L);
242+
ConsumerRecords<String, String> records = consumer.poll(Duration.ofSeconds(10));
242243
assertEquals("Should have found " + maxRecordsPerPoll + " records", maxRecordsPerPoll, records.count());
243244

244245
for (final ConsumerRecord<String, String> record: records) {
245246
assertEquals("Should be from parittion 1 only", 1, record.partition());
246247
}
247248

248249
// Attempt to consume, should come up empty
249-
records = consumer.poll(2000L);
250+
records = consumer.poll(Duration.ofSeconds(2));
250251
assertTrue("Should be empty", records.isEmpty());
251252
}
252253
}
@@ -256,7 +257,7 @@ public void testBasicConsumerWithRecordFilter() throws InterruptedException {
256257
* We should get no results.
257258
*/
258259
@Test
259-
public void testDeserializerOptions() throws InterruptedException {
260+
public void testDeserializerOptions() {
260261
// Reset state on our Test Deserializer
261262
TestDeserializer.reset();
262263

‎kafka-webview-ui/src/test/java/org/sourcelab/kafka/webview/ui/manager/kafka/filter/RecordFilterInterceptorTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040

4141
import static org.junit.Assert.assertEquals;
4242
import static org.junit.Assert.assertNotEquals;
43-
import static org.mockito.Matchers.anyLong;
44-
import static org.mockito.Matchers.anyObject;
45-
import static org.mockito.Matchers.eq;
43+
import static org.mockito.ArgumentMatchers.any;
44+
import static org.mockito.ArgumentMatchers.anyLong;
45+
import static org.mockito.ArgumentMatchers.eq;
4646
import static org.mockito.Mockito.mock;
4747
import static org.mockito.Mockito.times;
4848
import static org.mockito.Mockito.verify;
@@ -104,8 +104,8 @@ public void testPassThrough() {
104104
final RecordFilter mockFilter1 = mock(RecordFilter.class);
105105
final RecordFilter mockFilter2 = mock(RecordFilter.class);
106106

107-
when(mockFilter1.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject())).thenReturn(true);
108-
when(mockFilter2.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject())).thenReturn(true);
107+
when(mockFilter1.includeRecord(eq("MyTopic"), eq(0), anyLong(), any(), any())).thenReturn(true);
108+
when(mockFilter2.includeRecord(eq("MyTopic"), eq(0), anyLong(), any(), any())).thenReturn(true);
109109

110110
final RecordFilterDefinition recordFilterDefinition1 = new RecordFilterDefinition(mockFilter1, new HashMap<>());
111111
final RecordFilterDefinition recordFilterDefinition2 = new RecordFilterDefinition(mockFilter2, new HashMap<>());
@@ -131,9 +131,9 @@ public void testPassThrough() {
131131

132132
// Verify mocks
133133
verify(mockFilter1, times(totalRecords))
134-
.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject());
134+
.includeRecord(eq("MyTopic"), eq(0), anyLong(), any(), any());
135135
verify(mockFilter2, times(totalRecords))
136-
.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject());
136+
.includeRecord(eq("MyTopic"), eq(0), anyLong(), any(), any());
137137
}
138138

139139
/**
@@ -147,9 +147,9 @@ public void testFilterMessages() {
147147
final RecordFilter mockFilter1 = mock(RecordFilter.class);
148148
final RecordFilter mockFilter2 = mock(RecordFilter.class);
149149

150-
when(mockFilter1.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject()))
150+
when(mockFilter1.includeRecord(eq("MyTopic"), eq(0), anyLong(), any(), any()))
151151
.thenReturn(true, false, true, true, true);
152-
when(mockFilter2.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject()))
152+
when(mockFilter2.includeRecord(eq("MyTopic"), eq(0), anyLong(), any(), any()))
153153
.thenReturn(true, true, false, true);
154154

155155
final RecordFilterDefinition recordFilterDefinition1 = new RecordFilterDefinition(mockFilter1, new HashMap<>());
@@ -182,9 +182,9 @@ public void testFilterMessages() {
182182

183183
// Verify mocks
184184
verify(mockFilter1, times(totalRecords))
185-
.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject());
185+
.includeRecord(eq("MyTopic"), eq(0), anyLong(), any(), any());
186186
verify(mockFilter2, times(totalRecords - 1))
187-
.includeRecord(eq("MyTopic"), eq(0), anyLong(), anyObject(), anyObject());
187+
.includeRecord(eq("MyTopic"), eq(0), anyLong(), any(), any());
188188
}
189189

190190
private ConsumerRecords createConsumerRecords(final int count) {

‎kafka-webview-ui/src/test/java/org/sourcelab/kafka/webview/ui/manager/plugin/PluginClassLoaderTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.junit.Test;
2828
import org.sourcelab.kafka.webview.ui.plugin.filter.RecordFilter;
2929

30+
import java.lang.reflect.InvocationTargetException;
3031
import java.net.URL;
3132
import java.security.PermissionCollection;
3233
import java.security.ProtectionDomain;
@@ -43,7 +44,8 @@ public class PluginClassLoaderTest {
4344
* Tests loading a class from a jar.
4445
*/
4546
@Test
46-
public void testLoadingFilterPlugin() throws ClassNotFoundException, IllegalAccessException, InstantiationException {
47+
public void testLoadingFilterPlugin() throws ClassNotFoundException, IllegalAccessException,
48+
InstantiationException, NoSuchMethodException, InvocationTargetException {
4749
// Get URL to our jar
4850
final URL jar = getClass().getClassLoader().getResource("testDeserializer/testPlugins.jar");
4951
final String classPath = "examples.filter.LowOffsetFilter";
@@ -55,7 +57,7 @@ public void testLoadingFilterPlugin() throws ClassNotFoundException, IllegalAcce
5557
assertNotNull("Should not be null", filterPlugin);
5658

5759
// Create an instance of it and validate.
58-
final RecordFilter filter = filterPlugin.newInstance();
60+
final RecordFilter filter = filterPlugin.getDeclaredConstructor().newInstance();
5961
final String topic = "MyTopic";
6062
final int partition = 2;
6163
final long offset = 2423L;

‎kafka-webview-ui/src/test/java/org/sourcelab/kafka/webview/ui/manager/socket/PresenceEventListenerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,12 @@
2727
import org.junit.Test;
2828
import org.springframework.web.socket.messaging.SessionDisconnectEvent;
2929

30-
import static org.mockito.Matchers.eq;
30+
import static org.mockito.ArgumentMatchers.eq;
3131
import static org.mockito.Mockito.mock;
3232
import static org.mockito.Mockito.times;
3333
import static org.mockito.Mockito.verify;
3434
import static org.mockito.Mockito.when;
3535

36-
3736
public class PresenceEventListenerTest {
3837

3938
/**

0 commit comments

Comments
 (0)