GH-2346 - Add additional tests for verifying persistence of related entities with assigned ids.

There is no need for an additional fix, the root cause had been addressed in #2347 already.

This closes #2346.

Author: michael-simons

src/test/java/org/springframework/data/neo4j/integration/issues/gh2347/GH2347IT.java

@@ -51,7 +51,7 @@ void entitiesWithAssignedIdsSavedInBatchMustBeIdentifiableWithTheirInternalIds(
 		List<Application> savedApplications = applicationRepository.saveAll(Collections.singletonList(createData()));
 
 		assertThat(savedApplications).hasSize(1);
-		assertDatabase(driver, bookmarkCapture);
+		assertSingleApplicationNodeWithMultipleWorkflows(driver, bookmarkCapture);
 	}
 
 	@Test
@@ -61,12 +61,43 @@ void entitiesWithAssignedIdsMustBeIdentifiableWithTheirInternalIds(
 			@Autowired BookmarkCapture bookmarkCapture
 	) {
 		applicationRepository.save(createData());
-		assertDatabase(driver, bookmarkCapture);
+		assertSingleApplicationNodeWithMultipleWorkflows(driver, bookmarkCapture);
+	}
+
+	@Test // GH-2346
+	void relationshipsStartingAtEntitiesWithAssignedIdsShouldBeCreated(
+			@Autowired ApplicationRepository applicationRepository,
+			@Autowired Driver driver,
+			@Autowired BookmarkCapture bookmarkCapture
+	) {
+		createData((applications, workflows) -> {
+			List<Application> savedApplications = applicationRepository.saveAll(applications);
+
+			assertThat(savedApplications).hasSize(2);
+			assertMultipleApplicationsNodeWithASingleWorkflow(driver, bookmarkCapture);
+		});
+	}
+
+	@Test // GH-2346
+	void relationshipsStartingAtEntitiesWithAssignedIdsShouldBeCreatedOtherDirection(
+			@Autowired WorkflowRepository workflowRepository,
+			@Autowired Driver driver,
+			@Autowired BookmarkCapture bookmarkCapture
+	) {
+		createData((applications, workflows) -> {
+			List<Workflow> savedWorkflows = workflowRepository.saveAll(workflows);
+
+			assertThat(savedWorkflows).hasSize(2);
+			assertMultipleApplicationsNodeWithASingleWorkflow(driver, bookmarkCapture);
+		});
 	}
 
 	interface ApplicationRepository extends Neo4jRepository<Application, String> {
 	}
 
+	interface WorkflowRepository extends Neo4jRepository<Workflow, String> {
+	}
+
 	@Configuration
 	@EnableTransactionManagement
 	@EnableNeo4jRepositories(considerNestedRepositories = true)

src/test/java/org/springframework/data/neo4j/integration/issues/gh2347/ReactiveGH2347IT.java

@@ -52,7 +52,7 @@ void entitiesWithAssignedIdsSavedInBatchMustBeIdentifiableWithTheirInternalIds(
 				.expectNextCount(1L)
 				.verifyComplete();
 
-		assertDatabase(driver, bookmarkCapture);
+		assertSingleApplicationNodeWithMultipleWorkflows(driver, bookmarkCapture);
 	}
 
 	@Test
@@ -66,12 +66,47 @@ void entitiesWithAssignedIdsMustBeIdentifiableWithTheirInternalIds(
 				.as(StepVerifier::create)
 				.expectNextCount(1L)
 				.verifyComplete();
-		assertDatabase(driver, bookmarkCapture);
+		assertSingleApplicationNodeWithMultipleWorkflows(driver, bookmarkCapture);
+	}
+
+	@Test // GH-2346
+	void relationshipsStartingAtEntitiesWithAssignedIdsShouldBeCreated(
+			@Autowired ApplicationRepository applicationRepository,
+			@Autowired Driver driver,
+			@Autowired BookmarkCapture bookmarkCapture
+	) {
+		createData((applications, workflows) -> {
+			applicationRepository.saveAll(applications)
+					.as(StepVerifier::create)
+					.expectNextCount(2L)
+					.verifyComplete();
+
+			assertMultipleApplicationsNodeWithASingleWorkflow(driver, bookmarkCapture);
+		});
+	}
+
+	@Test // GH-2346
+	void relationshipsStartingAtEntitiesWithAssignedIdsShouldBeCreatedOtherDirection(
+			@Autowired WorkflowRepository workflowRepository,
+			@Autowired Driver driver,
+			@Autowired BookmarkCapture bookmarkCapture
+	) {
+		createData((applications, workflows) -> {
+			workflowRepository.saveAll(workflows)
+					.as(StepVerifier::create)
+					.expectNextCount(2L)
+					.verifyComplete();
+
+			assertMultipleApplicationsNodeWithASingleWorkflow(driver, bookmarkCapture);
+		});
 	}
 
 	interface ApplicationRepository extends ReactiveNeo4jRepository<Application, String> {
 	}
 
+	interface WorkflowRepository extends ReactiveNeo4jRepository<Workflow, String> {
+	}
+
 	@Configuration
 	@EnableTransactionManagement
 	@EnableReactiveNeo4jRepositories(considerNestedRepositories = true)

src/test/java/org/springframework/data/neo4j/integration/issues/gh2347/TestBase.java

@@ -18,7 +18,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.UUID;
+import java.util.function.BiConsumer;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.neo4j.driver.Driver;
@@ -60,7 +62,22 @@ protected final Application createData() {
 		return app1;
 	}
 
-	protected final void assertDatabase(Driver driver, BookmarkCapture bookmarkCapture) {
+	protected final void createData(BiConsumer<List<Application>, List<Workflow>> actualTest) {
+
+		Application app1 = new Application("app-1");
+		Workflow wf1 = new Workflow("wf-1");
+		wf1.setApplication(app1);
+		app1.getWorkflows().add(wf1);
+
+		Application app2 = new Application("app-2");
+		Workflow wf2 = new Workflow("wf-2");
+		wf2.setApplication(app2);
+		app2.getWorkflows().add(wf2);
+
+		actualTest.accept(Arrays.asList(app1, app2), Arrays.asList(wf1, wf2));
+	}
+
+	protected final void assertSingleApplicationNodeWithMultipleWorkflows(Driver driver, BookmarkCapture bookmarkCapture) {
 
 		try (Session session = driver.session(bookmarkCapture.createSessionConfig())) {
 			Record record = session.readTransaction(
@@ -70,4 +87,19 @@ protected final void assertDatabase(Driver driver, BookmarkCapture bookmarkCaptu
 					"wf-1", "wf-2");
 		}
 	}
+
+	protected final void assertMultipleApplicationsNodeWithASingleWorkflow(Driver driver, BookmarkCapture bookmarkCapture) {
+
+		try (Session session = driver.session(bookmarkCapture.createSessionConfig())) {
+			List<Record> records = session.readTransaction(
+					tx -> tx.run("MATCH (a:Application)-->(w) RETURN a, collect(w) as workflows").list());
+			assertThat(records).hasSize(2);
+			assertThat(records.get(0).get("a").asNode().get("id").asString()).isEqualTo("app-1");
+			assertThat(records.get(0).get("workflows")
+					.asList(v -> v.asNode().get("id").asString())).containsExactlyInAnyOrder("wf-1");
+			assertThat(records.get(1).get("a").asNode().get("id").asString()).isEqualTo("app-2");
+			assertThat(records.get(1).get("workflows")
+					.asList(v -> v.asNode().get("id").asString())).containsExactlyInAnyOrder("wf-2");
+		}
+	}
 }