Skip to content

Commit bc54125

Browse files
meistermeiermeistermeier
committed
GH-2543 - Fix Neo4j 5.0 Cypher incompatibility in tests.
Closes #2543
1 parent c73ef80 commit bc54125

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎src/test/java/org/springframework/data/neo4j/integration/imperative/DynamicRelationshipsIT.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,14 +214,14 @@ void shouldWriteDynamicRelationships(@Autowired PersonWithRelativesRepository re
214214
assertThat(newPerson.getRelatives()).containsOnlyKeys(TypeOfRelative.RELATIVE_1, TypeOfRelative.RELATIVE_2);
215215
assertThat(newPerson.getClubs()).containsOnlyKeys(TypeOfClub.BASEBALL, TypeOfClub.FOOTBALL);
216216

217-
try (Transaction transaction = driver.session().beginTransaction()) {
217+
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
218218
long numberOfRelations = transaction
219-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Person))"
219+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Person) WHERE id(t) = $id " + "RETURN count(r)"
220220
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
221221
.single().get("numberOfRelations").asLong();
222222
assertThat(numberOfRelations).isEqualTo(2L);
223223
numberOfRelations = transaction
224-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Club))"
224+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Club) WHERE id(t) = $id " + "RETURN count(r)"
225225
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
226226
.single().get("numberOfRelations").asLong();
227227
assertThat(numberOfRelations).isEqualTo(2L);
@@ -262,14 +262,14 @@ void shouldWriteDynamicCollectionRelationships(@Autowired PersonWithRelativesRep
262262
pets = newPerson.getPets();
263263
assertThat(pets).containsOnlyKeys(TypeOfPet.MONSTERS, TypeOfPet.FISH);
264264

265-
try (Transaction transaction = driver.session().beginTransaction()) {
265+
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
266266
long numberOfRelations = transaction
267-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Pet))"
267+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Pet) WHERE id(t) = $id RETURN count(r)"
268268
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
269269
.single().get("numberOfRelations").asLong();
270270
assertThat(numberOfRelations).isEqualTo(3L);
271271
numberOfRelations = transaction
272-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Hobby))"
272+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Hobby) WHERE id(t) = $id RETURN count(r)"
273273
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
274274
.single().get("numberOfRelations").asLong();
275275
assertThat(numberOfRelations).isEqualTo(2L);

‎src/test/java/org/springframework/data/neo4j/integration/imperative/StringlyTypedDynamicRelationshipsIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,12 @@ void shouldWriteDynamicRelationships(@Autowired PersonWithRelativesRepository re
211211

212212
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
213213
long numberOfRelations = transaction
214-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Person))"
214+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Person) WHERE id(t) = $id " + "RETURN count(r)"
215215
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
216216
.single().get("numberOfRelations").asLong();
217217
assertThat(numberOfRelations).isEqualTo(2L);
218218
numberOfRelations = transaction
219-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Club))"
219+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Club) WHERE id(t) = $id " + "RETURN count(r)"
220220
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
221221
.single().get("numberOfRelations").asLong();
222222
assertThat(numberOfRelations).isEqualTo(2L);
@@ -257,12 +257,12 @@ void shouldWriteDynamicCollectionRelationships(@Autowired PersonWithRelativesRep
257257

258258
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
259259
long numberOfRelations = transaction
260-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Pet))"
260+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Pet) WHERE id(t) = $id RETURN count(r)"
261261
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
262262
.single().get("numberOfRelations").asLong();
263263
assertThat(numberOfRelations).isEqualTo(3L);
264264
numberOfRelations = transaction
265-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Hobby))"
265+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Hobby) WHERE id(t) = $id RETURN count(r)"
266266
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
267267
.single().get("numberOfRelations").asLong();
268268
assertThat(numberOfRelations).isEqualTo(2L);

‎src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveDynamicRelationshipsIT.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,14 +220,14 @@ void shouldWriteDynamicRelationships(@Autowired PersonWithRelativesRepository re
220220
assertThat(relatives).containsOnlyKeys(TypeOfRelative.RELATIVE_1, TypeOfRelative.RELATIVE_2);
221221
}).verifyComplete();
222222

223-
try (Transaction transaction = driver.session().beginTransaction()) {
223+
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
224224
long numberOfRelations = transaction
225-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Person))"
226-
+ " as numberOfRelations", Values.parameters("id", recorded.get(0).getId()))
225+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Person) WHERE id(t) = $id " + "RETURN count(r)"
226+
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
227227
.single().get("numberOfRelations").asLong();
228228
assertThat(numberOfRelations).isEqualTo(2L);
229229
numberOfRelations = transaction
230-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Club))"
230+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Club) WHERE id(t) = $id " + "RETURN count(r)"
231231
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
232232
.single().get("numberOfRelations").asLong();
233233
assertThat(numberOfRelations).isEqualTo(2L);
@@ -272,14 +272,14 @@ void shouldWriteDynamicCollectionRelationships(@Autowired PersonWithRelativesRep
272272
assertThat(writtenPets).containsOnlyKeys(TypeOfPet.MONSTERS, TypeOfPet.FISH);
273273
}).verifyComplete();
274274

275-
try (Transaction transaction = driver.session().beginTransaction()) {
275+
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
276276
long numberOfRelations = transaction
277-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Pet))"
278-
+ " as numberOfRelations", Values.parameters("id", recorded.get(0).getId()))
277+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Pet) WHERE id(t) = $id RETURN count(r)"
278+
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
279279
.single().get("numberOfRelations").asLong();
280280
assertThat(numberOfRelations).isEqualTo(3L);
281281
numberOfRelations = transaction
282-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Hobby))"
282+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Hobby) WHERE id(t) = $id RETURN count(r)"
283283
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
284284
.single().get("numberOfRelations").asLong();
285285
assertThat(numberOfRelations).isEqualTo(2L);

‎src/test/java/org/springframework/data/neo4j/integration/reactive/ReactiveStringlyTypeDynamicRelationshipsIT.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,12 @@ void shouldWriteDynamicRelationships(@Autowired PersonWithRelativesRepository re
221221

222222
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
223223
long numberOfRelations = transaction
224-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Person))"
225-
+ " as numberOfRelations", Values.parameters("id", recorded.get(0).getId()))
224+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Person) WHERE id(t) = $id " + "RETURN count(r)"
225+
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
226226
.single().get("numberOfRelations").asLong();
227227
assertThat(numberOfRelations).isEqualTo(2L);
228228
numberOfRelations = transaction
229-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Club))"
229+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Club) WHERE id(t) = $id " + "RETURN count(r)"
230230
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
231231
.single().get("numberOfRelations").asLong();
232232
assertThat(numberOfRelations).isEqualTo(2L);
@@ -270,12 +270,12 @@ void shouldWriteDynamicCollectionRelationships(@Autowired PersonWithRelativesRep
270270

271271
try (Transaction transaction = driver.session(bookmarkCapture.createSessionConfig()).beginTransaction()) {
272272
long numberOfRelations = transaction
273-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Pet))"
274-
+ " as numberOfRelations", Values.parameters("id", recorded.get(0).getId()))
273+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Pet) WHERE id(t) = $id RETURN count(r)"
274+
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
275275
.single().get("numberOfRelations").asLong();
276276
assertThat(numberOfRelations).isEqualTo(3L);
277277
numberOfRelations = transaction
278-
.run("" + "MATCH (t:" + labelOfTestSubject + ") WHERE id(t) = $id " + "RETURN size((t)-->(:Hobby))"
278+
.run("" + "MATCH (t:" + labelOfTestSubject + ")-[r]->(:Hobby) WHERE id(t) = $id RETURN count(r)"
279279
+ " as numberOfRelations", Values.parameters("id", newPerson.getId()))
280280
.single().get("numberOfRelations").asLong();
281281
assertThat(numberOfRelations).isEqualTo(2L);

0 commit comments

Comments
 (0)