From 996e6bf48cae1d2b3c46dc250bcb31363d28ec65 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 26 Jul 2017 10:06:36 +0200 Subject: [PATCH] Reset Neo4j tests to use the default driver again This commit resets the artificial use of the http driver now the bolt driver doesn't check if the connection to the Neo4J server is valid on startup. See neo4j/neo4j-java-driver#380 Closes gh-9500 --- .../MixedNeo4jRepositoriesAutoConfigurationTests.java | 2 +- .../data/neo4j/Neo4jDataAutoConfigurationTests.java | 11 +++-------- spring-boot-test-autoconfigure/pom.xml | 5 ----- .../src/test/resources/application.properties | 5 ----- 4 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 spring-boot-test-autoconfigure/src/test/resources/application.properties diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java index 483f7c77b9..3c66694189 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java @@ -94,7 +94,7 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests { private void load(Class config, String... environment) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); TestPropertyValues.of(environment).and("spring.datasource.initialize", "false") - .and("spring.data.neo4j.uri", "http://localhost:8989").applyTo(context); + .applyTo(context); context.register(config); context.register(DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class, diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java index fd509674a9..1c41ff3c4d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java @@ -80,8 +80,7 @@ public class Neo4jDataAutoConfigurationTests { @Test public void customNeo4jTransactionManagerUsingProperties() { - load(null, "spring.data.neo4j.uri=http://localhost:8989", - "spring.transaction.default-timeout=30", + load(null, "spring.transaction.default-timeout=30", "spring.transaction.rollback-on-commit-failure:true"); Neo4jTransactionManager transactionManager = this.context .getBean(Neo4jTransactionManager.class); @@ -110,8 +109,6 @@ public class Neo4jDataAutoConfigurationTests { @Test public void usesAutoConfigurationPackageToPickUpDomainTypes() { this.context = new AnnotationConfigApplicationContext(); - TestPropertyValues.of("spring.data.neo4j.uri=http://localhost:8989") - .applyTo(this.context); String cityPackage = City.class.getPackage().getName(); AutoConfigurationPackages.register((BeanDefinitionRegistry) this.context, cityPackage); @@ -125,16 +122,14 @@ public class Neo4jDataAutoConfigurationTests { @Test public void openSessionInViewInterceptorCanBeDisabled() { - load(null, "spring.data.neo4j.uri=http://localhost:8989", - "spring.data.neo4j.open-in-view:false"); + load(null, "spring.data.neo4j.open-in-view:false"); assertThat(this.context.getBeansOfType(OpenSessionInViewInterceptor.class)) .isEmpty(); } @Test public void eventListenersAreAutoRegistered() { - load(EventListenerConfiguration.class, - "spring.data.neo4j.uri=http://localhost:8989"); + load(EventListenerConfiguration.class); Session session = this.context.getBean(SessionFactory.class).openSession(); session.notifyListeners(new PersistenceEvent(null, Event.TYPE.PRE_SAVE)); verify(this.context.getBean("eventListenerOne", EventListener.class)) diff --git a/spring-boot-test-autoconfigure/pom.xml b/spring-boot-test-autoconfigure/pom.xml index 51d395e1e6..3743ae3f30 100644 --- a/spring-boot-test-autoconfigure/pom.xml +++ b/spring-boot-test-autoconfigure/pom.xml @@ -218,11 +218,6 @@ mongodb-driver-reactivestreams true - - org.neo4j - neo4j-ogm-http-driver - test - org.skyscreamer jsonassert diff --git a/spring-boot-test-autoconfigure/src/test/resources/application.properties b/spring-boot-test-autoconfigure/src/test/resources/application.properties deleted file mode 100644 index 06d81d8f6b..0000000000 --- a/spring-boot-test-autoconfigure/src/test/resources/application.properties +++ /dev/null @@ -1,5 +0,0 @@ -# -# This is a temporary override until the Neo4j bolt driver stops validating -# the connection on startup, see https://github.com/neo4j/neo4j-java-driver/issues/380 -# -spring.data.neo4j.uri=http://localhost:8989