[jbpm-commits] JBoss JBPM SVN: r3000 - in jbpm3/trunk/modules/core/src: test/java/org/jbpm/mail and 1 other directory.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Nov 19 12:25:42 EST 2008


Author: thomas.diesler at jboss.com
Date: 2008-11-19 12:25:42 -0500 (Wed, 19 Nov 2008)
New Revision: 3000

Modified:
   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:
Use one mail server for all tests

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-11-19 16:16:01 UTC (rev 2999)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/mail/Mail.java	2008-11-19 17:25:42 UTC (rev 3000)
@@ -209,14 +209,6 @@
           System.out.println("Cannot send mail, now retrying: " + msgex);
           log.error("Cannot send mail, now retrying: " + msgex);
           Thread.sleep(1000);
-          
-          // Increment the smtp port
-          String smtpPort = mailServerProperties.getProperty("mail.smtp.port");
-          if (smtpPort != null)
-          {
-            Integer retryPort = new Integer(smtpPort) + 1;
-            mailServerProperties.setProperty("mail.smtp.port", retryPort.toString());
-          }
         }
       }
     }

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-11-19 16:16:01 UTC (rev 2999)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java	2008-11-19 17:25:42 UTC (rev 3000)
@@ -3,6 +3,10 @@
 import java.util.Arrays;
 import java.util.Iterator;
 
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jbpm.AbstractJbpmTestCase;
@@ -20,20 +24,11 @@
 {
   private static Log log = LogFactory.getLog(MailTest.class);
 
-  public static class TestAddressResolver implements AddressResolver
-  {
-    private static final long serialVersionUID = 1L;
+  private static final int SMTP_PORT = 23583;
 
-    public Object resolveAddress(String actorId)
-    {
-      if ("ghost".equals(actorId))
-      {
-        return null;
-      }
-      return actorId + "@example.domain";
-    }
-  }
-
+  private static SimpleSmtpServer server;
+  JbpmContext jbpmContext;
+  
   static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString(
     "<jbpm-configuration>" +
     "  <jbpm-context />" +
@@ -42,16 +37,34 @@
     "</jbpm-configuration>"
   );
 
-  SimpleSmtpServer server = null;
-  JbpmContext jbpmContext = null;
+  public static Test suite()
+  {
+    return new TestSetup(new TestSuite(MailTest.class))
+    {
+      protected void setUp() throws Exception
+      {
+        server = startSmtpServer(SMTP_PORT);
+      }
 
+      protected void tearDown() throws Exception
+      {
+        server.stop();
+      }
+    };
+  }
+  
   protected void setUp() throws Exception
   {
     super.setUp();
-    server = startSmtpServer(23583);
     jbpmContext = jbpmConfiguration.createJbpmContext();
   }
 
+  protected void tearDown() throws Exception
+  {
+    jbpmContext.close();
+    super.tearDown();
+  }
+
   static SimpleSmtpServer startSmtpServer(int port)
   {
     /*
@@ -83,21 +96,6 @@
     return server;
   }
 
-  protected void tearDown() throws Exception
-  {
-    jbpmContext.close();
-    try
-    {
-      server.stop();
-    }
-    catch (RuntimeException rte)
-    {
-      // This is an intermittent issue that we can safely ignore
-      log.error("Cannot stop server: " + rte);
-    }
-    super.tearDown();
-  }
-
   public void testWithoutAddressResolving()
   {
     String to = "sample.shipper at example.domain";
@@ -110,6 +108,8 @@
     assertTrue(server.getReceivedEmailSize() == 1);
     Iterator emailIter = server.getReceivedEmail();
     SmtpMessage email = (SmtpMessage)emailIter.next();
+    emailIter.remove();
+    
     assertEquals("latest news", email.getHeaderValue("Subject"));
     assertEquals("roy is assurancetourix", email.getBody());
     assertEquals("sample.shipper at example.domain", email.getHeaderValue("To"));
@@ -127,6 +127,8 @@
     assertTrue(server.getReceivedEmailSize() == 1);
     Iterator emailIter = server.getReceivedEmail();
     SmtpMessage email = (SmtpMessage)emailIter.next();
+    emailIter.remove();
+    
     assertEquals("latest news", email.getHeaderValue("Subject"));
     assertEquals("roy is assurancetourix", email.getBody());
     assertEquals("manager at example.domain", email.getHeaderValue("To"));
@@ -143,10 +145,12 @@
 
     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());
-    assertNull(email1.getHeaderValue("To"));
+    SmtpMessage email = (SmtpMessage)emailIter.next();
+    emailIter.remove();
+    
+    assertEquals("latest news", email.getHeaderValue("Subject"));
+    assertEquals("roy is assurancetourix", email.getBody());
+    assertNull(email.getHeaderValue("To"));
   }  
   
   public void testMailNodeAttributes() 
@@ -168,6 +172,8 @@
     assertTrue(server.getReceivedEmailSize() == 1);
     Iterator emailIter = server.getReceivedEmail();
     SmtpMessage email = (SmtpMessage)emailIter.next();
+    emailIter.remove();
+    
     assertEquals("readmylips", email.getHeaderValue("Subject"));
     assertEquals("nomoretaxes", email.getBody());
     assertEquals("george at example.domain", email.getHeaderValue("To"));
@@ -194,6 +200,8 @@
     assertTrue(server.getReceivedEmailSize() == 1);
     Iterator emailIter = server.getReceivedEmail();
     SmtpMessage email = (SmtpMessage)emailIter.next();
+    emailIter.remove();
+    
     assertEquals("readmylips", email.getHeaderValue("Subject"));
     assertEquals("nomoretaxes", email.getBody());
     assertEquals("george at example.domain", email.getHeaderValue("To"));
@@ -217,6 +225,8 @@
     assertTrue(server.getReceivedEmailSize() == 1);
     Iterator emailIter = server.getReceivedEmail();
     SmtpMessage email = (SmtpMessage)emailIter.next();
+    emailIter.remove();
+    
     assertEquals("readmylips", email.getHeaderValue("Subject"));
     assertEquals("nomoretaxes", email.getBody());
     assertEquals("george at example.domain", email.getHeaderValue("To"));
@@ -244,6 +254,8 @@
     assertTrue(server.getReceivedEmailSize() == 1);
     Iterator emailIter = server.getReceivedEmail();
     SmtpMessage email = (SmtpMessage)emailIter.next();
+    emailIter.remove();
+    
     assertEquals("readmylips", email.getHeaderValue("Subject"));
     assertEquals("nomoretaxes", email.getBody());
     assertEquals("george at example.domain", email.getHeaderValue("To"));
@@ -267,6 +279,8 @@
     assertEquals(1, server.getReceivedEmailSize());
     Iterator emailIter = server.getReceivedEmail();
     SmtpMessage email = (SmtpMessage)emailIter.next();
+    emailIter.remove();
+    
     assertEquals("readmylips", email.getHeaderValue("Subject"));
     assertEquals("nomoretaxes", email.getBody());
     assertEquals(Arrays.asList(new String[] { "george at example.domain", "barbara at example.domain", "suzy at example.domain" }), Arrays.asList(email
@@ -291,24 +305,11 @@
     assertEquals(1, server.getReceivedEmailSize());
     Iterator emailIter = server.getReceivedEmail();
     SmtpMessage email = (SmtpMessage)emailIter.next();
+    emailIter.remove();
+    
     assertEquals(Arrays.asList(new String[] { "george at humpydumpy.gov", "spiderman at hollywood.ca.us" }), Arrays.asList(email.getHeaderValues("To")));
   }
 
-  public static class User
-  {
-    String email;
-
-    public User(String email)
-    {
-      this.email = email;
-    }
-
-    public String getEmail()
-    {
-      return email;
-    }
-  }
-
   public void testToVariableExpression() 
   {
     ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
@@ -331,6 +332,8 @@
     assertEquals(1, server.getReceivedEmailSize());
     Iterator emailIter = server.getReceivedEmail();
     SmtpMessage email = (SmtpMessage)emailIter.next();
+    emailIter.remove();
+    
     assertEquals("hucklebuck at example.domain", email.getHeaderValue("To"));
   }
 
@@ -357,6 +360,8 @@
     assertEquals(1, server.getReceivedEmailSize());
     Iterator emailIter = server.getReceivedEmail();
     SmtpMessage email = (SmtpMessage)emailIter.next();
+    emailIter.remove();
+    
     assertEquals("huckelberry at example.domain", email.getHeaderValue("To"));
   }
 
@@ -380,6 +385,8 @@
     assertEquals(1, server.getReceivedEmailSize());
     Iterator emailIter = server.getReceivedEmail();
     SmtpMessage email = (SmtpMessage)emailIter.next();
+    emailIter.remove();
+    
     assertEquals("your cookies order", email.getHeaderValue("Subject"));
   }
 
@@ -403,6 +410,37 @@
     assertEquals(1, server.getReceivedEmailSize());
     Iterator emailIter = server.getReceivedEmail();
     SmtpMessage email = (SmtpMessage)emailIter.next();
+    emailIter.remove();
+    
     assertEquals("your cookies order", email.getBody());
   }
+
+  public static class User
+  {
+    String email;
+
+    public User(String email)
+    {
+      this.email = email;
+    }
+
+    public String getEmail()
+    {
+      return email;
+    }
+  }
+
+  public static class TestAddressResolver implements AddressResolver
+  {
+    private static final long serialVersionUID = 1L;
+
+    public Object resolveAddress(String actorId)
+    {
+      if ("ghost".equals(actorId))
+      {
+        return null;
+      }
+      return actorId + "@example.domain";
+    }
+  }
 }




More information about the jbpm-commits mailing list