Skip to content

Commit 1ca6659

Browse files
DATAREDIS-973 - Polishing.
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: spring-projects#451
1 parent 06e368b commit 1ca6659

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.junit.Before;
3838
import org.junit.Ignore;
3939
import org.junit.Test;
40-
4140
import org.springframework.data.redis.ConnectionFactoryTracker;
4241
import org.springframework.data.redis.RedisConnectionFailureException;
4342
import org.springframework.data.redis.RedisSystemException;
@@ -140,11 +139,26 @@ public void testSelectDb() {
140139
// put an item in database 0
141140
connection.set("sometestkey", "sometestvalue");
142141

143-
LettuceConnectionFactory sharingConnectionFactory = newConnectionFactory(cf -> {});
142+
LettuceConnectionFactory sharingConnectionFactory = newConnectionFactory(cf -> cf.setDatabase(1));
144143
runSelectDbTest(sharingConnectionFactory);
145144

146-
LettuceConnectionFactory nonSharingConnectionFactory = newConnectionFactory(
147-
cf -> cf.setShareNativeConnection(false));
145+
LettuceConnectionFactory nonSharingConnectionFactory = newConnectionFactory(cf -> {
146+
cf.setDatabase(1);
147+
cf.setShareNativeConnection(false);
148+
});
149+
runSelectDbTest(nonSharingConnectionFactory);
150+
}
151+
152+
@Test // DATAREDIS-973
153+
public void testSelectDbReactive() {
154+
155+
LettuceConnectionFactory sharingConnectionFactory = newConnectionFactory(cf -> cf.setDatabase(1));
156+
runSelectDbReactiveTest(sharingConnectionFactory);
157+
158+
LettuceConnectionFactory nonSharingConnectionFactory = newConnectionFactory(cf -> {
159+
cf.setDatabase(1);
160+
cf.setShareNativeConnection(false);
161+
});
148162
runSelectDbTest(nonSharingConnectionFactory);
149163
}
150164

@@ -167,17 +181,6 @@ private void runSelectDbTest(LettuceConnectionFactory factory2) {
167181
}
168182
}
169183

170-
@Test // DATAREDIS-973
171-
public void testSelectDbReactive() {
172-
173-
LettuceConnectionFactory sharingConnectionFactory = newConnectionFactory(cf -> {});
174-
runSelectDbReactiveTest(sharingConnectionFactory);
175-
176-
LettuceConnectionFactory nonSharingConnectionFactory = newConnectionFactory(
177-
cf -> cf.setShareNativeConnection(false));
178-
runSelectDbTest(nonSharingConnectionFactory);
179-
}
180-
181184
private void runSelectDbReactiveTest(LettuceConnectionFactory factory2) {
182185

183186
ConnectionFactoryTracker.add(factory2);
@@ -209,7 +212,6 @@ private static LettuceConnectionFactory newConnectionFactory(Consumer<LettuceCon
209212
SettingsUtils.getPort());
210213
connectionFactory.setClientResources(LettuceTestClientResources.getSharedClientResources());
211214
connectionFactory.setShutdownTimeout(0);
212-
connectionFactory.setDatabase(1);
213215
customizer.accept(connectionFactory);
214216
connectionFactory.afterPropertiesSet();
215217

0 commit comments

Comments
 (0)