diff options
author | Simon Rettberg | 2017-01-13 13:03:42 +0100 |
---|---|---|
committer | Simon Rettberg | 2017-01-13 13:03:42 +0100 |
commit | e757d5904d5ee3db61d06b034b3023368e2dd94c (patch) | |
tree | 40b21dfb8c0f0d4821bb7adf6552b9be695f7ed4 /dozentenmodulserver/src/test/java | |
parent | [server] use mail template from the configuration database when generating ma... (diff) | |
download | tutor-module-e757d5904d5ee3db61d06b034b3023368e2dd94c.tar.gz tutor-module-e757d5904d5ee3db61d06b034b3023368e2dd94c.tar.xz tutor-module-e757d5904d5ee3db61d06b034b3023368e2dd94c.zip |
[server] Refine mail template parsing; fix too many mails being sent for invalid lectures
Diffstat (limited to 'dozentenmodulserver/src/test/java')
-rw-r--r-- | dozentenmodulserver/src/test/java/bwlehrpool/MailTemplateTest.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dozentenmodulserver/src/test/java/bwlehrpool/MailTemplateTest.java b/dozentenmodulserver/src/test/java/bwlehrpool/MailTemplateTest.java index d6b5158c..fda23d01 100644 --- a/dozentenmodulserver/src/test/java/bwlehrpool/MailTemplateTest.java +++ b/dozentenmodulserver/src/test/java/bwlehrpool/MailTemplateTest.java @@ -9,22 +9,21 @@ import junit.framework.TestCase; public class MailTemplateTest extends TestCase { public void testMailTemplate() { - String test = "Hallo Eins %zwei% drei"; - MailTemplate template = new MailTemplate(test); - /* variables */ HashMap<String, String> map = new HashMap<>(); map.put("eins", "1"); map.put("zwei", "2"); map.put("drei", "3"); - assertEquals("Hallo Eins 2 drei", template.format(map)); + assertEquals("Hallo Eins 2 drei", new MailTemplate("Hallo Eins %zwei% drei").format(map)); assertEquals("1", new MailTemplate("%eins%").format(map)); assertEquals("x1", new MailTemplate("x%eins%").format(map)); assertEquals("1x", new MailTemplate("%eins%x").format(map)); assertEquals("123", new MailTemplate("%eins%%zwei%%drei%").format(map)); assertEquals("123x11", new MailTemplate("%eins%%zwei%%drei%x%eins%1").format(map)); assertEquals(".1.%zwei", new MailTemplate(".%eins%.%zwei").format(map)); + assertEquals(".1.2 3' und vier", new MailTemplate(".%eins%.%zwei %drei' und vier").format(map)); + assertEquals("1 null null zehn%", new MailTemplate("%eins% %acht% %neun zehn%").format(map)); } public void testMailTemplateWrongPlaceholder() { |