Repository: openmeetings Updated Branches: refs/heads/master b3debd934 -> e5518cdc9
[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/986241c1 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/986241c1 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/986241c1 Branch: refs/heads/master Commit: 986241c18f1a0e81089c6734a43fb7e040715338 Parents: b3debd9 Author: Maxim Solodovnik <[email protected]> Authored: Wed Oct 11 23:11:53 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Oct 11 23:11:53 2017 +0700 ---------------------------------------------------------------------- .../service/mail/template/FeedbackTemplate.java | 2 +- .../mail/template/RegisterUserTemplate.java | 2 +- .../template/RequestContactConfirmTemplate.java | 2 +- .../mail/template/RequestContactTemplate.java | 2 +- .../mail/template/ResetPasswordTemplate.java | 2 +- .../template/subject/TestEmailTemplate.java | 81 ------------------- .../mail/template/subject/TestSubjTemplate.java | 82 ++++++++++++++++++++ 7 files changed, 87 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/986241c1/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java index d36bc67..aec1b40 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java @@ -26,7 +26,7 @@ import org.apache.wicket.markup.html.link.ExternalLink; public class FeedbackTemplate extends AbstractTemplatePanel { private static final long serialVersionUID = 1L; - public FeedbackTemplate(String username, String email, String message) { + private FeedbackTemplate(String username, String email, String message) { super(getOmSession().getLocale()); add(new Label("appname", getBean(ConfigurationDao.class).getAppName())); add(new Label("username", username)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/986241c1/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java index cebfe71..69655c5 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java @@ -26,7 +26,7 @@ import org.apache.wicket.markup.html.link.ExternalLink; public class RegisterUserTemplate extends AbstractTemplatePanel { private static final long serialVersionUID = 1L; - public RegisterUserTemplate(String username, String email, String verificationUrl) { + private RegisterUserTemplate(String username, String email, String verificationUrl) { super(getOmSession().getLocale()); add(new Label("registrationLbl", getString("506", locale))); add(new Label("username", username)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/986241c1/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java index df5b190..6f64dc4 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java @@ -26,7 +26,7 @@ import org.apache.wicket.markup.html.basic.Label; public class RequestContactConfirmTemplate extends AbstractTemplatePanel { private static final long serialVersionUID = 1L; - public RequestContactConfirmTemplate(UserContact contact) { + private RequestContactConfirmTemplate(UserContact contact) { super(LocaleHelper.getLocale(contact.getOwner())); add(new Label("hi", getString("1192", locale))); add(new Label("firstName", contact.getOwner().getFirstname())); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/986241c1/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java index 3f52301..9d4ddd5 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java @@ -29,7 +29,7 @@ import org.apache.wicket.markup.html.link.ExternalLink; public class RequestContactTemplate extends AbstractTemplatePanel { private static final long serialVersionUID = 1L; - public RequestContactTemplate(User userToAdd, User user) { + private RequestContactTemplate(User userToAdd, User user) { super(LocaleHelper.getLocale(userToAdd)); add(new Label("hi", getString("1192", locale))); add(new Label("addedFirstName", userToAdd.getFirstname())); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/986241c1/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java index 9531f2c..42b8c38 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.java @@ -25,7 +25,7 @@ import org.apache.wicket.markup.html.link.ExternalLink; public class ResetPasswordTemplate extends AbstractTemplatePanel { private static final long serialVersionUID = 1L; - public ResetPasswordTemplate(String link) { + private ResetPasswordTemplate(String link) { super(getOmSession().getLocale()); add(new Label("reset-header", getString("513", locale))); add(new ExternalLink("reset_link1", link)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/986241c1/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 deleted file mode 100644 index 37c9ab0..0000000 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestEmailTemplate.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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()); - } -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/986241c1/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java new file mode 100644 index 0000000..1843010 --- /dev/null +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java @@ -0,0 +1,82 @@ +/* + * 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.assertFalse; +import static org.junit.Assert.assertNotNull; +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.Test; + +public class TestSubjTemplate extends AbstractWicketTester { + private static void checkTemplate(SubjectEmailTemplate t) { + assertNotNull("Template should be created", t); + assertFalse("Subject should be not empty", Strings.isEmpty(t.getSubject())); + assertFalse("Body 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()); + } +}
