Skip to content

Commit 143c1ee

Browse files
committed
Fix ImapMailReceiverTests according to the latest codebase
1 parent e554b67 commit 143c1ee

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -382,11 +382,10 @@ public void receiveAndDebugIsDisabledNotLogFiltered() throws Exception {
382382
Expression selectorExpression = new SpelExpressionParser().parseExpression("false");
383383
receiver.setSelectorExpression(selectorExpression);
384384
receiveAndMarkAsReadDontDeleteGuts(receiver, msg1, msg2);
385-
verify(logger, times(2)).isDebugEnabled();
386-
verify(msg1, never()).isExpunged();
387-
verify(msg2, never()).isExpunged();
388-
verify(msg1, never()).getSubject();
389-
verify(msg2, never()).getSubject();
385+
verify(msg1).isExpunged();
386+
verify(msg2).isExpunged();
387+
verify(msg1).getSubject();
388+
verify(msg2).getSubject();
390389
verify(logger, never()).debug(Mockito.startsWith("Expunged message received"));
391390
verify(logger, never()).debug(org.mockito.ArgumentMatchers.contains("will be discarded by the matching filter"));
392391
}
@@ -407,13 +406,11 @@ public void receiveExpungedAndNotExpungedLogFiltered() throws Exception {
407406
Expression selectorExpression = new SpelExpressionParser().parseExpression("false");
408407
receiver.setSelectorExpression(selectorExpression);
409408
receiveAndMarkAsReadDontDeleteGuts(receiver, msg1, msg2);
410-
verify(logger, times(2)).isDebugEnabled();
411409
verify(msg1).isExpunged();
412410
verify(msg2).isExpunged();
413411
verify(msg1, never()).getSubject();
414412
verify(msg2).getSubject();
415413
verify(logger).debug(Mockito.startsWith("Expunged message discarded"));
416-
verify(logger).debug(org.mockito.ArgumentMatchers.contains("'msg2' will be discarded by the matching filter"));
417414
}
418415

419416
@Test
@@ -1066,6 +1063,7 @@ public void writeTo(OutputStream os) throws IOException, MessagingException {
10661063
}
10671064
super.writeTo(os);
10681065
}
1066+
10691067
}
10701068

10711069
}

0 commit comments

Comments
 (0)