This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 31e842662347a31429b80a2cf4d966863caeeeb6 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Tue Dec 13 23:13:06 2016 +0100 refs #1308: Update mockito --- .../test/java/org/chorem/pollen/business/persistence/PollTest.java | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java index f483ee3..5f60a8b 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java @@ -287,8 +287,8 @@ public class PollTest { Mockito.when(poll.isAddChoiceFinished(Mockito.any(Date.class))).thenCallRealMethod(); Mockito.doCallRealMethod().when(poll).setChoiceAddAllowed(Mockito.anyBoolean()); - Mockito.doCallRealMethod().when(poll).setBeginChoiceDate(Mockito.any(Date.class)); - Mockito.doCallRealMethod().when(poll).setEndChoiceDate(Mockito.any(Date.class)); + Mockito.doCallRealMethod().when(poll).setBeginChoiceDate((Date)Mockito.any()); + Mockito.doCallRealMethod().when(poll).setEndChoiceDate((Date)Mockito.any()); // -- choiceAddAllowed -- // // -- choiceAddAllowed -- // diff --git a/pom.xml b/pom.xml index f20abe5..e55e498 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ <jettyPluginVersion>9.3.6.v20151106</jettyPluginVersion> <hibernateVersion>4.3.11.Final</hibernateVersion> <seleniumVersion>3.0.1</seleniumVersion> - <mockitoVersion>1.10.19</mockitoVersion> + <mockitoVersion>2.3.2</mockitoVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle> <!-- license to use --> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.