diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle index cbfd0c4..615acc1 100644 --- a/gradle/test/junit5.gradle +++ b/gradle/test/junit5.gradle @@ -18,7 +18,8 @@ test { '--add-opens=java.base/java.lang.reflect=ALL-UNNAMED', '--add-opens=java.base/java.io=ALL-UNNAMED', '--add-opens=java.base/java.nio=ALL-UNNAMED', - '--add-opens=java.base/java.util=ALL-UNNAMED' + '--add-opens=java.base/java.util=ALL-UNNAMED', + '--add-opens=java.base/sun.security.util=ALL-UNNAMED' systemProperty 'java.util.logging.config.file', 'src/test/resources/logging.properties' environment 'NOTIFY_SOCKET', '/run/systemd/notify' testLogging { diff --git a/net-mail/src/main/java/jakarta/mail/Session.java b/net-mail/src/main/java/jakarta/mail/Session.java index 41572ad..847a89d 100644 --- a/net-mail/src/main/java/jakarta/mail/Session.java +++ b/net-mail/src/main/java/jakarta/mail/Session.java @@ -1133,9 +1133,7 @@ public final class Session { currLine); continue; } - Provider provider = new Provider(type, protocol, className, - vendor, version); - + Provider provider = new Provider(type, protocol, className, vendor, version); // add the newly-created Provider to the lookup tables addProvider(provider); } diff --git a/net-mail/src/test/java/org/xbib/net/mail/test/util/MimeMultipartParseTest.java b/net-mail/src/test/java/org/xbib/net/mail/test/util/MimeMultipartParseTest.java index 70baa5f..99723e9 100644 --- a/net-mail/src/test/java/org/xbib/net/mail/test/util/MimeMultipartParseTest.java +++ b/net-mail/src/test/java/org/xbib/net/mail/test/util/MimeMultipartParseTest.java @@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; */ public class MimeMultipartParseTest { - private static Session session = + private static final Session session = Session.getInstance(new Properties(), null); private static final int maxsize = 10000; @@ -63,7 +63,7 @@ public class MimeMultipartParseTest { * although it still takes about 30 seconds, which is on the long side * for a unit test. */ - public void test(boolean shared) throws Exception { + private void test(boolean shared) throws Exception { testMessage(1, shared); testMessage(2, shared); testMessage(62, shared); @@ -73,11 +73,12 @@ public class MimeMultipartParseTest { testMessage(1023, shared); testMessage(1024, shared); testMessage(1025, shared); - for (int size = 8100; size <= maxsize; size++) + for (int size = 8100; size <= maxsize; size++) { testMessage(size, shared); + } } - public void testMessage(int size, boolean shared) throws Exception { + private void testMessage(int size, boolean shared) throws Exception { //System.out.println("SIZE: " + size); /* * Construct a multipart message with a part of the diff --git a/net-mail/src/test/resources/META-INF/javamail.default.providers b/net-mail/src/test/resources/META-INF/javamail.default.providers new file mode 100644 index 0000000..c3e9f8d --- /dev/null +++ b/net-mail/src/test/resources/META-INF/javamail.default.providers @@ -0,0 +1,6 @@ +protocol=imap; type=store; class=org.xbib.net.mail.imap.IMAPStore; vendor=xbib; +protocol=imaps; type=store; class=org.xbib.net.mail.imap.IMAPSSLStore; vendor=xbib; +protocol=pop3; type=store; class=org.xbib.net.mail.pop3.POP3Store; vendor=xbib; +protocol=pop3s; type=store; class=org.xbib.net.mail.pop3.POP3SSLStore; vendor=xbib; +protocol=smtp; type=transport; class=org.xbib.net.mail.smtp.SMTPTransport; vendor=xbib; +protocol=smtps; type=transport; class=org.xbib.net.mail.smtp.SMTPSSLTransport; vendor=xbib; diff --git a/net-mail/src/test/resources/META-INF/services/jakarta.mail.Provider b/net-mail/src/test/resources/META-INF/services/jakarta.mail.Provider new file mode 100644 index 0000000..2f8a6a6 --- /dev/null +++ b/net-mail/src/test/resources/META-INF/services/jakarta.mail.Provider @@ -0,0 +1,4 @@ +org.xbib.net.mail.pop3.POP3Provider +org.xbib.net.mail.pop3.POP3SSLProvider +org.xbib.net.mail.smtp.SMTPProvider +org.xbib.net.mail.smtp.SMTPSSLProvider diff --git a/net-mail/src/test/resources/META-INF/services/jakarta.mail.util.StreamProvider b/net-mail/src/test/resources/META-INF/services/jakarta.mail.util.StreamProvider new file mode 100644 index 0000000..45c1577 --- /dev/null +++ b/net-mail/src/test/resources/META-INF/services/jakarta.mail.util.StreamProvider @@ -0,0 +1 @@ +org.xbib.net.mail.util.MailStreamProvider \ No newline at end of file diff --git a/net-mail/src/test/resources/logging.properties b/net-mail/src/test/resources/logging.properties index f9ad0c6..b5665ac 100644 --- a/net-mail/src/test/resources/logging.properties +++ b/net-mail/src/test/resources/logging.properties @@ -1,4 +1,4 @@ handlers=java.util.logging.ConsoleHandler -.level=ALL -java.util.logging.ConsoleHandler.level=ALL +.level=INFO +java.util.logging.ConsoleHandler.level=INFO java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter