[jbpm-commits] JBoss JBPM SVN: r7065 - in jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm: jbpm2036 and 4 other directories.

Author: marco.rietveld Date: 2012-02-21 21:26:34 -0500 (Tue, 21 Feb 2012) New Revision: 7065 Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/Jbpm3386/JBPM3386Test.java jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm3171/JBPM3171Test.java jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm3218/JBPM3218Test.java jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jpdl/xml/TaskNodeXmlTest.java jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/logging/exe/CompositeLogTest.java Log: Random clean up: imports, spacing, etc. Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/Jbpm3386/JBPM3386Test.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/Jbpm3386/JBPM3386Test.java 2012-02-22 02:24:34 UTC (rev 7064) +++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/Jbpm3386/JBPM3386Test.java 2012-02-22 02:26:34 UTC (rev 7065) @@ -31,8 +31,6 @@ import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; -import junit.framework.Test; - import org.apache.log4j.Logger; import org.jbpm.AbstractJbpmTestCase; import org.jbpm.JbpmConfiguration; @@ -41,7 +39,6 @@ import org.jbpm.context.exe.ContextInstance; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; -import org.jbpm.mail.MailTestSetup; import org.subethamail.smtp.AuthenticationHandler; import org.subethamail.smtp.AuthenticationHandlerFactory; import org.subethamail.smtp.auth.LoginAuthenticationHandler; @@ -65,7 +62,7 @@ private JbpmContext jbpmContext; private ProcessInstance processInstance; - private static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseResource("org/jbpm/jbpm3386/jbpm.cfg.xml"); + private static JbpmConfiguration jbpmConfiguration = null; private static Wiser wiser; private static String authUsername = &quot;doug(a)newcastle.uk&quot;; @@ -74,6 +71,9 @@ private static final String toAddress = &quot;tester(a)jboss.org&quot;; protected void setUp() throws Exception { + if( jbpmConfiguration == null ) { + jbpmConfiguration = JbpmConfiguration.parseResource("org/jbpm/jbpm3386/jbpm.cfg.xml"); + } wiser = new Wiser(); MessageListenerAdapter serverMessageListenerAdapter = (MessageListenerAdapter) wiser.getServer() .getMessageHandlerFactory(); Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java 2012-02-22 02:24:34 UTC (rev 7064) +++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java 2012-02-22 02:26:34 UTC (rev 7065) @@ -43,17 +43,13 @@ + " </start-state>" + " <task-node name='midway' end-tasks='yes'>" + " <timer name='chaos' duedate='2 seconds' repeat='5 seconds'>" - + " <action class='" - + TimerAction.class.getName() - + "'>" + + " <action class='" + TimerAction.class.getName() + "'>" + " <leave>true</leave>" + " </action>" + " </timer>" + " <task name='doit'>" + " <timer name='undead' duedate='1 second' repeat='5 seconds'>" - + " <action class='" - + TimerAction.class.getName() - + "'/>" + + " <action class='" + TimerAction.class.getName() + "'/>" + " </timer>" + " </task>" + " <transition to='end'/>" Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm3171/JBPM3171Test.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm3171/JBPM3171Test.java 2012-02-22 02:24:34 UTC (rev 7064) +++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm3171/JBPM3171Test.java 2012-02-22 02:26:34 UTC (rev 7065) @@ -21,8 +21,6 @@ */ package org.jbpm.jbpm3171; -import java.util.Date; - import org.jbpm.AbstractJbpmTestCase; import org.jbpm.context.exe.ContextInstance; import org.jbpm.graph.def.ProcessDefinition; Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm3218/JBPM3218Test.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm3218/JBPM3218Test.java 2012-02-22 02:24:34 UTC (rev 7064) +++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm3218/JBPM3218Test.java 2012-02-22 02:26:34 UTC (rev 7065) @@ -26,7 +26,6 @@ import java.util.Date; import org.jbpm.JbpmConfiguration.Configs; -import org.jbpm.JbpmContext; import org.jbpm.command.CommandService; import org.jbpm.command.ExecuteJobsCommand; import org.jbpm.command.impl.CommandServiceImpl; Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jpdl/xml/TaskNodeXmlTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jpdl/xml/TaskNodeXmlTest.java 2012-02-22 02:24:34 UTC (rev 7064) +++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jpdl/xml/TaskNodeXmlTest.java 2012-02-22 02:26:34 UTC (rev 7065) @@ -135,7 +135,7 @@ " <task-node name='a'>" + " <task name='clean ceiling'>" + " <event type='task-create'>" + - " <action class='org.jbpm.taskmgmt.exe.TaskEventTest$PlusPlus' />" + + " <action class='org.jbpm.taskmgmt.exe.TaskEventExecutionTest$PlusPlus' />" + " </event>" + " </task>" + " </task-node>" + @@ -152,7 +152,7 @@ " <task-node name='a'>" + " <task name='clean ceiling'>" + " <event type='task-start'>" + - " <action class='org.jbpm.taskmgmt.exe.TaskEventTest$PlusPlus' />" + + " <action class='org.jbpm.taskmgmt.exe.TaskEventExecutionTest$PlusPlus' />" + " </event>" + " </task>" + " </task-node>" + @@ -169,7 +169,7 @@ " <task-node name='a'>" + " <task name='clean ceiling'>" + " <event type='task-assign'>" + - " <action class='org.jbpm.taskmgmt.exe.TaskEventTest$PlusPlus' />" + + " <action class='org.jbpm.taskmgmt.exe.TaskEventExecutionTest$PlusPlus' />" + " </event>" + " </task>" + " </task-node>" + @@ -186,7 +186,7 @@ " <task-node name='a'>" + " <task name='clean ceiling'>" + " <event type='task-end'>" + - " <action class='org.jbpm.taskmgmt.exe.TaskEventTest$PlusPlus' />" + + " <action class='org.jbpm.taskmgmt.exe.TaskEventExecutionTest$PlusPlus' />" + " </event>" + " </task>" + " </task-node>" + @@ -203,7 +203,7 @@ " <task-node name='a'>" + " <task name='clean ceiling'>" + " <timer duedate='2 business minutes'>" + - " <action class='org.jbpm.taskmgmt.exe.TaskEventTest$PlusPlus' />" + + " <action class='org.jbpm.taskmgmt.exe.TaskEventExecutionTest$PlusPlus' />" + " </timer>" + " </task>" + " </task-node>" + @@ -230,7 +230,7 @@ " <task-node name='a'>" + " <task name='clean ceiling'>" + " <timer duedate='2 business minutes' cancel-event='task-start, task-assign, task-end'>" + - " <action class='org.jbpm.taskmgmt.exe.TaskEventTest$PlusPlus' />" + + " <action class='org.jbpm.taskmgmt.exe.TaskEventExecutionTest$PlusPlus' />" + " </timer>" + " </task>" + " </task-node>" + Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/logging/exe/CompositeLogTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/logging/exe/CompositeLogTest.java 2012-02-22 02:24:34 UTC (rev 7064) +++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/logging/exe/CompositeLogTest.java 2012-02-22 02:26:34 UTC (rev 7065) @@ -43,6 +43,7 @@ assertNull(one.getParent()); assertSame(one, li.getLogs().get(1)); assertEquals(2, li.getLogs().size()); + assertEquals(0, li.getCompositeLogStack().size()); CompositeLog two = new CompositeLog();