Repository: openmeetings Updated Branches: refs/heads/master d6ca151b5 -> b3debd934
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/b3debd93 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/b3debd93 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/b3debd93 Branch: refs/heads/master Commit: b3debd934179dc611e8ba31b5a794af59af8a618 Parents: d6ca151 Author: Maxim Solodovnik <[email protected]> Authored: Wed Oct 11 22:56:06 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Oct 11 22:56:06 2017 +0700 ---------------------------------------------------------------------- .../invitiation/TestInvitation.java | 28 ------- .../template/subject/TestEmailTemplate.java | 81 ++++++++++++++++++++ 2 files changed, 81 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b3debd93/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java index 2fa636d..b9c1f99 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java @@ -21,23 +21,14 @@ package org.apache.openmeetings.invitiation; import static org.apache.openmeetings.util.CalendarHelper.getDate; import java.time.LocalDateTime; -import java.util.TimeZone; -import org.apache.directory.api.util.Strings; import org.apache.openmeetings.AbstractWicketTester; import org.apache.openmeetings.db.dao.room.RoomDao; -import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.room.Invitation; import org.apache.openmeetings.db.entity.room.Invitation.MessageType; import org.apache.openmeetings.db.entity.room.Invitation.Valid; import org.apache.openmeetings.db.entity.user.User; -import org.apache.openmeetings.service.mail.template.subject.AppointmentReminderTemplate; -import org.apache.openmeetings.service.mail.template.subject.CanceledAppointmentTemplate; -import org.apache.openmeetings.service.mail.template.subject.CreatedAppointmentTemplate; -import org.apache.openmeetings.service.mail.template.subject.SubjectEmailTemplate; -import org.apache.openmeetings.service.mail.template.subject.UpdatedAppointmentTemplate; import org.apache.openmeetings.service.room.InvitationManager; -import org.junit.Assert; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -60,23 +51,4 @@ public class TestInvitation extends AbstractWicketTester { invitationManager.sendInvitationLink(i, MessageType.Create, "subject", "message", false); } - - private static void checkTemplate(SubjectEmailTemplate t) { - Assert.assertNotNull("Template should be created", t); - Assert.assertFalse("Subject should be not empty", Strings.isEmpty(t.getSubject())); - Assert.assertFalse("Boby should be not empty", Strings.isEmpty(t.getEmail())); - } - - @Test - public void testTemplateGeneration() { - Appointment a = getAppointment(); - String[] ids = TimeZone.getAvailableIDs(); - for (User u : userDao.get(0, 100)) { - TimeZone tz = TimeZone.getTimeZone(ids[rnd.nextInt(ids.length)]); - checkTemplate(CreatedAppointmentTemplate.get(u, a, tz, u.getLogin())); - checkTemplate(CanceledAppointmentTemplate.get(u, a, tz, u.getLogin())); - checkTemplate(UpdatedAppointmentTemplate.get(u, a, tz, u.getLogin())); - checkTemplate(AppointmentReminderTemplate.get(u, a, tz)); - } - } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b3debd93/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestEmailTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestEmailTemplate.java b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestEmailTemplate.java new file mode 100644 index 0000000..37c9ab0 --- /dev/null +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestEmailTemplate.java @@ -0,0 +1,81 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License") + you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openmeetings.service.mail.template.subject; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.util.Locale; +import java.util.TimeZone; +import java.util.function.Consumer; + +import org.apache.directory.api.util.Strings; +import org.apache.openmeetings.AbstractWicketTester; +import org.apache.openmeetings.db.entity.calendar.Appointment; +import org.apache.openmeetings.db.entity.record.Recording; +import org.apache.openmeetings.db.entity.user.User; +import org.junit.Assert; +import org.junit.Test; + +public class TestEmailTemplate extends AbstractWicketTester { + private static void checkTemplate(SubjectEmailTemplate t) { + Assert.assertNotNull("Template should be created", t); + Assert.assertFalse("Subject should be not empty", Strings.isEmpty(t.getSubject())); + Assert.assertFalse("Boby should be not empty", Strings.isEmpty(t.getEmail())); + } + + @Test + public void testTemplateGeneration() { + Appointment a = getAppointment(); + String[] ids = TimeZone.getAvailableIDs(); + Recording rec = new Recording(); + rec.setRoomId(5L); + for (User u : userDao.get(0, 100)) { + TimeZone tz = TimeZone.getTimeZone(ids[rnd.nextInt(ids.length)]); + checkTemplate(CreatedAppointmentTemplate.get(u, a, tz, u.getLogin())); + checkTemplate(CanceledAppointmentTemplate.get(u, a, tz, u.getLogin())); + checkTemplate(UpdatedAppointmentTemplate.get(u, a, tz, u.getLogin())); + checkTemplate(AppointmentReminderTemplate.get(u, a, tz)); + checkTemplate(RecordingExpiringTemplate.get(u, rec, 1L)); + } + } + + private static void checkTemplateError(SubjectEmailTemplate t, Consumer<SubjectEmailTemplate> cons) { + try { + cons.accept(t); + fail("RuntimeException is expected"); + } catch (RuntimeException ex) { + assertTrue("Expected", true); + } + } + + @Test + public void testError() { + InvitedAppointmentTemplate t = new InvitedAppointmentTemplate(Locale.CHINA, new Appointment(), TimeZone.getDefault(), "TEST") { + private static final long serialVersionUID = 1L; + + @Override + String getPrefix() { + return null; + } + }; + checkTemplateError(t, tmp -> tmp.getSubject()); + checkTemplateError(t, tmp -> tmp.getEmail()); + } +}
