mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trying to fix merge conflicts.

Browse Source
This commit is contained in:
Jon Brisbin
2011-03-07 15:50:24 -06:00
committed by J. Brisbin
parent 1d1ee36b5a
commit 8949d53252
3 changed files with 510 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -1,3 +1,6 @@
.DS_Store
*.iml
*.ipr
target
.springBeans
.ant-targets-build.xml

35
spring-data-couchdb/pom.xml
View File

@@ -11,7 +11,6 @@
<packaging>jar</packaging>
<name>Spring Data CouchDB Support</name>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -65,12 +64,6 @@
<scope>test</scope>
</dependency>
<!-- Spring Data -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-document-core</artifactId>
</dependency>
<!-- Jackson JSON -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
@@ -128,12 +121,6 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -147,8 +134,26 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<!-- Couch DB -->
<dependency>
<groupId>com.google.code.jcouchdb</groupId>
<artifactId>jcouchdb</artifactId>
<version>0.11.0-1</version>
</dependency>
</dependencies>
<!--
<build>
<plugins>
<plugin>
@@ -157,5 +162,5 @@
</plugin>
</plugins>
</build>
-->
</project>

27
spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/SimpleMongoConverterTests.java
View File

@@ -15,8 +15,15 @@
*/
package org.springframework.data.document.mongodb;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import com.mongodb.util.JSON;
import org.junit.Before;
import org.junit.Test;
import org.springframework.data.document.mongodb.SomeEnumTest.NumberEnum;
import org.springframework.data.document.mongodb.SomeEnumTest.StringEnum;
import org.springframework.data.document.mongodb.convert.SimpleMongoConverter;
import org.springframework.util.ReflectionUtils;
import java.lang.reflect.Field;
import java.math.BigInteger;
@@ -25,16 +32,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.springframework.data.document.mongodb.SomeEnumTest.NumberEnum;
import org.springframework.data.document.mongodb.SomeEnumTest.StringEnum;
import org.springframework.data.document.mongodb.convert.SimpleMongoConverter;
import org.springframework.util.ReflectionUtils;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import com.mongodb.util.JSON;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
public class SimpleMongoConverterTests {
@@ -158,8 +157,8 @@ public class SimpleMongoConverterTests {
t2.setTicker("MSFT");
t2.setQuantity(100);
t2.setPrice(27.92D);
tb.setTrades(new Trade[] { t2, t1 });
tb.setTradeList(Arrays.asList(new Trade[] { t1, t2 }));
tb.setTrades(new Trade[]{t2, t1});
tb.setTradeList(Arrays.asList(new Trade[]{t1, t2}));
return tb;
}