From 348924b865c6077f0e452c4440171d0a6c9af6a6 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mark.pollack@springsource.com>
Date: Thu, 7 Apr 2011 14:13:24 -0400
Subject: [PATCH] Quick fix of failing test

---
 .../mongodb/mapping/GeoIndexedAppConfig.java  | 28 +++++++++++++++++++
 .../mongodb/mapping/GeoIndexedTests.java      | 14 +++++++---
 .../document/mongodb/mapping/GeoLocation.java |  4 +--
 3 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/GeoIndexedAppConfig.java

diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/GeoIndexedAppConfig.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/GeoIndexedAppConfig.java
new file mode 100644
index 000000000..78d124885
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/GeoIndexedAppConfig.java
@@ -0,0 +1,28 @@
+package org.springframework.data.document.mongodb.mapping;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.document.mongodb.MongoTemplate;
+import org.springframework.data.document.mongodb.config.AbstractMongoConfiguration;
+
+import com.mongodb.Mongo;
+
+public class GeoIndexedAppConfig extends AbstractMongoConfiguration {
+
+  public static String GEO_DB = "geodb";
+  public static String GEO_COLLECTION = "geolocation";
+  @Bean
+  public Mongo mongo() throws Exception {
+    return new Mongo("localhost");
+  }
+  
+  @Bean
+  public MongoTemplate mongoTemplate() throws Exception {
+    return new MongoTemplate(mongo(), "geodb", "geolocation", mappingMongoConverter());
+  }
+      
+
+  public String getMappingBasePackage() {
+    return "org.springframework.data.document.mongodb.mapping";
+  }
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/GeoIndexedTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/GeoIndexedTests.java
index cbc0506af..80cda12b8 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/GeoIndexedTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/GeoIndexedTests.java
@@ -28,10 +28,16 @@ import com.mongodb.MongoException;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.document.mongodb.CollectionCallback;
 import org.springframework.data.document.mongodb.MongoTemplate;
+import org.springframework.data.document.mongodb.config.AbstractMongoConfiguration;
+import org.springframework.data.document.mongodb.mapping.event.LoggingEventListener;
+import org.springframework.data.document.mongodb.mapping.event.MongoMappingEvent;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
@@ -39,7 +45,7 @@ import org.springframework.data.document.mongodb.MongoTemplate;
 public class GeoIndexedTests {
 
 	private final String[] collectionsToDrop = new String[]{
-			"geolocation"
+			GeoIndexedAppConfig.GEO_COLLECTION
 	};
 
 	ApplicationContext applicationContext;
@@ -49,11 +55,11 @@ public class GeoIndexedTests {
 	@Before
 	public void setUp() throws Exception {
 		Mongo mongo = new Mongo();
-		DB db = mongo.getDB("database");
+		DB db = mongo.getDB(GeoIndexedAppConfig.GEO_DB);
 		for (String coll : collectionsToDrop) {
 			db.getCollection(coll).drop();
 		}
-		applicationContext = new ClassPathXmlApplicationContext("/mapping.xml");
+		applicationContext = new AnnotationConfigApplicationContext(GeoIndexedAppConfig.class);
 		template = applicationContext.getBean(MongoTemplate.class);
 		mappingContext = applicationContext.getBean(MongoMappingContext.class);
 	}
@@ -77,5 +83,5 @@ public class GeoIndexedTests {
 
 		assertTrue(hasIndex);
 	}
-
+	
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/GeoLocation.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/GeoLocation.java
index 91e935914..653ee975a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/GeoLocation.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/GeoLocation.java
@@ -23,12 +23,12 @@ import org.springframework.data.document.mongodb.index.GeoSpatialIndexed;
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
  */
-@Document
+@Document(collection="geolocation")
 public class GeoLocation {
 
 	@Id
 	private ObjectId id;
-	@GeoSpatialIndexed
+	@GeoSpatialIndexed(collection="geolocation")
 	private double[] location;
 
 	public GeoLocation(double[] location) {