Alternate approach to fixing MessageTest (90e3a337) · Commits · e / os / Mail

k9mail-library/src/androidTest/java/com/fsck/k9/mail/MessageTest.java

+3 −15

Original line number	Diff line number	Diff line
		@@ -468,8 +468,7 @@ public class MessageTest {
		message.setHeader("Date", "Wed, 28 Aug 2013 08:51:09 -0400");
		message.setEncoding(MimeUtil.ENC_8BIT);

		NonRandomMimeMultipartTest multipartBody = new NonRandomMimeMultipartTest();
		multipartBody.setSubType("mixed");
		MimeMultipart multipartBody = new MimeMultipart("multipart/mixed", generateBoundary());
		multipartBody.addBodyPart(textBodyPart(MimeUtil.ENC_8BIT));
		multipartBody.addBodyPart(textBodyPart(MimeUtil.ENC_QUOTED_PRINTABLE));
		multipartBody.addBodyPart(binaryBodyPart());
		@@ -516,19 +515,8 @@ public class MessageTest {
		return bodyPart;
		}

		private class NonRandomMimeMultipartTest extends MimeMultipart {

		public NonRandomMimeMultipartTest() throws MessagingException {
		super();
		}

		@Override
		public String generateBoundary() {
		StringBuilder sb = new StringBuilder();
		sb.append("----Boundary");
		sb.append(Integer.toString(mMimeBoundary++));
		return sb.toString();
		}
		private String generateBoundary() {
		return "----Boundary" + Integer.toString(mMimeBoundary++);
		}

		@Test

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ public class MimeMultipart extends Multipart {
		this.boundary = boundary;
		}

		public String generateBoundary() {
		public static String generateBoundary() {
		Random random = new Random();
		StringBuilder sb = new StringBuilder();
		sb.append("----");

+1 −1

Original line number	Diff line number	Diff line
		@@ -1407,7 +1407,7 @@ public class LocalFolder extends Folder<LocalMessage> implements Serializable {
		cv.put("decoded_body_size", attachment.size);

		if (MimeUtility.isMultipart(part.getMimeType())) {
		cv.put("boundary", new MimeMultipart().generateBoundary());
		cv.put("boundary", MimeMultipart.generateBoundary());
		}
		}