Skip to content

Commit da5d3b5

Browse files
author
Patrick Valsecchi
committed
Fix fullmock integration with javamail 1.6.2
Closes #4
1 parent 73266c1 commit da5d3b5

File tree

13 files changed

+94
-11
lines changed

13 files changed

+94
-11
lines changed

pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<name>Nexus Release Repository</name>
6262
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
6363
</repository>
64-
64+
6565
<!--<repository>
6666
<id>bintray-salyh-maven-javamail-mock2</id>
6767
<name>salyh-maven-javamail-mock2</name>
@@ -124,6 +124,7 @@
124124
<includes>
125125
<include>**/*Test*.java</include>
126126
</includes>
127+
<useSystemClassLoader>false</useSystemClassLoader>
127128
</configuration>
128129
</plugin>
129130

@@ -203,7 +204,7 @@
203204
<dependency>
204205
<groupId>com.sun.mail</groupId>
205206
<artifactId>javax.mail</artifactId>
206-
<version>1.5.2</version>
207+
<version>1.6.2</version>
207208
<exclusions>
208209
<exclusion>
209210
<artifactId>activation</artifactId>

pom_fullmock.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<name>Nexus Release Repository</name>
6262
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
6363
</repository>
64-
64+
6565
<!--<repository>
6666
<id>bintray-salyh-maven-javamail-mock2</id>
6767
<name>salyh-maven-javamail-mock2</name>
@@ -124,6 +124,10 @@
124124
<includes>
125125
<include>**/*Test*.java</include>
126126
</includes>
127+
<useSystemClassLoader>false</useSystemClassLoader>
128+
<systemPropertyVariables>
129+
<javamail.mock.full>true</javamail.mock.full>
130+
</systemPropertyVariables>
127131
</configuration>
128132
</plugin>
129133

@@ -203,7 +207,7 @@
203207
<dependency>
204208
<groupId>com.sun.mail</groupId>
205209
<artifactId>javax.mail</artifactId>
206-
<version>1.5.2</version>
210+
<version>1.6.2</version>
207211
<exclusions>
208212
<exclusion>
209213
<artifactId>activation</artifactId>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package de.saly.javamail.mock2.provider;
2+
3+
import de.saly.javamail.mock2.IMAPMockStore;
4+
5+
import javax.mail.Provider;
6+
7+
public class IMAPMockProvider extends Provider {
8+
public IMAPMockProvider() {
9+
super(Type.STORE, "imap", IMAPMockStore.class.getName(), "saly.de", null);
10+
}
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package de.saly.javamail.mock2.provider;
2+
3+
import de.saly.javamail.mock2.IMAPSSLMockStore;
4+
5+
import javax.mail.Provider;
6+
7+
public class IMAPSSLMockProvider extends Provider {
8+
public IMAPSSLMockProvider() {
9+
super(Type.STORE, "imaps", IMAPSSLMockStore.class.getName(), "saly.de", null);
10+
}
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package de.saly.javamail.mock2.provider;
2+
3+
import de.saly.javamail.mock2.POP3MockStore;
4+
5+
import javax.mail.Provider;
6+
7+
public class POP3MockProvider extends Provider {
8+
public POP3MockProvider() {
9+
super(Type.STORE, "pop3", POP3MockStore.class.getName(), "saly.de", null);
10+
}
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package de.saly.javamail.mock2.provider;
2+
3+
import de.saly.javamail.mock2.POP3SSLMockStore;
4+
5+
import javax.mail.Provider;
6+
7+
public class POP3SSLMockProvider extends Provider {
8+
public POP3SSLMockProvider() {
9+
super(Type.STORE, "pop3s", POP3SSLMockStore.class.getName(), "saly.de", null);
10+
}
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package de.saly.javamail.mock2.provider;
2+
3+
import de.saly.javamail.mock2.MockTransport;
4+
5+
import javax.mail.Provider;
6+
7+
public class SMTPMockProvider extends Provider {
8+
public SMTPMockProvider() {
9+
super(Type.TRANSPORT, "smtp", MockTransport.class.getName(), "saly.de", null);
10+
}
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package de.saly.javamail.mock2.provider;
2+
3+
import de.saly.javamail.mock2.MockTransport;
4+
5+
import javax.mail.Provider;
6+
7+
public class SMTPSSLMockProvider extends Provider {
8+
public SMTPSSLMockProvider() {
9+
super(Type.TRANSPORT, "smtps", MockTransport.class.getName(), "saly.de", null);
10+
}
11+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
de.saly.javamail.mock2.provider.IMAPMockProvider
2+
de.saly.javamail.mock2.provider.IMAPSSLMockProvider
3+
de.saly.javamail.mock2.provider.SMTPMockProvider
4+
de.saly.javamail.mock2.provider.SMTPSSLMockProvider
5+
de.saly.javamail.mock2.provider.POP3MockProvider
6+
de.saly.javamail.mock2.provider.POP3SSLMockProvider

src/test/java/de/saly/javamail/mock2/test/AbstractTestCase.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* =======================================================================
55
*
66
* Copyright (C) 2014 by Hendrik Saly (http://saly.de)
7-
*
7+
*
88
* Based on ideas from Kohsuke Kawaguchi's Mock-javamail (https://java.net/projects/mock-javamail)
99
*
1010
***********************************************************************************************************************
@@ -72,4 +72,8 @@ public void tearDown() throws Exception {
7272

7373
}
7474

75+
protected boolean isFull() {
76+
return System.getProperty("javamail.mock.full", "false").equals("true");
77+
}
78+
7579
}

0 commit comments

Comments
 (0)