Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added clean-up step for new primitive ID tests, cleanup up unused imports in MappingTests.java

Browse Source
This commit is contained in:
J. Brisbin
2011-05-25 13:03:38 -05:00
parent 842c87389d
commit bfc4bc2100
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MappingTests.java
View File

@@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import com.mongodb.DB; import com.mongodb.DB;
import com.mongodb.DBCollection; import com.mongodb.DBCollection;
@@ -39,14 +38,11 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.core.convert.converter.Converter;
import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessException;
import org.springframework.data.document.mongodb.CollectionCallback; import org.springframework.data.document.mongodb.CollectionCallback;
import org.springframework.data.document.mongodb.MongoCollectionUtils; import org.springframework.data.document.mongodb.MongoCollectionUtils;
import org.springframework.data.document.mongodb.MongoDbUtils; import org.springframework.data.document.mongodb.MongoDbUtils;
import org.springframework.data.document.mongodb.MongoTemplate; import org.springframework.data.document.mongodb.MongoTemplate;
import org.springframework.data.document.mongodb.convert.CustomConvertersUnitTests.Foo;
import org.springframework.data.document.mongodb.convert.MappingMongoConverter;
import org.springframework.data.document.mongodb.query.Criteria; import org.springframework.data.document.mongodb.query.Criteria;
import org.springframework.data.document.mongodb.query.Query; import org.springframework.data.document.mongodb.query.Query;
@@ -56,7 +52,7 @@ import org.springframework.data.document.mongodb.query.Query;
public class MappingTests { public class MappingTests {
private static final Log LOGGER = LogFactory.getLog(MongoDbUtils.class); private static final Log LOGGER = LogFactory.getLog(MongoDbUtils.class);
private final String[] collectionsToDrop = new String[] { private final String[] collectionsToDrop = new String[]{
MongoCollectionUtils.getPreferredCollectionName(Person.class), MongoCollectionUtils.getPreferredCollectionName(Person.class),
MongoCollectionUtils.getPreferredCollectionName(PersonMapProperty.class), MongoCollectionUtils.getPreferredCollectionName(PersonMapProperty.class),
MongoCollectionUtils.getPreferredCollectionName(PersonPojo.class), MongoCollectionUtils.getPreferredCollectionName(PersonPojo.class),
@@ -66,7 +62,8 @@ public class MappingTests {
MongoCollectionUtils.getPreferredCollectionName(PersonWithDbRef.class), MongoCollectionUtils.getPreferredCollectionName(PersonWithDbRef.class),
MongoCollectionUtils.getPreferredCollectionName(PersonNullProperties.class), MongoCollectionUtils.getPreferredCollectionName(PersonNullProperties.class),
MongoCollectionUtils.getPreferredCollectionName(Account.class), MongoCollectionUtils.getPreferredCollectionName(Account.class),
"foobar", "geolocation", "person1", "person2", "account" }; MongoCollectionUtils.getPreferredCollectionName(PrimitiveId.class),
"foobar", "geolocation", "person1", "person2", "account"};
ApplicationContext applicationContext; ApplicationContext applicationContext;
MongoTemplate template; MongoTemplate template;
@@ -158,11 +155,11 @@ public class MappingTests {
} }
@Test @Test
@SuppressWarnings({ "unchecked" }) @SuppressWarnings({"unchecked"})
public void testWriteEntity() { public void testWriteEntity() {
Address addr = new Address(); Address addr = new Address();
addr.setLines(new String[] { "1234 W. 1st Street", "Apt. 12" }); addr.setLines(new String[]{"1234 W. 1st Street", "Apt. 12"});
addr.setCity("Anytown"); addr.setCity("Anytown");
addr.setPostalCode(12345); addr.setPostalCode(12345);
addr.setCountry("USA"); addr.setCountry("USA");
@@ -193,11 +190,11 @@ public class MappingTests {
assertThat(result.get(0).getAccounts(), notNullValue()); assertThat(result.get(0).getAccounts(), notNullValue());
} }
@SuppressWarnings({ "unchecked" }) @SuppressWarnings({"unchecked"})
@Test @Test
public void testUniqueIndex() { public void testUniqueIndex() {
Address addr = new Address(); Address addr = new Address();
addr.setLines(new String[] { "1234 W. 1st Street", "Apt. 12" }); addr.setLines(new String[]{"1234 W. 1st Street", "Apt. 12"});
addr.setCity("Anytown"); addr.setCity("Anytown");
addr.setPostalCode(12345); addr.setPostalCode(12345);
addr.setCountry("USA"); addr.setCountry("USA");
@@ -229,7 +226,7 @@ public class MappingTests {
@Test @Test
public void testPrimitivesAndCustomCollectionName() { public void testPrimitivesAndCustomCollectionName() {
Location loc = new Location(new double[] { 1.0, 2.0 }, new int[] { 1, 2, 3, 4 }, new float[] { 1.0f, 2.0f }); Location loc = new Location(new double[]{1.0, 2.0}, new int[]{1, 2, 3, 4}, new float[]{1.0f, 2.0f});
template.insert(loc); template.insert(loc);
List<Location> result = template.find("places", new Query(Criteria.where("_id").is(loc.getId())), Location.class); List<Location> result = template.find("places", new Query(Criteria.where("_id").is(loc.getId())), Location.class);
@@ -272,8 +269,8 @@ public class MappingTests {
@Test @Test
public void testMultiDimensionalArrayProperties() { public void testMultiDimensionalArrayProperties() {
String[][] grid = new String[][] { new String[] { "1", "2", "3", "4" }, new String[] { "5", "6", "7", "8" }, String[][] grid = new String[][]{new String[]{"1", "2", "3", "4"}, new String[]{"5", "6", "7", "8"},
new String[] { "9", "10", "11", "12" } }; new String[]{"9", "10", "11", "12"}};
PersonMultiDimArrays p = new PersonMultiDimArrays(123, "Multi", "Dimensional", grid); PersonMultiDimArrays p = new PersonMultiDimArrays(123, "Multi", "Dimensional", grid);
template.insert(p); template.insert(p);
@@ -306,7 +303,7 @@ public class MappingTests {
@Test @Test
public void testDbRef() { public void testDbRef() {
double[] pos = new double[] { 37.0625, -95.677068 }; double[] pos = new double[]{37.0625, -95.677068};
GeoLocation geo = new GeoLocation(pos); GeoLocation geo = new GeoLocation(pos);
template.insert(geo); template.insert(geo);
@@ -326,11 +323,11 @@ public class MappingTests {
assertNotNull(p.getId()); assertNotNull(p.getId());
} }
@SuppressWarnings({ "unchecked" }) @SuppressWarnings({"unchecked"})
@Test @Test
public void testQueryUpdate() { public void testQueryUpdate() {
Address addr = new Address(); Address addr = new Address();
addr.setLines(new String[] { "1234 W. 1st Street", "Apt. 12" }); addr.setLines(new String[]{"1234 W. 1st Street", "Apt. 12"});
addr.setCity("Anytown"); addr.setCity("Anytown");
addr.setPostalCode(12345); addr.setPostalCode(12345);
addr.setCountry("USA"); addr.setCountry("USA");
@@ -370,7 +367,7 @@ public class MappingTests {
PrimitiveId p2 = template.findOne(query(where("id").is(1)), PrimitiveId.class); PrimitiveId p2 = template.findOne(query(where("id").is(1)), PrimitiveId.class);
assertNotNull(p2); assertNotNull(p2);
} }
} }