Quick fix of failing test

This commit is contained in:
Mark Pollack
2011-04-07 14:13:24 -04:00
parent e2aca7d2d3
commit 348924b865
3 changed files with 40 additions and 6 deletions

View File

@@ -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";
}
}

View File

@@ -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);
}
}

View File

@@ -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) {