Additional integration tests

Author: christophstrobl

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryFinderTests.java

@@ -178,6 +178,51 @@ void executesQueryWithEmptyOnCollection() {
 		assertThat(userRepository.findByColleaguesRolesIsNotEmpty()).containsExactlyInAnyOrder(oliver);
 	}
 
+	@Test // GH-4110
+	void executesQueryWithEmptyOnCollectionViaMultipleJoins() {
+
+		carter.setManager(dave);
+		dave.addColleague(oliver);
+		dave.addColleague(carter);
+		userRepository.save(dave);
+		userRepository.save(carter);
+		userRepository.save(oliver);
+
+		userRepository.save(oliver);
+
+		assertThat(userRepository.findByManagerColleaguesRolesIsNotEmpty()).containsExactly(carter);
+	}
+
+	@Test // GH-4110
+	void executesQueryWithContainingOnCollectionViaJoin() {
+
+		dave.addColleague(oliver);
+		oliver.addRole(singer);
+		userRepository.save(dave);
+		userRepository.save(oliver);
+
+		assertThat(userRepository.findByColleaguesRolesContaining(singer)).containsExactlyInAnyOrder(dave, oliver);
+		assertThat(userRepository.findByColleaguesRolesNotContaining(drummer)).containsExactlyInAnyOrder(dave, carter, oliver);
+	}
+
+	@Test // GH-4110
+	void executesQueryWithMultipleCollectionPredicates() {
+
+		dave.addColleague(oliver);
+		dave.getAttributes().add("test");
+		userRepository.save(dave);
+		userRepository.save(oliver);
+
+		assertThat(userRepository.findByColleaguesRolesIsEmptyAndAttributesIsNotEmpty())
+				.containsExactlyInAnyOrder(dave);
+	}
+
+	@Test // GH-4110
+	void executesQueryWithEmptyOnCollectionWithNoColleagues() {
+
+		assertThat(userRepository.findByColleaguesRolesIsEmpty()).containsExactly(dave, carter, oliver);
+	}
+
 	@Test // DATAJPA-92
 	void findsByLastnameIgnoringCase() {
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java

@@ -150,6 +150,14 @@ Window<User> findTop3ByFirstnameStartingWithOrderByFirstnameAscEmailAddressAsc(S
 
 	List<User> findByColleaguesRolesIsNotEmpty();
 
+	List<User> findByManagerColleaguesRolesIsNotEmpty();
+
+	List<User> findByColleaguesRolesContaining(Role role);
+
+	List<User> findByColleaguesRolesNotContaining(Role role);
+
+	List<User> findByColleaguesRolesIsEmptyAndAttributesIsNotEmpty();
+
 	// DATAJPA-292
 	@Query("select u from User u where u.firstname like ?1%")
 	List<User> findByFirstnameLike(String firstname);