Skip to content

Commit 619a910

Browse files
committed
Default static mock to callsRealMethod and only stub specific method
1 parent acf9dea commit 619a910

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

modules/simple-java-mail/src/test/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageHelper2Test.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.junit.Test;
55
import org.junit.runner.RunWith;
66
import org.mockito.BDDMockito;
7+
import org.mockito.internal.stubbing.answers.CallsRealMethods;
78
import org.powermock.api.mockito.PowerMockito;
89
import org.powermock.core.classloader.annotations.PowerMockIgnore;
910
import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -43,19 +44,13 @@ public void testSignMessageWithDKIM_ShouldFailSpecificallyBecauseDKIMLibraryIsMi
4344
.build())
4445
.buildEmail();
4546

46-
PowerMockito.mockStatic(MiscUtil.class);
47-
BDDMockito.given(MiscUtil.classAvailable("org.simplejavamail.internal.smimesupport.SMIMESupport")).willCallRealMethod();
47+
PowerMockito.mockStatic(MiscUtil.class, new CallsRealMethods());
4848
BDDMockito.given(MiscUtil.classAvailable("org.simplejavamail.internal.dkimsupport.DKIMSigner")).willReturn(false);
49-
BDDMockito.given(MiscUtil.valueNullOrEmpty(null)).willCallRealMethod();
50-
BDDMockito.given(MiscUtil.encodeText(anyString())).willCallRealMethod();
5149

5250
assertThatThrownBy(() -> EmailConverter.emailToMimeMessage(email))
5351
.hasMessage("DKIM module not found, make sure it is on the classpath (https://github.com/bbottema/simple-java-mail/tree/develop/modules/dkim-module)");
5452

55-
PowerMockito.mockStatic(MiscUtil.class);
56-
BDDMockito.given(MiscUtil.classAvailable("org.simplejavamail.internal.dkimsupport.DKIMSigner")).willCallRealMethod();
57-
BDDMockito.given(MiscUtil.valueNullOrEmpty(null)).willCallRealMethod();
58-
BDDMockito.given(MiscUtil.encodeText(anyString())).willCallRealMethod();
53+
PowerMockito.mockStatic(MiscUtil.class, new CallsRealMethods());
5954

6055
assertThatThrownBy(() -> EmailConverter.emailToMimeMessage(email))
6156
.isInstanceOf(Class.forName("org.simplejavamail.internal.dkimsupport.DKIMSigningException"))

0 commit comments

Comments
 (0)