[jbpm-commits] JBoss JBPM SVN: r2224 - in jbpm3/branches/tdiesler/modules/core: src/main/java/org/jbpm and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-09-13 07:51:23 -0400 (Sat, 13 Sep 2008) New Revision: 2224 Modified: jbpm3/branches/tdiesler/modules/core/pom.xml jbpm3/branches/tdiesler/modules/core/src/main/java/org/jbpm/AbstractJbpmTestCase.java jbpm3/branches/tdiesler/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java Log: WIP Modified: jbpm3/branches/tdiesler/modules/core/pom.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/pom.xml 2008-09-13 11:49:41 UTC (rev 2223) +++ jbpm3/branches/tdiesler/modules/core/pom.xml 2008-09-13 11:51:23 UTC (rev 2224) @@ -300,26 +300,92 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <excludes> - <!-- https://jira.jboss.org/jira/browse/JBPM-1720 --> - <exclude>org/jbpm/jcr/JcrDbTest.java</exclude> - <!-- 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> - <!-- https://jira.jboss.org/jira/browse/JBPM-1724 --> - <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude> - <!-- https://jira.jboss.org/jira/browse/JBPM-1718 --> - <exclude>org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java</exclude> - <exclude>org/jbpm/job/executor/JobExecutorDbTest.java</exclude> - <exclude>org/jbpm/jpdl/exe/JoinDbTest.java</exclude> - </excludes> + <includes> + <include>org/jbpm/bytes/ByteArrayDbTest.java</include> + <include>org/jbpm/context/exe/ContextInstanceDbTest.java</include> + <include>org/jbpm/context/exe/CustomVariableLongIdDbTest.java</include> + <include>org/jbpm/context/exe/CustomVariableStringIdDbTest.java</include> + <include>org/jbpm/context/exe/TokenVariableMapDbTest.java</include> + <include>org/jbpm/context/exe/VariableInstanceDbTest.java</include> + <include>org/jbpm/context/exe/VariableQueryDbTest.java</include> + <include>org/jbpm/context/log/VariableUpdateDbTest.java</include> + <include>org/jbpm/db/ContextSessionDbTest.java</include> + <include>org/jbpm/db/DeleteProcessInstanceDbTest.java</include> + <include>org/jbpm/db/GraphSessionDbTest.java</include> + <include>org/jbpm/db/IdAssignmentDbTest.java</include> + <include>org/jbpm/db/JbpmContextGetDbTest.java</include> + <include>org/jbpm/db/TaskMgmtSessionDbTest.java</include> + <include>org/jbpm/graph/action/ActionDbTest.java</include> + <include>org/jbpm/graph/def/DescriptionDbTest.java</include> + <include>org/jbpm/graph/def/EventDbTest.java</include> + <include>org/jbpm/graph/def/ExceptionHandlerDbTest.java</include> + <include>org/jbpm/graph/def/MultipleProcessDefinitionEventsDbTest.java</include> + <include>org/jbpm/graph/def/NodeDbTest.java</include> + <include>org/jbpm/graph/def/ProcessDefinitionDbTest.java</include> + <include>org/jbpm/graph/def/SuperStateDbTest.java</include> + <include>org/jbpm/graph/def/TransitionDbTest.java</include> + <include>org/jbpm/graph/exe/BusinessKeyDbTest.java</include> + <include>org/jbpm/graph/exe/CommentDbTest.java</include> + <include>org/jbpm/graph/exe/ProcessInstanceDbTest.java</include> + <include>org/jbpm/graph/exe/RuntimeActionDbTest.java</include> + <include>org/jbpm/graph/exe/StateDbTest.java</include> + <include>org/jbpm/graph/exe/SubProcessCancellationTest.java</include> + <include>org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java</include> + <include>org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java</include> + <include>org/jbpm/graph/exe/SuspendAndResumeDbTest.java</include> + <include>org/jbpm/graph/exe/TokenDbTest.java</include> + <include>org/jbpm/graph/log/ActionLogDbTest.java</include> + <include>org/jbpm/graph/log/NodeLogDbTest.java</include> + <include>org/jbpm/graph/log/ProcessInstanceLogsDbTest.java</include> + <include>org/jbpm/graph/log/SignalLogDbTest.java</include> + <include>org/jbpm/graph/log/TokenLogsDbTest.java</include> + <include>org/jbpm/graph/log/TransitionLogDbTest.java</include> + <include>org/jbpm/graph/node/EndStateDbTest.java</include> + <include>org/jbpm/graph/node/JpdlDbTest.java</include> + <include>org/jbpm/graph/node/ProcessStateDbTest.java</include> + <include>org/jbpm/graph/node/StartStateDbTest.java</include> + <include>org/jbpm/graph/node/TaskNotificationDbTest.java</include> + <include>org/jbpm/jbpm1024/JBPM1024Test.java</include> + <include>org/jbpm/jbpm1072/JBPM1072Test.java</include> + <include>org/jbpm/jbpm1106/JBPM1106Test.java</include> + <include>org/jbpm/jbpm1135/JBPM1135Test.java</include> + <include>org/jbpm/jbpm1452/JBPM1452Test.java</include> + <include>org/jbpm/jbpm522/JBPM522Test.java</include> + <include>org/jbpm/jbpm983/JBPM983Test.java</include> + <include>org/jbpm/jcr/JcrDbTest.java</include> + <include>org/jbpm/job/executor/JobLoadJoinTest.java</include> + <include>org/jbpm/job/executor/JobLoadSubProcessTest.java</include> + <include>org/jbpm/jpdl/el/ActionExpressionDbTest.java</include> + <include>org/jbpm/jpdl/exe/AvailableTransitionsDbTest.java</include> + <include>org/jbpm/jpdl/exe/JoinDbTest.java</include> + <include>org/jbpm/jpdl/par/ProcessArchiveClassLoadingDbTest.java</include> + <include>org/jbpm/jpdl/par/ProcessArchiveDeploymentDbTest.java</include> + <include>org/jbpm/logging/exe/LoggingConfigDbTest.java</include> + <include>org/jbpm/logging/log/ProcessLogDbTest.java</include> + <include>org/jbpm/msg/command/AsyncExecutionDbTest.java</include> + <include>org/jbpm/optimisticlocking/LockingTest.java</include> + <include>org/jbpm/perf/TasklistEagerLoadingTest.java</include> + <include>org/jbpm/persistence/db/FlushDbTest.java</include> + <include>org/jbpm/scenarios/AsyncTimerAndSubProcessDbTest.java</include> + <include>org/jbpm/scenarios/TwoSubProcessesInOneTransactionDbTest.java</include> + <include>org/jbpm/scheduler/exe/TimerDbTest.java</include> + <include>org/jbpm/scheduler/exe/UnsafeSessionUsageTest.java</include> + <include>org/jbpm/taskmgmt/def/SwimlaneDbTest.java</include> + <include>org/jbpm/taskmgmt/def/TaskControllerDbTest.java</include> + <include>org/jbpm/taskmgmt/def/TaskDbTest.java</include> + <include>org/jbpm/taskmgmt/def/TaskMgmtDefinitionDbTest.java</include> + <include>org/jbpm/taskmgmt/exe/BlockingTaskDbTest.java</include> + <include>org/jbpm/taskmgmt/exe/EndTasksDbTest.java</include> + <include>org/jbpm/taskmgmt/exe/SwimlaneDbTest.java</include> + <include>org/jbpm/taskmgmt/exe/TaskAssignmentDbTest.java</include> + <include>org/jbpm/taskmgmt/exe/TaskInstanceDbTest.java</include> + <include>org/jbpm/taskmgmt/exe/TaskMgmtInstanceDbTest.java</include> + <include>org/jbpm/taskmgmt/exe/TaskTimerExecutionDbTest.java</include> + <include>org/jbpm/taskmgmt/exe/TaskVariableAccessDbTest.java</include> + <include>org/jbpm/taskmgmt/exe/TaskVariablesDbTest.java</include> + <include>org/jbpm/taskmgmt/log/SwimlaneLogDbTest.java</include> + <include>org/jbpm/taskmgmt/log/TaskLogDbTest.java</include> + </includes> </configuration> </plugin> </plugins> Modified: jbpm3/branches/tdiesler/modules/core/src/main/java/org/jbpm/AbstractJbpmTestCase.java =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/java/org/jbpm/AbstractJbpmTestCase.java 2008-09-13 11:49:41 UTC (rev 2223) +++ jbpm3/branches/tdiesler/modules/core/src/main/java/org/jbpm/AbstractJbpmTestCase.java 2008-09-13 11:51:23 UTC (rev 2224) @@ -30,4 +30,15 @@ JbpmConfigurationTestHelper.reset(); JbpmContextTestHelper.reset(); } + + protected String getShortName() + { + String shortName = getClass().getName(); + return shortName.substring(shortName.lastIndexOf('.') + 1) + "." + getName(); + } + + protected String getLongName() + { + return getClass().getName() + "." + getName(); + } } Modified: jbpm3/branches/tdiesler/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2008-09-13 11:49:41 UTC (rev 2223) +++ jbpm3/branches/tdiesler/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2008-09-13 11:51:23 UTC (rev 2224) @@ -55,20 +55,53 @@ protected JobExecutor jobExecutor; + private long before, after; + public void setUp() throws Exception { - log.debug("### starting " + getClass().getName() + "." + getName() + " ####################################################"); + System.out.println(); + log.debug("### starting " + getLongName() + " ####################################################"); + + before = System.currentTimeMillis(); + super.setUp(); + after = System.currentTimeMillis(); + System.out.println("super.setUp: " + (after - before) + "ms"); + before = after; + createSchema(); + after = System.currentTimeMillis(); + System.out.println("createSchema: " + (after - before) + "ms"); + before = after; + createJbpmContext(); + after = System.currentTimeMillis(); + System.out.println("createJbpmContext: " + (after - before) + "ms"); + before = after; + initializeMembers(); + after = System.currentTimeMillis(); + System.out.println("initializeMembers: " + (after - before) + "ms"); + before = after; } public void tearDown() throws Exception { + after = System.currentTimeMillis(); + System.out.println(getShortName() + ": " + (after - before) + "ms"); + before = after; + resetMembers(); + after = System.currentTimeMillis(); + System.out.println("resetMembers: " + (after - before) + "ms"); + before = after; + closeJbpmContext(); + after = System.currentTimeMillis(); + System.out.println("closeJbpmContext: " + (after - before) + "ms"); + super.tearDown(); - log.debug("### " + getClass().getName() + "." + getName() + " done ####################################################"); + log.debug("### " + getLongName() + " done ####################################################"); + System.out.println(); } public void beginSessionTransaction()