Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-2543 - Fix Neo4j 5.0 Cypher incompatibility in tests.

Browse Source 
Closes #2543
This commit is contained in:
Gerrit Meier
2022-05-24 14:07:08 +02:00
parent c73ef80b7c
commit bc5412559d
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/java/org/springframework/data/neo4j/integration/imperative/DynamicRelationshipsIT.java
View File

@@ -214,14 +214,14 @@ class DynamicRelationshipsIT extends DynamicRelationshipsITBase<PersonWithRelati
assertThat(newPerson.getRelatives()).containsOnlyKeys(TypeOfRelative.RELATIVE_1, TypeOfRelative.RELATIVE_2);
assertThat(newPerson.getClubs()).containsOnlyKeys(TypeOfClub.BASEBALL, TypeOfClub.FOOTBALL);
try (Transaction transaction = driver.session().beginTransaction()) {
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
long numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Person))"
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Person) WHERE id(t) = $id " + "RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(2L);
numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Club))"
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Club) WHERE id(t) = $id " + "RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(2L);
@@ -262,14 +262,14 @@ class DynamicRelationshipsIT extends DynamicRelationshipsITBase<PersonWithRelati
pets = newPerson.getPets();
assertThat(pets).containsOnlyKeys(TypeOfPet.MONSTERS, TypeOfPet.FISH);
try (Transaction transaction = driver.session().beginTransaction()) {
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
long numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Pet))"
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Pet) WHERE id(t) = $id RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(3L);
numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Hobby))"
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Hobby) WHERE id(t) = $id RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(2L);

8
src/test/java/org/springframework/data/neo4j/integration/imperative/StringlyTypedDynamicRelationshipsIT.java
View File

@@ -211,12 +211,12 @@ class StringlyTypedDynamicRelationshipsIT extends DynamicRelationshipsITBase<Per
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
long numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Person))"
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Person) WHERE id(t) = $id " + "RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(2L);
numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Club))"
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Club) WHERE id(t) = $id " + "RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(2L);
@@ -257,12 +257,12 @@ class StringlyTypedDynamicRelationshipsIT extends DynamicRelationshipsITBase<Per
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
long numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Pet))"
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Pet) WHERE id(t) = $id RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(3L);
numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Hobby))"
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Hobby) WHERE id(t) = $id RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(2L);

16
src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveDynamicRelationshipsIT.java
View File

@@ -220,14 +220,14 @@ class ReactiveDynamicRelationshipsIT extends DynamicRelationshipsITBase<PersonWi
assertThat(relatives).containsOnlyKeys(TypeOfRelative.RELATIVE_1, TypeOfRelative.RELATIVE_2);
}).verifyComplete();
try (Transaction transaction = driver.session().beginTransaction()) {
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
long numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Person))"
+ " as numberOfRelations", Values.parameters("id", recorded.get(0).getId()))
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Person) WHERE id(t) = $id " + "RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(2L);
numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Club))"
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Club) WHERE id(t) = $id " + "RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(2L);
@@ -272,14 +272,14 @@ class ReactiveDynamicRelationshipsIT extends DynamicRelationshipsITBase<PersonWi
assertThat(writtenPets).containsOnlyKeys(TypeOfPet.MONSTERS, TypeOfPet.FISH);
}).verifyComplete();
try (Transaction transaction = driver.session().beginTransaction()) {
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
long numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Pet))"
+ " as numberOfRelations", Values.parameters("id", recorded.get(0).getId()))
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Pet) WHERE id(t) = $id RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(3L);
numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Hobby))"
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Hobby) WHERE id(t) = $id RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(2L);

12
src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveStringlyTypeDynamicRelationshipsIT.java
View File

@@ -221,12 +221,12 @@ class ReactiveStringlyTypeDynamicRelationshipsIT extends DynamicRelationshipsITB
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
long numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Person))"
+ " as numberOfRelations", Values.parameters("id", recorded.get(0).getId()))
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Person) WHERE id(t) = $id " + "RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(2L);
numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Club))"
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Club) WHERE id(t) = $id " + "RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(2L);
@@ -270,12 +270,12 @@ class ReactiveStringlyTypeDynamicRelationshipsIT extends DynamicRelationshipsITB
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
long numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Pet))"
+ " as numberOfRelations", Values.parameters("id", recorded.get(0).getId()))
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Pet) WHERE id(t) = $id RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(3L);
numberOfRelations = transaction
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Hobby))"
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Hobby) WHERE id(t) = $id RETURN count(r)"
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
.single().get("numberOfRelations").asLong();
assertThat(numberOfRelations).isEqualTo(2L);