Skip to content

Commit

Permalink
Clean up all warnings in Java client test (#163)
Browse files Browse the repository at this point in the history 
* Clean up all warnings in Java client test

Signed-off-by: Andrew Carbonetto <[email protected]>

---------

Signed-off-by: Andrew Carbonetto <[email protected]>
  • Loading branch information
@acarbonetto
acarbonetto authored Apr 1, 2024
1 parent 22683d5 commit f0b400e
Show file tree
Hide file tree
Showing 7 changed files with 174 additions and 175 deletions.
272 changes: 136 additions & 136 deletions java/client/src/test/java/glide/api/RedisClientTest.java
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions java/client/src/test/java/glide/api/RedisClusterClientTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public void ping_with_message_returns_success() {
// setup
String message = "RETURN OF THE PONG";
String[] arguments = new String[] {message};
CompletableFuture<String> testResponse = new CompletableFuture();
CompletableFuture<String> testResponse = new CompletableFuture<>();
testResponse.complete(message);

// match on protobuf request
Expand Down Expand Up @@ -240,7 +240,7 @@ public void ping_with_message_with_route_returns_success() {
public void info_returns_string() {
// setup
CompletableFuture<ClusterValue<String>> testResponse = mock(CompletableFuture.class);
Map<String, String> testPayload = new HashMap<String, String>();
Map<String, String> testPayload = new HashMap<>();
testPayload.put("addr1", "value1");
testPayload.put("addr2", "value2");
testPayload.put("addr3", "value3");
Expand Down
19 changes: 10 additions & 9 deletions java/client/src/test/java/glide/connection/ConnectionWithGlideMockTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,16 @@ public void rethrow_error_on_read_when_malformed_packet_received() {
@Test
@SneakyThrows
public void rethrow_error_if_UDS_channel_closed() {
var client = new TestClient(channelHandler);
stopRustCoreLibMock();
try {
var exception =
assertThrows(ExecutionException.class, () -> client.customCommand(new String[0]).get());
assertTrue(exception.getCause() instanceof ClosingException);
} finally {
// restart mock to let other tests pass if this one failed
startRustCoreLibMock(null);
try (var client = new TestClient(channelHandler)) {
stopRustCoreLibMock();
try {
var exception =
assertThrows(ExecutionException.class, () -> client.customCommand(new String[0]).get());
assertTrue(exception.getCause() instanceof ClosingException);
} finally {
// restart mock to let other tests pass if this one failed
startRustCoreLibMock(null);
}
}
}

Expand Down
15 changes: 9 additions & 6 deletions java/client/src/test/java/glide/connectors/resources/ThreadPoolResourceAllocatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@

public class ThreadPoolResourceAllocatorTest {

ThreadPoolResourceAllocator service;

@BeforeEach
public void init() {
var threadPoolResource = ThreadPoolResourceAllocator.getOrCreate(() -> null);
Expand All @@ -30,17 +28,19 @@ public void init() {
public void getOrCreate_returns_default_after_repeated_calls() {
ThreadPoolResource mockedThreadPoolResource = mock(ThreadPoolResource.class);
EventLoopGroup mockedEventLoopGroup = mock(EventLoop.class);
@SuppressWarnings("unchecked")
Supplier<ThreadPoolResource> threadPoolSupplier = mock(Supplier.class);

when(mockedThreadPoolResource.getEventLoopGroup()).thenReturn(mockedEventLoopGroup);
when(mockedEventLoopGroup.isShuttingDown()).thenReturn(false);
when(threadPoolSupplier.get()).thenReturn(mockedThreadPoolResource);

ThreadPoolResource theResource = service.getOrCreate(threadPoolSupplier);
ThreadPoolResource theResource = ThreadPoolResourceAllocator.getOrCreate(threadPoolSupplier);
assertEquals(mockedThreadPoolResource, theResource);

// Ensure that supplier only is invoked once to set up the shared resource
ThreadPoolResource theSameResource = service.getOrCreate(threadPoolSupplier);
ThreadPoolResource theSameResource =
ThreadPoolResourceAllocator.getOrCreate(threadPoolSupplier);
assertEquals(mockedThreadPoolResource, theSameResource);
verify(threadPoolSupplier, times(1)).get();

Expand All @@ -52,17 +52,20 @@ public void getOrCreate_returns_default_after_repeated_calls() {
public void getOrCreate_returns_new_thread_pool_after_shutdown() {
ThreadPoolResource mockedThreadPoolResource = mock(ThreadPoolResource.class);
EventLoopGroup mockedEventLoopGroup = mock(EventLoop.class);

@SuppressWarnings("unchecked")
Supplier<ThreadPoolResource> threadPoolSupplier = mock(Supplier.class);

when(mockedThreadPoolResource.getEventLoopGroup()).thenReturn(mockedEventLoopGroup);
when(mockedEventLoopGroup.isShuttingDown()).thenReturn(true);
when(threadPoolSupplier.get()).thenReturn(mockedThreadPoolResource);

ThreadPoolResource theResource = service.getOrCreate(threadPoolSupplier);
ThreadPoolResource theResource = ThreadPoolResourceAllocator.getOrCreate(threadPoolSupplier);
assertEquals(mockedThreadPoolResource, theResource);

// Ensure that supplier only is invoked once to set up the shared resource
ThreadPoolResource theSameResource = service.getOrCreate(threadPoolSupplier);
ThreadPoolResource theSameResource =
ThreadPoolResourceAllocator.getOrCreate(threadPoolSupplier);
assertEquals(mockedThreadPoolResource, theSameResource);
verify(threadPoolSupplier, times(2)).get();

Expand Down
2 changes: 1 addition & 1 deletion java/client/src/test/java/glide/ffi/FfiTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void redisValueToJavaValue_Okay() {
}

@ParameterizedTest
@ValueSource(longs = {0L, 100L, 774L, Integer.MAX_VALUE + 1, Integer.MIN_VALUE - 1})
@ValueSource(longs = {0L, 100L, 774L, Integer.MAX_VALUE + 1L, Integer.MIN_VALUE - 1L})
public void redisValueToJavaValue_Int(Long input) {
long ptr = FfiTest.createLeakedInt(input);
Object longValue = RedisValueResolver.valueFromPointer(ptr);
Expand Down
20 changes: 10 additions & 10 deletions java/client/src/test/java/glide/managers/ConnectionManagerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,21 @@ public class ConnectionManagerTest {

ChannelHandler channel;

private static String HOST = "aws.com";
private static int PORT = 9999;
private static final String HOST = "aws.com";
private static final int PORT = 9999;

private static String USERNAME = "JohnDoe";
private static String PASSWORD = "Password1";
private static final String USERNAME = "JohnDoe";
private static final String PASSWORD = "Password1";

private static int NUM_OF_RETRIES = 5;
private static int FACTOR = 10;
private static int EXPONENT_BASE = 50;
private static final int NUM_OF_RETRIES = 5;
private static final int FACTOR = 10;
private static final int EXPONENT_BASE = 50;

private static int DATABASE_ID = 1;
private static final int DATABASE_ID = 1;

private static int REQUEST_TIMEOUT = 3;
private static final int REQUEST_TIMEOUT = 3;

private static String CLIENT_NAME = "ClientName";
private static final String CLIENT_NAME = "ClientName";

@BeforeEach
public void setUp() {
Expand Down
17 changes: 6 additions & 11 deletions java/client/src/test/java/glide/utils/RustCoreMock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.nio.file.Files;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import redis_request.RedisRequestOuterClass.RedisRequest;
Expand Down Expand Up @@ -67,13 +68,6 @@ public static Response.Builder OK() {
}
}

public abstract static class GlideMockConnectAll extends GlideMockProtobuf {
@Override
public Response connection(ConnectionRequest request) {
return Response.newBuilder().build();
}
}

/** Thread pool supplied to <em>Netty</em> to perform all async IO. */
private final EventLoopGroup group;

Expand Down Expand Up @@ -113,7 +107,7 @@ private RustCoreMock() {
new ChannelInitializer<DomainSocketChannel>() {

@Override
protected void initChannel(DomainSocketChannel ch) throws Exception {
protected void initChannel(@NonNull DomainSocketChannel ch) {
ch.pipeline()
// https://netty.io/4.1/api/io/netty/handler/codec/protobuf/ProtobufEncoder.html
.addLast("frameDecoder", new ProtobufVarint32FrameDecoder())
Expand Down Expand Up @@ -155,7 +149,8 @@ private class UdsServer extends ChannelInboundHandlerAdapter {
private final AtomicBoolean anybodyConnected = new AtomicBoolean(false);

@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
public void channelRead(@NonNull ChannelHandlerContext ctx, @NonNull Object msg)
throws Exception {
var buf = (ByteBuf) msg;
var bytes = new byte[buf.readableBytes()];
buf.readBytes(bytes);
Expand All @@ -165,7 +160,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
return;
}
var handler = (GlideMockProtobuf) messageProcessor;
Response response = null;
Response response;
if (!anybodyConnected.get()) {
var connection = ConnectionRequest.parseFrom(bytes);
response = handler.connection(connection);
Expand All @@ -180,7 +175,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
}

@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
cause.printStackTrace();
ctx.close();
failed.setPlain(true);
Expand Down

0 comments on commit f0b400e

Please sign in to comment.