This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-jsieve.git
commit a34a7313d856aad11841d99fad3c0cad3f562cf2 Author: Rene Cordier <rcord...@linagora.com> AuthorDate: Tue Sep 10 11:54:31 2019 +0700 JSIEVE-111 Upgrade mockito-core 1.9.0 -> 3.0.0 --- .../test/java/org/apache/jsieve/VacationTest.java | 52 +++++++++++++--------- pom.xml | 2 +- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/core/src/test/java/org/apache/jsieve/VacationTest.java b/core/src/test/java/org/apache/jsieve/VacationTest.java index afe3f40..c5c4422 100644 --- a/core/src/test/java/org/apache/jsieve/VacationTest.java +++ b/core/src/test/java/org/apache/jsieve/VacationTest.java @@ -19,6 +19,12 @@ package org.apache.jsieve; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; + import org.apache.jsieve.exception.SyntaxException; import org.apache.jsieve.mail.ActionKeep; import org.apache.jsieve.mail.optional.ActionVacation; @@ -27,12 +33,6 @@ import org.apache.jsieve.utils.SieveMailAdapter; import org.junit.Before; import org.junit.Test; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; - public class VacationTest { private SieveMailAdapter sieveMailAdapter; @@ -111,9 +111,10 @@ public class VacationTest { JUnitUtils.interpret(sieveMailAdapter, script); - verify(sieveMailAdapter, times(2)).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(isNull(SieveContext.class)); verify(sieveMailAdapter).addAction(ActionVacation.builder().reason("reason").build()); - verify(sieveMailAdapter, times(2)).addAction(any(ActionKeep.class)); + verify(sieveMailAdapter).addAction(any(ActionKeep.class)); verify(sieveMailAdapter).executeActions(); verifyNoMoreInteractions(sieveMailAdapter); } @@ -124,9 +125,10 @@ public class VacationTest { JUnitUtils.interpret(sieveMailAdapter, script); - verify(sieveMailAdapter, times(2)).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(isNull(SieveContext.class)); verify(sieveMailAdapter).addAction(ActionVacation.builder().reason("reason").duration(3).build()); - verify(sieveMailAdapter, times(2)).addAction(any(ActionKeep.class)); + verify(sieveMailAdapter).addAction(any(ActionKeep.class)); verify(sieveMailAdapter).executeActions(); verifyNoMoreInteractions(sieveMailAdapter); } @@ -137,9 +139,10 @@ public class VacationTest { JUnitUtils.interpret(sieveMailAdapter, script); - verify(sieveMailAdapter, times(2)).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(isNull(SieveContext.class)); verify(sieveMailAdapter).addAction(ActionVacation.builder().reason("reason").subject("any").build()); - verify(sieveMailAdapter, times(2)).addAction(any(ActionKeep.class)); + verify(sieveMailAdapter).addAction(any(ActionKeep.class)); verify(sieveMailAdapter).executeActions(); verifyNoMoreInteractions(sieveMailAdapter); } @@ -150,9 +153,10 @@ public class VacationTest { JUnitUtils.interpret(sieveMailAdapter, script); - verify(sieveMailAdapter, times(2)).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(isNull(SieveContext.class)); verify(sieveMailAdapter).addAction(ActionVacation.builder().reason("reason").from("be...@apache.org").build()); - verify(sieveMailAdapter, times(2)).addAction(any(ActionKeep.class)); + verify(sieveMailAdapter).addAction(any(ActionKeep.class)); verify(sieveMailAdapter).executeActions(); verifyNoMoreInteractions(sieveMailAdapter); } @@ -164,9 +168,10 @@ public class VacationTest { JUnitUtils.interpret(sieveMailAdapter, script); - verify(sieveMailAdapter, times(2)).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(isNull(SieveContext.class)); verify(sieveMailAdapter).addAction(ActionVacation.builder().reason("reason").build()); - verify(sieveMailAdapter, times(2)).addAction(any(ActionKeep.class)); + verify(sieveMailAdapter).addAction(any(ActionKeep.class)); verify(sieveMailAdapter).executeActions(); verifyNoMoreInteractions(sieveMailAdapter); } @@ -177,9 +182,10 @@ public class VacationTest { JUnitUtils.interpret(sieveMailAdapter, script); - verify(sieveMailAdapter, times(2)).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(isNull(SieveContext.class)); verify(sieveMailAdapter).addAction(ActionVacation.builder().mime("reason").build()); - verify(sieveMailAdapter, times(2)).addAction(any(ActionKeep.class)); + verify(sieveMailAdapter).addAction(any(ActionKeep.class)); verify(sieveMailAdapter).executeActions(); verifyNoMoreInteractions(sieveMailAdapter); } @@ -190,9 +196,10 @@ public class VacationTest { JUnitUtils.interpret(sieveMailAdapter, script); - verify(sieveMailAdapter, times(2)).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(isNull(SieveContext.class)); verify(sieveMailAdapter).addAction(ActionVacation.builder().reason("reason").handle("plop").build()); - verify(sieveMailAdapter, times(2)).addAction(any(ActionKeep.class)); + verify(sieveMailAdapter).addAction(any(ActionKeep.class)); verify(sieveMailAdapter).executeActions(); verifyNoMoreInteractions(sieveMailAdapter); } @@ -225,9 +232,10 @@ public class VacationTest { JUnitUtils.interpret(sieveMailAdapter, script); - verify(sieveMailAdapter, times(2)).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(any(SieveContext.class)); + verify(sieveMailAdapter).setContext(isNull(SieveContext.class)); verify(sieveMailAdapter).addAction(ActionVacation.builder().reason("reason").build()); - verify(sieveMailAdapter, times(2)).addAction(any(ActionKeep.class)); + verify(sieveMailAdapter).addAction(any(ActionKeep.class)); verify(sieveMailAdapter).executeActions(); verifyNoMoreInteractions(sieveMailAdapter); } diff --git a/pom.xml b/pom.xml index 05a67fa..256b4af 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ <mail.version>1.4.7</mail.version> <activation.version>1.1.1</activation.version> <commons-io.version>2.1</commons-io.version> - <mockito-core.version>1.9.0</mockito-core.version> + <mockito-core.version>3.0.0</mockito-core.version> <assertj.version>1.7.1</assertj.version> <guava.version>18.0</guava.version> <mime4j.version>0.8.3</mime4j.version> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org