From 7708f786f2ced6ca68847c3213c0c209f3b93571 Mon Sep 17 00:00:00 2001
From: Gerrit Meier <meistermeier@gmail.com>
Date: Tue, 8 Feb 2022 08:51:24 +0100
Subject: [PATCH] GH-2473 - Add tests for GH-2470 and GH-2473.

---
 .../movies/imperative/AdvancedMappingIT.java  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/test/java/org/springframework/data/neo4j/integration/movies/imperative/AdvancedMappingIT.java b/src/test/java/org/springframework/data/neo4j/integration/movies/imperative/AdvancedMappingIT.java
index 8260b608a..5f7e96955 100644
--- a/src/test/java/org/springframework/data/neo4j/integration/movies/imperative/AdvancedMappingIT.java
+++ b/src/test/java/org/springframework/data/neo4j/integration/movies/imperative/AdvancedMappingIT.java
@@ -155,6 +155,12 @@ class AdvancedMappingIT {
 
 		@Query("MATCH (m:Movie{title:'The Matrix'})<-[a:ACTED_IN]-(p:Person) WITH a,p,m order by p.name DESC return m, collect(a), collect(p)")
 		Movie findMatrixWithSortedDescActors();
+
+		@Query("MATCH p=(:Movie{title:'The Matrix'}) return p")
+		Movie findSingleNodeWithPath();
+
+		@Query("MATCH p=(m:Movie{title:'The Matrix'})<-[:ACTED_IN]-(:Person) return m, collect(nodes(p)), collect(relationships(p))")
+		List<Movie> findMultipleSameTypeRelationshipsWithPath();
 	}
 
 	@Test // GH-1906
@@ -469,6 +475,7 @@ class AdvancedMappingIT {
 				.containsExactly("Carrie-Anne Moss", "Emil Eifrem", "Gloria Foster", "Hugo Weaving", "Keanu Reeves",
 						"Laurence Fishburne");
 	}
+
 	@Test // GH-2458
 	void findPreservesOrderFromResultDescInRelationshipList(@Autowired MovieRepository repository) {
 		assertThat(repository.findMatrixWithSortedDescActors().getActors()).extracting("person").extracting("name")
@@ -476,6 +483,19 @@ class AdvancedMappingIT {
 						"Carrie-Anne Moss");
 	}
 
+
+	@Test // GH-2470
+	void mapPathWithSingleNode(@Autowired MovieRepository repository) {
+		assertThat(repository.findSingleNodeWithPath()).isNotNull();
+	}
+
+	@Test // GH-2473
+	void mapPathWithMultipleSameTypeRelationships(@Autowired MovieRepository repository) {
+		List<Movie> movies = repository.findMultipleSameTypeRelationshipsWithPath();
+		assertThat(movies).hasSize(1);
+		assertThat(movies.get(0).getActors()).hasSize(6);
+	}
+
 	@Configuration
 	@EnableTransactionManagement
 	@EnableNeo4jRepositories(considerNestedRepositories = true)