Remove impl test dependency

Signed-off-by: Jorge Bescos Gascon <[email protected]>

Author: jbescos

api/pom.xml

@@ -106,12 +106,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.angus</groupId>
-            <artifactId>angus-mail</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -410,6 +404,8 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
                 <configuration>
                     <forkCount>2</forkCount>
                     <reuseForks>false</reuseForks>
+                    <!-- Test service loader is not loaded if modules are enabled -->
+                    <useModulePath>false</useModulePath>
                 </configuration>
             </plugin>
             <plugin>

api/src/test/java/jakarta/mail/internet/MimeBodyPartTest.java

@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
@@ -32,11 +33,11 @@ public class MimeBodyPartTest {
 
     @Test
     public void sessionProperties() throws MessagingException, IOException {
-        try {
+        InputStream input = new ByteArrayInputStream(new byte[0]);
         Properties prop = new Properties();
-        MimeMessage orig = buildFromProperties(prop);
-        MimeMultipart omp = (MimeMultipart) orig.getContent();
-        MimeBodyPart obp = (MimeBodyPart) omp.getBodyPart(0);
+        Session session = Session.getInstance(prop);
+        MimeMessage orig = new MimeMessage(session, input);
+        MimeBodyPart obp = new MimeBodyPart(session, input);
         // No properties added, so default will be checked
         // MimeMessage
         assertTrue(orig.setDefaultTextCharset);
@@ -62,9 +63,11 @@ public void sessionProperties() throws MessagingException, IOException {
         prop.put("mail.mime.ignoremultipartencoding", Boolean.FALSE);
         prop.put("mail.mime.allowutf8", Boolean.FALSE);
         prop.put("mail.mime.cachemultipart", Boolean.FALSE);
-        orig = buildFromProperties(prop);
-        omp = (MimeMultipart) orig.getContent();
-        obp = (MimeBodyPart) omp.getBodyPart(0);
+        
+        session = Session.getInstance(prop);
+        orig = new MimeMessage(session, input);
+        obp = new MimeBodyPart(session, input);
+
         // MimeMessage
         assertFalse(orig.setDefaultTextCharset);
         assertFalse(orig.setContentTypeFileName);
@@ -81,56 +84,5 @@ public void sessionProperties() throws MessagingException, IOException {
         assertFalse(obp.ignoreMultipartEncoding);
         assertFalse(obp.allowutf8);
         assertFalse(obp.cacheMultipart);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    private MimeMessage buildFromProperties(Properties prop) throws MessagingException, IOException {
-        Session s = Session.getInstance(prop);
-        MimeMessage orig = createMessage(s);
-        return orig;
-    }
-
-    private static MimeMessage createMessage(Session s) throws MessagingException {
-        String content = "Mime-Version: 1.0\n" + "Subject: Example\n"
-                + "Content-Type: multipart/mixed; boundary=\"-\"\n" + "\n" + "preamble\n" + "---\n"
-                + "Content-Type: text/x-test\n" + "Content-Transfer-Encoding: quoted-printable\n" + "\n" + "test part\n"
-                + "\n" + "-----\n";
-
-        InputStream input = new AsciiStringInputStream(content);
-        return new MimeMessage(s, input);
-    }
-
-    private static class AsciiStringInputStream extends InputStream {
-
-        private final String input;
-        private int position;
-
-        public AsciiStringInputStream(String input) {
-            this(input, true);
-        }
-
-        public AsciiStringInputStream(String input, boolean strict) {
-            if (strict) {
-                for (int i = 0; i < input.length(); i++) {
-                    if (input.charAt(i) > 0x7F) {
-                        throw new IllegalArgumentException("Not an ASCII string");
-                    }
-                }
-            }
-            this.input = input;
-        }
-
-        @Override
-        public int read() {
-            if (position < input.length()) {
-                return input.charAt(position++) & 0xFF;
-            } else {
-                return -1;
-            }
-        }
-
     }
 }

api/src/test/java/jakarta/mail/util/DummyStreamProvider.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package jakarta.mail.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class DummyStreamProvider implements StreamProvider {
+
+    @Override
+    public InputStream inputBase64(InputStream in) {
+        return null;
+    }
+
+    @Override
+    public OutputStream outputBase64(OutputStream out) {
+        return null;
+    }
+
+    @Override
+    public InputStream inputBinary(InputStream in) {
+        return null;
+    }
+
+    @Override
+    public OutputStream outputBinary(OutputStream out) {
+        return null;
+    }
+
+    @Override
+    public OutputStream outputB(OutputStream out) {
+        return null;
+    }
+
+    @Override
+    public InputStream inputQ(InputStream in) {
+        return null;
+    }
+
+    @Override
+    public OutputStream outputQ(OutputStream out, boolean encodingWord) {
+        return null;
+    }
+
+    @Override
+    public LineInputStream inputLineStream(InputStream in, boolean allowutf8) {
+        return new LineInputStream() {
+            @Override
+            public String readLine() throws IOException {
+                return null;
+            }
+        };
+    }
+
+    @Override
+    public LineOutputStream outputLineStream(OutputStream out, boolean allowutf8) {
+        return null;
+    }
+
+    @Override
+    public InputStream inputQP(InputStream in) {
+        return null;
+    }
+
+    @Override
+    public OutputStream outputQP(OutputStream out) {
+        return null;
+    }
+
+    @Override
+    public InputStream inputSharedByteArray(byte[] buff) {
+        return null;
+    }
+
+    @Override
+    public InputStream inputUU(InputStream in) {
+        return null;
+    }
+
+    @Override
+    public OutputStream outputUU(OutputStream out, String filename) {
+        return null;
+    }
+
+}

api/src/test/resources/META-INF/services/jakarta.mail.util.StreamProvider

@@ -0,0 +1 @@
+jakarta.mail.util.DummyStreamProvider