committed by
Christoph Strobl
parent
b45d358abf
commit
5c4c9e029f
@@ -235,8 +235,8 @@ class ClusterCommandExecutorUnitTests {
|
||||
executor.executeCommandOnAllNodes(COMMAND_CALLBACK);
|
||||
} catch (ClusterCommandExecutionFailureException e) {
|
||||
|
||||
assertThat(e.getCauses().size()).isEqualTo(1);
|
||||
assertThat(e.getCauses().iterator().next()).isInstanceOf(DataAccessException.class);
|
||||
assertThat(e.getSuppressed()).hasSize(1);
|
||||
assertThat(e.getSuppressed()[0]).isInstanceOf(DataAccessException.class);
|
||||
}
|
||||
|
||||
verify(con1, times(1)).theWheelWeavesAsTheWheelWills();
|
||||
|
||||
@@ -162,10 +162,6 @@ class RedisConnectionUnitTests {
|
||||
return delegate.hSet(key, field, value);
|
||||
}
|
||||
|
||||
public void bgWriteAof() {
|
||||
delegate.bgWriteAof();
|
||||
}
|
||||
|
||||
public Object execute(String command, byte[]... args) {
|
||||
return delegate.execute(command, args);
|
||||
}
|
||||
|
||||
@@ -17,8 +17,6 @@ package org.springframework.data.redis.connection.jedis;
|
||||
|
||||
import static org.assertj.core.api.Assertions.*;
|
||||
|
||||
import redis.clients.jedis.JedisShardInfo;
|
||||
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@@ -44,19 +42,6 @@ class JedisConnectionFactoryIntegrationTests {
|
||||
}
|
||||
}
|
||||
|
||||
@Test // DATAREDIS-574
|
||||
void shardInfoShouldOverrideFactorySettings() {
|
||||
|
||||
factory = new JedisConnectionFactory(new JedisShardInfo(SettingsUtils.getHost(), SettingsUtils.getPort()));
|
||||
factory.setUsePool(false);
|
||||
factory.setPassword("foo");
|
||||
factory.setHostName("bar");
|
||||
factory.setPort(1234);
|
||||
factory.afterPropertiesSet();
|
||||
|
||||
assertThat(factory.getConnection().ping()).isEqualTo("PONG");
|
||||
}
|
||||
|
||||
@Test // DATAREDIS-574
|
||||
void shouldInitializeWithStandaloneConfiguration() {
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ class RedisConnectionUtilsUnitTests {
|
||||
|
||||
Mockito.reset(connectionMock1);
|
||||
doThrow(new IllegalStateException()).when(connectionMock1).close();
|
||||
RedisConnectionUtils.releaseConnection(connectionMock1, factoryMock, false);
|
||||
RedisConnectionUtils.releaseConnection(connectionMock1, factoryMock);
|
||||
|
||||
verify(connectionMock1).close();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user