refactor(test): Stabilize a couple of tests (especially the ones using _a_ shortest path).

Signed-off-by: Michael Simons <[email protected]>

Author: michael-simons

src/test/java/org/springframework/data/neo4j/integration/movies/imperative/AdvancedMappingIT.java

@@ -298,8 +298,10 @@ void directionAndTypeLessPathMappingShouldWork(@Autowired Neo4jTemplate template
 	void mappingOfAPathWithOddNumberOfElementsShouldWorkFromStartToEnd(@Autowired Neo4jTemplate template) {
 
 		Map<String, Movie> movies = template
-				.findAll(
-						"MATCH p=shortestPath((:Person {name: 'Mary Alice'})-[*]-(:Person {name: 'Emil Eifrem'})) RETURN p",
+				.findAll("""
+					MATCH p=shortestPath((:Person {name: 'Mary Alice'})-[*]-(:Person {name: 'Emil Eifrem'}))
+					WHERE any(t IN [ x in nodes(p) | x.title] WHERE t = 'The Matrix Reloaded')
+					RETURN p""",
 						Collections.emptyMap(), Movie.class)
 				.stream().collect(Collectors.toMap(Movie::getTitle, Function.identity()));
 		assertThat(movies).hasSize(3);
@@ -317,8 +319,11 @@ void mappingOfAPathWithOddNumberOfElementsShouldWorkFromStartToEnd(@Autowired Ne
 	void mappingOfAPathWithEventNumberOfElementsShouldWorkFromStartToEnd(@Autowired Neo4jTemplate template) {
 
 		Map<String, Movie> movies = template
-				.findAll(
-						"MATCH p=shortestPath((:Movie {title: 'The Matrix Revolutions'})-[*]-(:Person {name: 'Emil Eifrem'})) RETURN p",
+				.findAll("""
+					MATCH p=shortestPath((:Movie {title: 'The Matrix Revolutions'})-[*]-(:Person {name: 'Emil Eifrem'}))
+					WHERE any(t IN [ x in nodes(p) | x.title] WHERE t = 'The Matrix Reloaded')
+					RETURN p
+					""",
 						Collections.emptyMap(), Movie.class)
 				.stream().collect(Collectors.toMap(Movie::getTitle, Function.identity()));
 		assertThat(movies).hasSize(3);

src/test/java/org/springframework/data/neo4j/integration/movies/reactive/ReactiveAdvancedMappingIT.java

@@ -258,7 +258,10 @@ void directionAndTypeLessPathMappingShouldWork(@Autowired ReactiveNeo4jTemplate
 	void mappingOfAPathWithOddNumberOfElementsShouldWorkFromStartToEnd(@Autowired ReactiveNeo4jTemplate template) {
 
 		StepVerifier.create(template
-				.findAll("MATCH p=shortestPath((:Person {name: 'Mary Alice'})-[*]-(:Person {name: 'Emil Eifrem'})) RETURN p", Collections.emptyMap(), Movie.class))
+				.findAll("""
+					MATCH p=shortestPath((:Person {name: 'Mary Alice'})-[*]-(:Person {name: 'Emil Eifrem'}))
+					WHERE any(t IN [ x in nodes(p) | x.title] WHERE t = 'The Matrix Reloaded')
+					RETURN p""", Collections.emptyMap(), Movie.class))
 				.recordWith(ArrayList::new)
 				.expectNextCount(3)
 				.consumeRecordedWith(result -> {
@@ -279,7 +282,10 @@ void mappingOfAPathWithOddNumberOfElementsShouldWorkFromStartToEnd(@Autowired Re
 	void mappingOfAPathWithEventNumberOfElementsShouldWorkFromStartToEnd(@Autowired ReactiveNeo4jTemplate template) {
 
 		StepVerifier.create(template
-				.findAll("MATCH p=shortestPath((:Movie {title: 'The Matrix Revolutions'})-[*]-(:Person {name: 'Emil Eifrem'})) RETURN p", Collections.emptyMap(), Movie.class))
+				.findAll("""
+					MATCH p=shortestPath((:Movie {title: 'The Matrix Revolutions'})-[*]-(:Person {name: 'Emil Eifrem'}))
+					WHERE any(t IN [ x in nodes(p) | x.title] WHERE t = 'The Matrix Reloaded')
+					RETURN p""", Collections.emptyMap(), Movie.class))
 				.recordWith(ArrayList::new)
 				.expectNextCount(3)
 				.consumeRecordedWith(result -> {

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

@@ -72,7 +72,9 @@ class ReactiveExceptionTranslationTest {
 			ex.getMessage().matches(
 					"New data does not satisfy Constraint\\( id=\\d+, name='simple_person__unique_name', type='UNIQUENESS', schema=\\(:SimplePerson \\{name}\\), ownedIndex=\\d+ \\): Both node \\d+ and node -?\\d+ share the property value \\( String\\(\"Tom\"\\) \\); Error code 'Neo\\.ClientError\\.Schema\\.ConstraintValidationFailed'") ||
 			ex.getMessage().matches(
-					"New data does not satisfy Constraint\\( id=\\d+, name='simple_person__unique_name', type='UNIQUENESS', schema=\\(:SimplePerson \\{name}\\), ownedIndex=\\d+ \\): Node\\(\\d+\\) already exists with label `Label\\[\\d+]` and property `PropertyKey\\[\\d+]` = 'Tom'; Error code 'Neo\\.ClientError\\.Schema\\.ConstraintValidationFailed'")
+					"New data does not satisfy Constraint\\( id=\\d+, name='simple_person__unique_name', type='UNIQUENESS', schema=\\(:SimplePerson \\{name}\\), ownedIndex=\\d+ \\): Node\\(\\d+\\) already exists with label `Label\\[\\d+]` and property `PropertyKey\\[\\d+]` = 'Tom'; Error code 'Neo\\.ClientError\\.Schema\\.ConstraintValidationFailed'") ||
+			ex.getMessage().matches(
+					"New data does not satisfy Constraint\\( id=\\d+, name='simple_person__unique_name', type='NODE PROPERTY UNIQUENESS', schema=\\(:SimplePerson \\{name}\\), ownedIndex=\\d+ \\): Node\\(\\d+\\) already exists with label `Label\\[\\d+]` and property `PropertyKey\\[\\d+]` = 'Tom'; Error code 'Neo\\.ClientError\\.Schema\\.ConstraintValidationFailed'")
 	);
 	// @formatter:on
 

src/test/java/org/springframework/data/neo4j/integration/shared/common/Person.java

@@ -42,7 +42,7 @@ public class Person {
 	 */
 	@Node
 	public static class Address {
-		@Id
+		@Id @GeneratedValue
 		private Long id;
 		private String zipCode;
 		private String city;

src/test/java/org/springframework/data/neo4j/test/Neo4jExtension.java

@@ -258,11 +258,17 @@ public ServerVersion getServerVersion() {
 				synchronized (this) {
 					serverVersion = this.cachedServerVersion;
 					if (serverVersion == null) {
+						String versionString = "";
 						try (Session session = this.getDriver().session()) {
 							Record result = session.run("CALL dbms.components() YIELD versions RETURN 'Neo4j/' + versions[0] as version").single();
-							this.cachedServerVersion = ServerVersion.version(result.get("version").asString());
+							versionString = result.get("version").asString();
+							this.cachedServerVersion = ServerVersion.version(versionString);
 						} catch (Exception e) {
-							throw new RuntimeException("Could not determine server version", e);
+							if (versionString.matches("Neo4j/20\\d{2}.+")) {
+								this.cachedServerVersion = ServerVersion.vInDev;
+							} else {
+								throw new RuntimeException("Could not determine server version", e);
+							}
 						}
 						serverVersion = this.cachedServerVersion;
 					}