From 114489d19aa86c1ddbbf9ce379eab320ce022dde Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@vmware.com>
Date: Mon, 3 Sep 2012 16:46:53 +0200
Subject: [PATCH] DATAMONGO-521 - Added test case to show that repository AND
 query works.

---
 ...bstractPersonRepositoryIntegrationTests.java | 17 +++++++++++++++++
 .../mongodb/repository/PersonRepository.java    |  2 ++
 .../PersonRepositoryIntegrationTests.java       |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java
index 28f643789..99cd7bc6d 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java
@@ -506,4 +506,21 @@ public abstract class AbstractPersonRepositoryIntegrationTests {
 		assertThat(result, not(hasItem(dave)));
 		assertThat(result, hasSize(5));
 	}
+
+	/**
+	 * @see DATAMONGO-521
+	 */
+	@Test
+	public void executesAndQueryCorrectly() {
+
+		List<Person> result = repository.findByFirstnameAndLastname("Dave", "Matthews");
+
+		assertThat(result, hasSize(1));
+		assertThat(result, hasItem(dave));
+
+		result = repository.findByFirstnameAndLastname("Oliver August", "Matthews");
+
+		assertThat(result, hasSize(1));
+		assertThat(result, hasItem(oliver));
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java
index e2af969b7..bf35a99b6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java
@@ -106,6 +106,8 @@ public interface PersonRepository extends MongoRepository<Person, String>, Query
 	 */
 	List<Person> findByFirstnameNotIn(Collection<String> firstnames);
 
+	List<Person> findByFirstnameAndLastname(String firstname, String lastname);
+
 	/**
 	 * Returns all {@link Person}s with an age between the two given values.
 	 * 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests.java
index 45ebae97e..51196811e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2010-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.