Skip to content

Commit 76d09d3

Browse files
michael-simonsmichael-simons
committed
Improve testing infrastructure.
1 parent 2d89cc3 commit 76d09d3

File tree

4 files changed

+17
-26
lines changed

4 files changed

+17
-26
lines changed

‎src/test/java/org/springframework/data/neo4j/integration/imperative/RepositoryIT.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
class RepositoryIT {
168168

169169
protected static Neo4jExtension.Neo4jConnectionSupport neo4jConnectionSupport;
170-
protected static DatabaseSelection databaseSelection = DatabaseSelection.undecided();
170+
protected static final ThreadLocal<DatabaseSelection> databaseSelection = ThreadLocal.withInitial(DatabaseSelection::undecided);
171171

172172
private static final String TEST_PERSON1_NAME = "Test";
173173
private static final String TEST_PERSON2_NAME = "Test2";
@@ -190,10 +190,6 @@ static PersonWithAllConstructor personExample(String sameValue) {
190190
PersonWithAllConstructor person1;
191191
PersonWithAllConstructor person2;
192192

193-
RepositoryIT() {
194-
databaseSelection = DatabaseSelection.undecided();
195-
}
196-
197193
@Nested
198194
class Find extends IntegrationTestBase {
199195

@@ -4395,7 +4391,7 @@ void before() {
43954391
}
43964392

43974393
<T> T doWithSession(Function<Session, T> sessionConsumer) {
4398-
try (Session session = driver.session(bookmarkCapture.createSessionConfig(databaseSelection.getValue()))) {
4394+
try (Session session = driver.session(bookmarkCapture.createSessionConfig(databaseSelection.get().getValue()))) {
43994395
T result = sessionConsumer.apply(session);
44004396
bookmarkCapture.seedWith(session.lastBookmark());
44014397
return result;
@@ -4404,7 +4400,7 @@ <T> T doWithSession(Function<Session, T> sessionConsumer) {
44044400

44054401
void assertWithSession(Consumer<Session> consumer) {
44064402

4407-
try (Session session = driver.session(bookmarkCapture.createSessionConfig(databaseSelection.getValue()))) {
4403+
try (Session session = driver.session(bookmarkCapture.createSessionConfig(databaseSelection.get().getValue()))) {
44084404
consumer.accept(session);
44094405
}
44104406
}
@@ -4457,7 +4453,7 @@ public TransactionTemplate transactionTemplate(PlatformTransactionManager transa
44574453

44584454
@Bean
44594455
public DatabaseSelectionProvider databaseSelectionProvider() {
4460-
return () -> databaseSelection;
4456+
return () -> databaseSelection.get();
44614457
}
44624458
}
44634459
}

‎src/test/java/org/springframework/data/neo4j/integration/imperative/RepositoryWithADifferentDatabaseIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,15 @@ class RepositoryWithADifferentDatabaseIT extends RepositoryIT {
3333

3434
private static final String TEST_DATABASE_NAME = "aTestDatabase";
3535

36-
RepositoryWithADifferentDatabaseIT() {
37-
databaseSelection = DatabaseSelection.byName(TEST_DATABASE_NAME);
38-
}
39-
4036
@BeforeAll
4137
static void createTestDatabase() {
4238

4339
try (Session session = neo4jConnectionSupport.getDriver().session(SessionConfig.forDatabase("system"))) {
4440

4541
session.run("CREATE DATABASE " + TEST_DATABASE_NAME).consume();
4642
}
43+
44+
databaseSelection.set(DatabaseSelection.byName(TEST_DATABASE_NAME));
4745
}
4846

4947
@AfterAll
@@ -53,5 +51,7 @@ static void dropTestDatabase() {
5351

5452
session.run("DROP DATABASE " + TEST_DATABASE_NAME).consume();
5553
}
54+
55+
databaseSelection.set(DatabaseSelection.undecided());
5656
}
5757
}

‎src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveRepositoryIT.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
class ReactiveRepositoryIT {
129129

130130
protected static Neo4jExtension.Neo4jConnectionSupport neo4jConnectionSupport;
131-
protected static DatabaseSelection databaseSelection = DatabaseSelection.undecided();
131+
protected static final ThreadLocal<DatabaseSelection> databaseSelection = ThreadLocal.withInitial(DatabaseSelection::undecided);
132132

133133
private static final String TEST_PERSON1_NAME = "Test";
134134
private static final String TEST_PERSON2_NAME = "Test2";
@@ -150,10 +150,6 @@ static PersonWithAllConstructor personExample(String sameValue) {
150150
private PersonWithAllConstructor person1;
151151
private PersonWithAllConstructor person2;
152152

153-
ReactiveRepositoryIT() {
154-
databaseSelection = DatabaseSelection.undecided();
155-
}
156-
157153
@Nested
158154
class Find extends ReactiveIntegrationTestBase {
159155

@@ -2593,7 +2589,7 @@ void before() {
25932589
}
25942590

25952591
<T> T doWithSession(Function<Session, T> sessionConsumer) {
2596-
try (Session session = driver.session(bookmarkCapture.createSessionConfig(databaseSelection.getValue()))) {
2592+
try (Session session = driver.session(bookmarkCapture.createSessionConfig(databaseSelection.get().getValue()))) {
25972593
T result = sessionConsumer.apply(session);
25982594
bookmarkCapture.seedWith(session.lastBookmark());
25992595
return result;
@@ -2602,14 +2598,14 @@ <T> T doWithSession(Function<Session, T> sessionConsumer) {
26022598

26032599
void assertInSession(Consumer<Session> consumer) {
26042600

2605-
try (Session session = driver.session(bookmarkCapture.createSessionConfig(databaseSelection.getValue()))) {
2601+
try (Session session = driver.session(bookmarkCapture.createSessionConfig(databaseSelection.get().getValue()))) {
26062602
consumer.accept(session);
26072603
}
26082604
}
26092605

26102606
RxSession createRxSession() {
26112607

2612-
return driver.rxSession(bookmarkCapture.createSessionConfig(databaseSelection.getValue()));
2608+
return driver.rxSession(bookmarkCapture.createSessionConfig(databaseSelection.get().getValue()));
26132609
}
26142610

26152611
TransactionalOperator getTransactionalOperator() {
@@ -2652,7 +2648,7 @@ public TransactionalOperator transactionalOperator(ReactiveTransactionManager re
26522648
@Override
26532649
@Bean
26542650
public ReactiveDatabaseSelectionProvider reactiveDatabaseSelectionProvider() {
2655-
return Optional.ofNullable(databaseSelection.getValue())
2651+
return Optional.ofNullable(databaseSelection.get().getValue())
26562652
.map(ReactiveDatabaseSelectionProvider::createStaticDatabaseSelectionProvider)
26572653
.orElse(ReactiveDatabaseSelectionProvider.getDefaultSelectionProvider());
26582654
}

‎src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveRepositoryWithADifferentDatabaseIT.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,15 @@ class ReactiveRepositoryWithADifferentDatabaseIT extends ReactiveRepositoryIT {
3333

3434
private static final String TEST_DATABASE_NAME = "aTestDatabase";
3535

36-
ReactiveRepositoryWithADifferentDatabaseIT() {
37-
databaseSelection = DatabaseSelection.byName(TEST_DATABASE_NAME);
38-
}
39-
4036
@BeforeAll
4137
static void createTestDatabase() {
4238

4339
try (Session session = neo4jConnectionSupport.getDriver().session(SessionConfig.forDatabase("system"))) {
4440

4541
session.run("CREATE DATABASE " + TEST_DATABASE_NAME).consume();
4642
}
43+
44+
databaseSelection.set(DatabaseSelection.byName(TEST_DATABASE_NAME));
4745
}
4846

4947
@AfterAll
@@ -53,6 +51,7 @@ static void dropTestDatabase() {
5351

5452
session.run("DROP DATABASE " + TEST_DATABASE_NAME).consume();
5553
}
56-
}
5754

55+
databaseSelection.set(DatabaseSelection.undecided());
56+
}
5857
}

0 commit comments

Comments
 (0)