From 4196b48416d532e96da493dbd8059cd101a121e4 Mon Sep 17 00:00:00 2001 From: "Michael J. Simons" Date: Wed, 13 Nov 2019 21:03:48 +0100 Subject: [PATCH] Add support for custom Neo4j docker repository for tests. This closes #94. --- .../neo4j/springframework/data/test/Neo4jExtension.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-data-neo4j/src/test/java/org/neo4j/springframework/data/test/Neo4jExtension.java b/spring-data-neo4j/src/test/java/org/neo4j/springframework/data/test/Neo4jExtension.java index 2bc350f19..5356d728c 100644 --- a/spring-data-neo4j/src/test/java/org/neo4j/springframework/data/test/Neo4jExtension.java +++ b/spring-data-neo4j/src/test/java/org/neo4j/springframework/data/test/Neo4jExtension.java @@ -75,6 +75,7 @@ public class Neo4jExtension implements BeforeAllCallback, BeforeEachCallback { private static final String SYS_PROPERTY_NEOJ4_URL = "SDN_RX_NEO4J_URL"; private static final String SYS_PROPERTY_NEO4J_PASSWORD = "SDN_RX_NEO4J_PASSWORD"; private static final String SYS_PROPERTY_NEO4J_ACCEPT_COMMERCIAL_EDITION = "SDN_RX_NEO4J_ACCEPT_COMMERCIAL_EDITION"; + private static final String SYS_PROPERTY_NEO4J_REPOSITORY = "SDN_RX_NEO4J_REPOSITORY"; private static final String SYS_PROPERTY_NEO4J_VERSION = "SDN_RX_NEO4J_VERSION"; private static Set COMMUNITY_EDITION_INDICATOR = Collections.singleton("community"); @@ -248,9 +249,11 @@ public class Neo4jExtension implements BeforeAllCallback, BeforeEachCallback { static class ContainerAdapter implements ExtensionContext.Store.CloseableResource { - private final String imageVersion = Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_VERSION)).orElse("3.5.6"); + private final String repository = Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_REPOSITORY)).orElse("neo4j"); - private final Neo4jContainer neo4jContainer = new Neo4jContainer<>("neo4j:" + imageVersion) + private final String imageVersion = Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_VERSION)).orElse("3.5.12"); + + private final Neo4jContainer neo4jContainer = new Neo4jContainer<>(repository + ":" + imageVersion) .withoutAuthentication() .withEnv("NEO4J_ACCEPT_LICENSE_AGREEMENT", Optional.ofNullable(System.getenv(SYS_PROPERTY_NEO4J_ACCEPT_COMMERCIAL_EDITION)).orElse("no"));