Skip to content

Commit 9765b13

Browse files
DATAGRAPH-1405 - Remove superflous [At]DirtiesContext.
…and document the usage where needed.
1 parent 0885c86 commit 9765b13

File tree

7 files changed

+6
-14
lines changed

7 files changed

+6
-14
lines changed

src/test/java/org/springframework/data/neo4j/integration/imperative/CausalClusterLoadTestIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static class TestConfig extends AbstractNeo4jConfig {
128128
public Driver driver() {
129129

130130
Driver driver = GraphDatabase.driver(neo4jUri, AuthTokens.basic("neo4j", "secret"),
131-
Config.builder().withConnectionTimeout(2, TimeUnit.MINUTES).build());
131+
Config.builder().withConnectionTimeout(5, TimeUnit.MINUTES).build());
132132
driver.verifyConnectivity();
133133
return driver;
134134
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
*/
135135
@ExtendWith(Neo4jExtension.class)
136136
@SpringJUnitConfig
137-
@DirtiesContext
137+
@DirtiesContext // We need this here as the nested tests all inherit from the integration test base but the database selection here is different
138138
class RepositoryIT {
139139

140140
protected static Neo4jExtension.Neo4jConnectionSupport neo4jConnectionSupport;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@
2222
import org.neo4j.driver.SessionConfig;
2323
import org.springframework.data.neo4j.core.DatabaseSelection;
2424
import org.springframework.data.neo4j.test.Neo4jExtension;
25-
import org.springframework.test.annotation.DirtiesContext;
2625

2726
/**
2827
* @author Michael J. Simons
2928
*/
3029
@Tag(Neo4jExtension.COMMERCIAL_EDITION_ONLY)
3130
@Tag(Neo4jExtension.REQUIRES + "4.0.0")
32-
@DirtiesContext
3331
class RepositoryWithADifferentDatabaseIT extends RepositoryIT {
3432

3533
private static final String TEST_DATABASE_NAME = "aTestDatabase";

src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveCausalClusterLoadTestIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static class TestConfig extends AbstractReactiveNeo4jConfig {
133133
public Driver driver() {
134134

135135
Driver driver = GraphDatabase.driver(neo4jUri, AuthTokens.basic("neo4j", "secret"),
136-
Config.builder().withConnectionTimeout(2, TimeUnit.MINUTES).build());
136+
Config.builder().withConnectionTimeout(5, TimeUnit.MINUTES).build());
137137
driver.verifyConnectivity();
138138
return driver;
139139
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112
*/
113113
@ExtendWith(Neo4jExtension.class)
114114
@SpringJUnitConfig
115-
@DirtiesContext
116115
@Tag(Neo4jExtension.NEEDS_REACTIVE_SUPPORT)
116+
@DirtiesContext // We need this here as the nested tests all inherit from the integration test base but the database selection here is different
117117
class ReactiveRepositoryIT {
118118

119119
protected static Neo4jExtension.Neo4jConnectionSupport neo4jConnectionSupport;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@
2222
import org.neo4j.driver.SessionConfig;
2323
import org.springframework.data.neo4j.core.DatabaseSelection;
2424
import org.springframework.data.neo4j.test.Neo4jExtension;
25-
import org.springframework.test.annotation.DirtiesContext;
2625

2726
/**
2827
* @author Michael J. Simons
2928
*/
3029
@Tag(Neo4jExtension.COMMERCIAL_EDITION_ONLY)
3130
@Tag(Neo4jExtension.REQUIRES + "4.0.0")
32-
@DirtiesContext
3331
class ReactiveRepositoryWithADifferentDatabaseIT extends ReactiveRepositoryIT {
3432

3533
private static final String TEST_DATABASE_NAME = "aTestDatabase";

src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveTypeConversionIT.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
import org.junit.jupiter.api.Tag;
2929
import org.junit.jupiter.api.Test;
30-
import org.junit.jupiter.api.extension.ExtendWith;
3130
import org.neo4j.driver.Driver;
3231
import org.springframework.beans.factory.annotation.Autowired;
3332
import org.springframework.context.annotation.Bean;
@@ -39,17 +38,14 @@
3938
import org.springframework.data.neo4j.repository.ReactiveNeo4jRepository;
4039
import org.springframework.data.neo4j.repository.config.EnableReactiveNeo4jRepositories;
4140
import org.springframework.data.neo4j.test.Neo4jExtension;
42-
import org.springframework.test.annotation.DirtiesContext;
43-
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
41+
import org.springframework.data.neo4j.test.Neo4jIntegrationTest;
4442
import org.springframework.transaction.annotation.EnableTransactionManagement;
4543

4644
/**
4745
* @author Michael J. Simons
4846
* @soundtrack Tom Morello - The Atlas Underground
4947
*/
50-
@ExtendWith(Neo4jExtension.class)
51-
@SpringJUnitConfig
52-
@DirtiesContext
48+
@Neo4jIntegrationTest
5349
@Tag(Neo4jExtension.NEEDS_REACTIVE_SUPPORT)
5450
class ReactiveTypeConversionIT {
5551

0 commit comments

Comments
 (0)