From 40277707016ba6eef0705192e765a0053cb771e3 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Sun, 13 Oct 2013 12:40:53 +0200 Subject: [PATCH] DATAMONGO-777 - Upgraded to Mongo Java Driver 2.11.3. Upgraded to latest mongo Java Driver release to benefit from new API introduced (required to fix DATAMONGO-534). Adapted test cases to API changes in DuplicateKey. --- pom.xml | 2 +- spring-data-mongodb/pom.xml | 2 +- .../core/MongoExceptionTranslatorUnitTests.java | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 0bed08e1a..0693bbc65 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ multi spring-data-mongodb 1.7.0.BUILD-SNAPSHOT - 2.10.1 + 2.11.3 diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml index da94c8847..f444aae7b 100644 --- a/spring-data-mongodb/pom.xml +++ b/spring-data-mongodb/pom.xml @@ -55,7 +55,7 @@ - + ${project.groupId} spring-data-commons ${springdata.commons} diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoExceptionTranslatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoExceptionTranslatorUnitTests.java index 5d155d9ef..1342aee92 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoExceptionTranslatorUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoExceptionTranslatorUnitTests.java @@ -23,6 +23,9 @@ import java.net.UnknownHostException; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.runners.MockitoJUnitRunner; import org.springframework.core.NestedRuntimeException; import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessResourceFailureException; @@ -43,10 +46,13 @@ import com.mongodb.ServerAddress; * @author Michal Vich * @author Oliver Gierke */ +@RunWith(MockitoJUnitRunner.class) public class MongoExceptionTranslatorUnitTests { MongoExceptionTranslator translator; + @Mock DuplicateKey exception; + @Before public void setUp() { translator = new MongoExceptionTranslator(); @@ -55,10 +61,8 @@ public class MongoExceptionTranslatorUnitTests { @Test public void translateDuplicateKey() { - DuplicateKey exception = new DuplicateKey(1, "Duplicated key"); DataAccessException translatedException = translator.translateExceptionIfPossible(exception); - - expectExceptionWithCauseMessage(translatedException, DuplicateKeyException.class, "Duplicated key"); + expectExceptionWithCauseMessage(translatedException, DuplicateKeyException.class, null); } @Test