[jbpm-commits] JBoss JBPM SVN: r2569 - in jbpm3/trunk/modules/core: src/main/java/org/jbpm/mail and 1 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-10-21 11:16:57 -0400 (Tue, 21 Oct 2008) New Revision: 2569 Removed: jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/RealServerMailTestCase.java Modified: jbpm3/trunk/modules/core/pom.xml jbpm3/trunk/modules/core/src/main/java/org/jbpm/mail/Mail.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java Log: [JBPM-1722] Fix or remove mail tests Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2008-10-21 13:41:46 UTC (rev 2568) +++ jbpm3/trunk/modules/core/pom.xml 2008-10-21 15:16:57 UTC (rev 2569) @@ -197,10 +197,6 @@ <!-- https://jira.jboss.org/jira/browse/JBPM-1721 --> <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> - <!-- https://jira.jboss.org/jira/browse/JBPM-1722 --> - <exclude>org/jbpm/mail/MailTest.java</exclude> - <exclude>org/jbpm/mail/TaskMailTest.java</exclude> - <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude> <!-- https://jira.jboss.org/jira/browse/JBPM-1723 --> <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude> <exclude>org/jbpm/perf/StateUpdateTest.java</exclude> @@ -236,10 +232,6 @@ <!-- https://jira.jboss.org/jira/browse/JBPM-1721 --> <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> - <!-- https://jira.jboss.org/jira/browse/JBPM-1722 --> - <exclude>org/jbpm/mail/MailTest.java</exclude> - <exclude>org/jbpm/mail/TaskMailTest.java</exclude> - <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude> <!-- https://jira.jboss.org/jira/browse/JBPM-1723 --> <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude> <exclude>org/jbpm/perf/StateUpdateTest.java</exclude> @@ -275,10 +267,6 @@ <!-- https://jira.jboss.org/jira/browse/JBPM-1721 --> <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> - <!-- https://jira.jboss.org/jira/browse/JBPM-1722 --> - <exclude>org/jbpm/mail/MailTest.java</exclude> - <exclude>org/jbpm/mail/TaskMailTest.java</exclude> - <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude> <!-- https://jira.jboss.org/jira/browse/JBPM-1723 --> <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude> <exclude>org/jbpm/perf/StateUpdateTest.java</exclude> @@ -316,10 +304,6 @@ <!-- https://jira.jboss.org/jira/browse/JBPM-1721 --> <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> - <!-- https://jira.jboss.org/jira/browse/JBPM-1722 --> - <exclude>org/jbpm/mail/MailTest.java</exclude> - <exclude>org/jbpm/mail/TaskMailTest.java</exclude> - <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude> <!-- https://jira.jboss.org/jira/browse/JBPM-1723 --> <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude> <exclude>org/jbpm/perf/StateUpdateTest.java</exclude> @@ -358,10 +342,6 @@ <!-- https://jira.jboss.org/jira/browse/JBPM-1721 --> <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> - <!-- https://jira.jboss.org/jira/browse/JBPM-1722 --> - <exclude>org/jbpm/mail/MailTest.java</exclude> - <exclude>org/jbpm/mail/TaskMailTest.java</exclude> - <exclude>org/jbpm/mail/RealServerMailTestCase.java</exclude> <!-- https://jira.jboss.org/jira/browse/JBPM-1723 --> <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude> <exclude>org/jbpm/perf/StateUpdateTest.java</exclude> Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/mail/Mail.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/mail/Mail.java 2008-10-21 13:41:46 UTC (rev 2568) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/mail/Mail.java 2008-10-21 15:16:57 UTC (rev 2569) @@ -107,7 +107,7 @@ } } if (bcc!=null) { - String resolvedTo = evaluate(to); + String resolvedTo = evaluate(bcc); recipients.addAll(tokenize(resolvedTo)); } if (JbpmConfiguration.Configs.hasObject("jbpm.mail.bcc.address")) { @@ -170,13 +170,13 @@ } public static void send(Properties mailServerProperties, String fromAddress, List recipients, List bccRecipients, String subject, String text) { - if ( (recipients==null) - || (recipients.isEmpty()) + if ( ((recipients==null) || (recipients.isEmpty())) + && ((bccRecipients==null) || (bccRecipients.isEmpty())) ) { log.debug("skipping mail because there are no recipients"); return; } - log.debug("sending email to '"+recipients+"' about '"+subject+"'"); + log.debug("sending email to '"+recipients+"' "+(bccRecipients!=null ? "and in bcc to '"+bccRecipients+"' " : "")+"about '"+subject+"'"); Session session = Session.getDefaultInstance(mailServerProperties, null); MimeMessage message = new MimeMessage(session); try { Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java 2008-10-21 13:41:46 UTC (rev 2568) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java 2008-10-21 15:16:57 UTC (rev 2569) @@ -81,26 +81,20 @@ } public void testMailWithBccAddress() { - String to = &quot;sample.shipper(a)example.domain&quot;; String bcc = &quot;bcc(a)example.domain&quot;; String subject = "latest news"; String text = "roy is assurancetourix"; - Mail mail = new Mail(null, null, to, null, bcc, subject, text); + Mail mail = new Mail(null, null, null, null, bcc, subject, text); mail.send(); - assertTrue(server.getReceivedEmailSize() == 2); + assertEquals(1, server.getReceivedEmailSize()); Iterator emailIter = server.getReceivedEmail(); SmtpMessage email1 = (SmtpMessage) emailIter.next(); assertEquals("latest news", email1.getHeaderValue("Subject")); assertEquals("roy is assurancetourix", email1.getBody()); - assertEquals(&quot;sample.shipper(a)example.domain&quot;, email1.getHeaderValue("To")); - - SmtpMessage email2 = (SmtpMessage) emailIter.next(); - assertEquals("latest news", email2.getHeaderValue("Subject")); - assertEquals("roy is assurancetourix", email2.getBody()); - assertEquals(&quot;bcc(a)example.domain&quot;, email2.getHeaderValue("To")); -} + assertNull(email1.getHeaderValue("To")); + } public void testMailNodeAttributes() { ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( Deleted: jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/RealServerMailTestCase.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/RealServerMailTestCase.java 2008-10-21 13:41:46 UTC (rev 2568) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/RealServerMailTestCase.java 2008-10-21 15:16:57 UTC (rev 2569) @@ -1,86 +0,0 @@ -package org.jbpm.mail; - -import org.jbpm.AbstractJbpmTestCase; -import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; -import org.jbpm.graph.def.ProcessDefinition; -import org.jbpm.graph.exe.ProcessInstance; -import org.jbpm.svc.Service; -import org.jbpm.svc.ServiceFactory; - -public class RealServerMailTestCase extends AbstractJbpmTestCase { - - public static class TestAddressResolver implements AddressResolver, ServiceFactory, Service { - private static final long serialVersionUID = 1L; - public Object resolveAddress(String actorId) { - return actorId+"@localhost"; - } - public Service openService() { - return this; - } - public void close() { - } - } - - - static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString( - "<jbpm-configuration>" + - " <jbpm-context>" + - " <service name='addressresolver' factory='org.jbpm.mail.RealServerMailTestCase$TestAddressResolver' />" + - " </jbpm-context>" + - " <string name='resource.mail.properties' value='org/jbpm/mail/test.mail.properties' />" + - " <bean name='jbpm.variable.resolver' class='org.jbpm.jpdl.el.impl.JbpmVariableResolver' singleton='true' />" + - " <string name='resource.hibernate.cfg.xml' value='hibernate.cfg.xml' />" + - " <string name='resource.business.calendar' value='org/jbpm/calendar/jbpm.business.calendar.properties' />" + - " <string name='resource.default.modules' value='org/jbpm/graph/def/jbpm.default.modules.properties' />" + - " <string name='resource.converter' value='org/jbpm/db/hibernate/jbpm.converter.properties' />" + - " <string name='resource.action.types' value='org/jbpm/graph/action/action.types.xml' />" + - " <string name='resource.node.types' value='org/jbpm/graph/node/node.types.xml' />" + - " <string name='resource.parsers' value='org/jbpm/jpdl/par/jbpm.parsers.xml' />" + - " <string name='resource.varmapping' value='org/jbpm/context/exe/jbpm.varmapping.xml' />" + - " <string name='resource.repository.cfg.xml' value='repository.cfg.xml' />" + - "</jbpm-configuration>" - ); - - JbpmContext jbpmContext = null; - - protected void setUp() throws Exception - { - super.setUp(); - jbpmContext = jbpmConfiguration.createJbpmContext(); - } - - protected void tearDown() throws Exception - { - jbpmContext.close(); - super.tearDown(); - } - - public void testSimplMail() { - String actors = "sample.manager@localhost"; - String subject = "latest news"; - String text = "roy is assurancetourix"; - - Mail mail = new Mail(null, actors, null, subject, text); - mail.send(); - } - - public void testMailNodeElements() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='send email' />" + - " </start-state>" + - " <mail-node name='send email' actors='manager'>" + - " <subject>readmylips</subject>" + - " <text><![CDATA[ no \n more \n taxes ]]></text>" + - " <transition to='end' />" + - " </mail-node>" + - " <end-state name='end' />" + - "</process-definition>" - ); - ProcessInstance processInstance = new ProcessInstance(processDefinition); - processInstance.signal(); - } - -}