From e757d5904d5ee3db61d06b034b3023368e2dd94c Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 13 Jan 2017 13:03:42 +0100 Subject: [server] Refine mail template parsing; fix too many mails being sent for invalid lectures --- dozentenmodulserver/src/test/java/bwlehrpool/MailTemplateTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'dozentenmodulserver/src/test/java') 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 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() { -- cgit v1.2.3-55-g7522