This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push: new e949dbf [OPENMEETINGS-2481] tests should be fixed e949dbf is described below commit e949dbf5031212cd81b35cb8a0c4367fea050355 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Fri Oct 16 23:01:08 2020 +0700 [OPENMEETINGS-2481] tests should be fixed --- .../org/apache/openmeetings/util/mail/IcalHandler.java | 2 +- .../openmeetings/calendar/TestSendIcalMessage.java | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java index 7f10b71..42b18a8 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java @@ -143,8 +143,8 @@ public class IcalHandler { public IcalHandler addAttendee(String email, String display, boolean chair) { Attendee uno = new Attendee(URI.create(MAILTO + email)); uno.getParameters().add(chair ? Role.CHAIR : Role.REQ_PARTICIPANT); - uno.getParameters().add(new Cn(display)); uno.getParameters().add(Method.CANCEL == method ? PartStat.DECLINED : PartStat.ACCEPTED); + uno.getParameters().add(new Cn(display)); meeting.getProperties().add(uno); return this; } diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java index 429e120..7da0ed6 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java @@ -30,7 +30,6 @@ import javax.activation.DataHandler; import javax.mail.BodyPart; import javax.mail.Message; import javax.mail.Multipart; -import javax.mail.Transport; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; @@ -51,8 +50,6 @@ class TestSendIcalMessage extends AbstractJUnitDefaults { @Autowired private MailHandler mailHandler; - private byte[] iCalMimeBody; - String subject = "test iCal"; String recipients = "seba.wag...@gmail.com"; String htmlBody = "test"; @@ -81,12 +78,10 @@ class TestSendIcalMessage extends AbstractJUnitDefaults { log.debug("ICS: {}", handler.toString()); assertNotNull(handler.toString(), "Valid ICS should be created"); - iCalMimeBody = handler.toByteArray(); - - sendIcalMessage(); + sendIcalMessage(handler.toByteArray()); } - private void sendIcalMessage() throws Exception { + private void sendIcalMessage(byte[] iCalMimeBody) throws Exception { log.debug("sendIcalMessage"); // Building MimeMessage @@ -114,11 +109,6 @@ class TestSendIcalMessage extends AbstractJUnitDefaults { mimeMessage.setSentDate(new Date()); mimeMessage.setContent(multipart); - // -- Set some other header information -- - // mimeMessage.setHeader("X-Mailer", "XML-Mail"); - // mimeMessage.setSentDate(new Date()); - - // Transport trans = session.getTransport("smtp"); - Transport.send(mimeMessage); + assertNotNull(mimeMessage, "Valid MIME message should be created"); } }