Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-973 - Polishing.

Browse Source 
Use connection factory customizer for setting db index when creating new connection. This allows to grasp the tests setup more quickly and improves readability.

Original Pull Request: #451
This commit is contained in:
Christoph Strobl
2019-06-05 09:17:39 +02:00
parent 06e368b430
commit 1ca6659ef4
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryTests.java
View File

@@ -37,7 +37,6 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.data.redis.ConnectionFactoryTracker;
import org.springframework.data.redis.RedisConnectionFailureException;
import org.springframework.data.redis.RedisSystemException;
@@ -140,11 +139,26 @@ public class LettuceConnectionFactoryTests {
// put an item in database 0
connection.set("sometestkey", "sometestvalue");
LettuceConnectionFactory sharingConnectionFactory = newConnectionFactory(cf -> {});
LettuceConnectionFactory sharingConnectionFactory = newConnectionFactory(cf -> cf.setDatabase(1));
runSelectDbTest(sharingConnectionFactory);
LettuceConnectionFactory nonSharingConnectionFactory = newConnectionFactory(
cf -> cf.setShareNativeConnection(false));
LettuceConnectionFactory nonSharingConnectionFactory = newConnectionFactory(cf -> {
cf.setDatabase(1);
cf.setShareNativeConnection(false);
});
runSelectDbTest(nonSharingConnectionFactory);
}
@Test // DATAREDIS-973
public void testSelectDbReactive() {
LettuceConnectionFactory sharingConnectionFactory = newConnectionFactory(cf -> cf.setDatabase(1));
runSelectDbReactiveTest(sharingConnectionFactory);
LettuceConnectionFactory nonSharingConnectionFactory = newConnectionFactory(cf -> {
cf.setDatabase(1);
cf.setShareNativeConnection(false);
});
runSelectDbTest(nonSharingConnectionFactory);
}
@@ -167,17 +181,6 @@ public class LettuceConnectionFactoryTests {
}
}
@Test // DATAREDIS-973
public void testSelectDbReactive() {
LettuceConnectionFactory sharingConnectionFactory = newConnectionFactory(cf -> {});
runSelectDbReactiveTest(sharingConnectionFactory);
LettuceConnectionFactory nonSharingConnectionFactory = newConnectionFactory(
cf -> cf.setShareNativeConnection(false));
runSelectDbTest(nonSharingConnectionFactory);
}
private void runSelectDbReactiveTest(LettuceConnectionFactory factory2) {
ConnectionFactoryTracker.add(factory2);
@@ -209,7 +212,6 @@ public class LettuceConnectionFactoryTests {
SettingsUtils.getPort());
connectionFactory.setClientResources(LettuceTestClientResources.getSharedClientResources());
connectionFactory.setShutdownTimeout(0);
connectionFactory.setDatabase(1);
customizer.accept(connectionFactory);
connectionFactory.afterPropertiesSet();