From 143c1eee3e08868db0afbf0b8869177a9036f1ff Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 31 Oct 2024 17:12:30 -0400 Subject: [PATCH] Fix `ImapMailReceiverTests` according to the latest codebase --- .../integration/mail/ImapMailReceiverTests.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java index 7f6bc7e057..83f7ca8cd0 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java @@ -382,11 +382,10 @@ public class ImapMailReceiverTests { Expression selectorExpression = new SpelExpressionParser().parseExpression("false"); receiver.setSelectorExpression(selectorExpression); receiveAndMarkAsReadDontDeleteGuts(receiver, msg1, msg2); - verify(logger, times(2)).isDebugEnabled(); - verify(msg1, never()).isExpunged(); - verify(msg2, never()).isExpunged(); - verify(msg1, never()).getSubject(); - verify(msg2, never()).getSubject(); + verify(msg1).isExpunged(); + verify(msg2).isExpunged(); + verify(msg1).getSubject(); + verify(msg2).getSubject(); verify(logger, never()).debug(Mockito.startsWith("Expunged message received")); verify(logger, never()).debug(org.mockito.ArgumentMatchers.contains("will be discarded by the matching filter")); } @@ -407,13 +406,11 @@ public class ImapMailReceiverTests { Expression selectorExpression = new SpelExpressionParser().parseExpression("false"); receiver.setSelectorExpression(selectorExpression); receiveAndMarkAsReadDontDeleteGuts(receiver, msg1, msg2); - verify(logger, times(2)).isDebugEnabled(); verify(msg1).isExpunged(); verify(msg2).isExpunged(); verify(msg1, never()).getSubject(); verify(msg2).getSubject(); verify(logger).debug(Mockito.startsWith("Expunged message discarded")); - verify(logger).debug(org.mockito.ArgumentMatchers.contains("'msg2' will be discarded by the matching filter")); } @Test @@ -1066,6 +1063,7 @@ public class ImapMailReceiverTests { } super.writeTo(os); } + } }