Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
131be3e8
F
Flowable Engine
项目概览
开发团队
/
Flowable Engine
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Flowable Engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
131be3e8
编写于
6月 22, 2010
作者:
D
dsyer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove ActivitiTestCase
上级
15e821de
变更
45
隐藏空白更改
内联
并排
Showing
45 changed file
with
114 addition
and
182 deletion
+114
-182
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/event/timer/BoundaryTimerEventTest.java
...iti/examples/bpmn/event/timer/BoundaryTimerEventTest.java
+1
-2
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/gateway/ExclusiveGatewayTest.java
.../activiti/examples/bpmn/gateway/ExclusiveGatewayTest.java
+1
-2
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/gateway/ParallelGatewayTest.java
...g/activiti/examples/bpmn/gateway/ParallelGatewayTest.java
+1
-2
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/scripttask/ScriptTaskTest.java
...org/activiti/examples/bpmn/scripttask/ScriptTaskTest.java
+1
-2
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/usertask/FinancialReportProcessTest.java
...ti/examples/bpmn/usertask/FinancialReportProcessTest.java
+1
-2
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/usertask/taskassignee/TaskAssigneeTest.java
...examples/bpmn/usertask/taskassignee/TaskAssigneeTest.java
+1
-2
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.java
...amples/bpmn/usertask/taskcandidate/TaskCandidateTest.java
+1
-2
modules/activiti-engine-examples/src/test/java/org/activiti/examples/mgmt/ManagementServiceTest.java
...ava/org/activiti/examples/mgmt/ManagementServiceTest.java
+1
-2
modules/activiti-engine-examples/src/test/java/org/activiti/examples/processdefinitions/ProcessDefinitionsTest.java
...i/examples/processdefinitions/ProcessDefinitionsTest.java
+1
-2
modules/activiti-engine-examples/src/test/java/org/activiti/examples/task/StandaloneTaskTest.java
...t/java/org/activiti/examples/task/StandaloneTaskTest.java
+1
-2
modules/activiti-engine-examples/src/test/java/org/activiti/examples/taskforms/TaskFormsTest.java
...t/java/org/activiti/examples/taskforms/TaskFormsTest.java
+1
-2
modules/activiti-engine-examples/src/test/java/org/activiti/examples/variables/VariablesTest.java
...t/java/org/activiti/examples/variables/VariablesTest.java
+1
-2
modules/activiti-engine-init/src/main/java/org/activiti/impl/servlet/ProcessEnginesServlet.java
...java/org/activiti/impl/servlet/ProcessEnginesServlet.java
+0
-8
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/StartToEndTest.java
.../src/test/java/org/activiti/test/bpmn/StartToEndTest.java
+1
-2
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/event/timer/BoundaryTimerEventTest.java
...ctiviti/test/bpmn/event/timer/BoundaryTimerEventTest.java
+1
-2
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/gateway/ExclusiveGatewayTest.java
.../org/activiti/test/bpmn/gateway/ExclusiveGatewayTest.java
+1
-2
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/parse/InvalidProcessTest.java
...java/org/activiti/test/bpmn/parse/InvalidProcessTest.java
+2
-3
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/property/PropertyTest.java
...st/java/org/activiti/test/bpmn/property/PropertyTest.java
+1
-2
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/servicetask/JavaServiceTaskTest.java
...g/activiti/test/bpmn/servicetask/JavaServiceTaskTest.java
+1
-2
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/usertask/TaskAssignmentExtensionsTest.java
...viti/test/bpmn/usertask/TaskAssignmentExtensionsTest.java
+31
-25
modules/activiti-engine-test-api/src/test/java/org/activiti/test/deploy/DeploymentTest.java
...rc/test/java/org/activiti/test/deploy/DeploymentTest.java
+1
-2
modules/activiti-engine-test-api/src/test/java/org/activiti/test/jobexecutor/JobExecutorCmdExceptionTest.java
...ctiviti/test/jobexecutor/JobExecutorCmdExceptionTest.java
+1
-2
modules/activiti-engine-test-api/src/test/java/org/activiti/test/jobexecutor/JobExecutorTestCase.java
...va/org/activiti/test/jobexecutor/JobExecutorTestCase.java
+1
-2
modules/activiti-engine-test-api/src/test/java/org/activiti/test/json/JsonTest.java
...st-api/src/test/java/org/activiti/test/json/JsonTest.java
+1
-2
modules/activiti-engine-test-api/src/test/java/org/activiti/test/processinstance/ProcessInstanceQueryTest.java
...tiviti/test/processinstance/ProcessInstanceQueryTest.java
+1
-2
modules/activiti-engine-test-api/src/test/java/org/activiti/test/service/ProcessServiceTest.java
...st/java/org/activiti/test/service/ProcessServiceTest.java
+1
-2
modules/activiti-engine-test-api/src/test/java/org/activiti/test/service/TaskServiceTest.java
.../test/java/org/activiti/test/service/TaskServiceTest.java
+1
-2
modules/activiti-engine-test-api/src/test/java/org/activiti/test/task/TaskQueryTest.java
...i/src/test/java/org/activiti/test/task/TaskQueryTest.java
+1
-2
modules/activiti-engine/src/main/java/org/activiti/impl/bytes/ByteArrayImpl.java
.../src/main/java/org/activiti/impl/bytes/ByteArrayImpl.java
+0
-1
modules/activiti-engine/src/main/java/org/activiti/impl/definition/ScopeElementImpl.java
...n/java/org/activiti/impl/definition/ScopeElementImpl.java
+0
-1
modules/activiti-engine/src/main/java/org/activiti/impl/embeddedstate/EmbeddedState.java
...n/java/org/activiti/impl/embeddedstate/EmbeddedState.java
+0
-1
modules/activiti-engine/src/main/java/org/activiti/impl/form/JuelFormEngine.java
.../src/main/java/org/activiti/impl/form/JuelFormEngine.java
+0
-11
modules/activiti-engine/src/main/java/org/activiti/impl/io/ResourceStreamSource.java
.../main/java/org/activiti/impl/io/ResourceStreamSource.java
+0
-2
modules/activiti-engine/src/main/java/org/activiti/impl/query/AbstractQuery.java
.../src/main/java/org/activiti/impl/query/AbstractQuery.java
+0
-7
modules/activiti-engine/src/main/java/org/activiti/impl/repository/DeploymentImpl.java
...ain/java/org/activiti/impl/repository/DeploymentImpl.java
+0
-1
modules/activiti-engine/src/main/java/org/activiti/impl/scripting/ExpressionCondition.java
...java/org/activiti/impl/scripting/ExpressionCondition.java
+0
-1
modules/activiti-engine/src/main/java/org/activiti/impl/task/TaskImpl.java
...engine/src/main/java/org/activiti/impl/task/TaskImpl.java
+0
-2
modules/activiti-engine/src/main/java/org/activiti/impl/task/TaskInvolvement.java
...src/main/java/org/activiti/impl/task/TaskInvolvement.java
+0
-1
modules/activiti-engine/src/main/java/org/activiti/test/ActivitiTestCase.java
...ine/src/main/java/org/activiti/test/ActivitiTestCase.java
+0
-21
modules/activiti-engine/src/main/java/org/activiti/test/ProcessDeployer.java
...gine/src/main/java/org/activiti/test/ProcessDeployer.java
+52
-4
modules/activiti-engine/src/main/java/org/activiti/test/ResourceUtils.java
...engine/src/main/java/org/activiti/test/ResourceUtils.java
+0
-35
modules/activiti-rest/src/main/java/org/activiti/rest/api/management/TableDataGet.java
...n/java/org/activiti/rest/api/management/TableDataGet.java
+1
-2
modules/activiti-rest/src/main/java/org/activiti/rest/api/management/TableGet.java
.../main/java/org/activiti/rest/api/management/TableGet.java
+1
-2
modules/activiti-rest/src/main/java/org/activiti/rest/api/tasks/TaskOperationPut.java
...in/java/org/activiti/rest/api/tasks/TaskOperationPut.java
+1
-2
modules/activiti-rest/src/main/java/org/activiti/rest/api/tasks/TasksGet.java
...t/src/main/java/org/activiti/rest/api/tasks/TasksGet.java
+1
-2
未找到文件。
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/event/timer/BoundaryTimerEventTest.java
浏览文件 @
131be3e8
...
...
@@ -19,7 +19,6 @@ import java.util.Date;
import
org.activiti.ProcessInstance
;
import
org.activiti.Task
;
import
org.activiti.impl.time.Clock
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.JobExecutorPoller
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
...
...
@@ -30,7 +29,7 @@ import org.junit.Test;
/**
* @author Joram Barrez
*/
public
class
BoundaryTimerEventTest
extends
ActivitiTestCase
{
public
class
BoundaryTimerEventTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/gateway/ExclusiveGatewayTest.java
浏览文件 @
131be3e8
...
...
@@ -20,7 +20,6 @@ import java.util.Map;
import
org.activiti.ActivitiException
;
import
org.activiti.ProcessInstance
;
import
org.activiti.Task
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -32,7 +31,7 @@ import org.junit.Test;
*
* @author Joram Barrez
*/
public
class
ExclusiveGatewayTest
extends
ActivitiTestCase
{
public
class
ExclusiveGatewayTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/gateway/ParallelGatewayTest.java
浏览文件 @
131be3e8
...
...
@@ -20,7 +20,6 @@ import java.util.List;
import
org.activiti.ProcessInstance
;
import
org.activiti.Task
;
import
org.activiti.TaskQuery
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -31,7 +30,7 @@ import org.junit.Test;
/**
* @author jbarrez
*/
public
class
ParallelGatewayTest
extends
ActivitiTestCase
{
public
class
ParallelGatewayTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/scripttask/ScriptTaskTest.java
浏览文件 @
131be3e8
...
...
@@ -16,7 +16,6 @@ import static org.junit.Assert.assertEquals;
import
static
org
.
junit
.
Assert
.
assertNull
;
import
org.activiti.ProcessInstance
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -27,7 +26,7 @@ import org.junit.Test;
/**
* @author Joram Barrez
*/
public
class
ScriptTaskTest
extends
ActivitiTestCase
{
public
class
ScriptTaskTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/usertask/FinancialReportProcessTest.java
浏览文件 @
131be3e8
...
...
@@ -6,7 +6,6 @@ import java.util.List;
import
org.activiti.ProcessInstance
;
import
org.activiti.Task
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -16,7 +15,7 @@ import org.junit.Rule;
import
org.junit.Test
;
public
class
FinancialReportProcessTest
extends
ActivitiTestCase
{
public
class
FinancialReportProcessTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/usertask/taskassignee/TaskAssigneeTest.java
浏览文件 @
131be3e8
...
...
@@ -18,7 +18,6 @@ import java.util.List;
import
org.activiti.ProcessInstance
;
import
org.activiti.Task
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -31,7 +30,7 @@ import org.junit.Test;
*
* @author Joram Barrez
*/
public
class
TaskAssigneeTest
extends
ActivitiTestCase
{
public
class
TaskAssigneeTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-examples/src/test/java/org/activiti/examples/bpmn/usertask/taskcandidate/TaskCandidateTest.java
浏览文件 @
131be3e8
...
...
@@ -23,7 +23,6 @@ import org.activiti.Task;
import
org.activiti.TaskService
;
import
org.activiti.identity.Group
;
import
org.activiti.identity.User
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -35,7 +34,7 @@ import org.junit.Test;
/**
* @author Joram Barrez
*/
public
class
TaskCandidateTest
extends
ActivitiTestCase
{
public
class
TaskCandidateTest
{
private
static
final
String
KERMIT
=
"kermit"
;
...
...
modules/activiti-engine-examples/src/test/java/org/activiti/examples/mgmt/ManagementServiceTest.java
浏览文件 @
131be3e8
...
...
@@ -19,7 +19,6 @@ import java.util.Map;
import
org.activiti.ManagementService
;
import
org.activiti.TableMetaData
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeployer
;
import
org.junit.Rule
;
...
...
@@ -31,7 +30,7 @@ import org.junit.Test;
* @author Tom Baeyens
* @author Joram Barrez
*/
public
class
ManagementServiceTest
extends
ActivitiTestCase
{
public
class
ManagementServiceTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-examples/src/test/java/org/activiti/examples/processdefinitions/ProcessDefinitionsTest.java
浏览文件 @
131be3e8
...
...
@@ -18,7 +18,6 @@ import static org.junit.Assert.assertNotNull;
import
java.util.List
;
import
org.activiti.ProcessDefinition
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeployer
;
import
org.junit.Rule
;
...
...
@@ -27,7 +26,7 @@ import org.junit.Test;
/**
* @author Tom Baeyens
*/
public
class
ProcessDefinitionsTest
extends
ActivitiTestCase
{
public
class
ProcessDefinitionsTest
{
private
static
final
String
NAMESPACE
=
"xmlns='http://www.omg.org/spec/BPMN/20100524/MODEL'"
;
...
...
modules/activiti-engine-examples/src/test/java/org/activiti/examples/task/StandaloneTaskTest.java
浏览文件 @
131be3e8
...
...
@@ -19,7 +19,6 @@ import static org.junit.Assert.assertTrue;
import
java.util.List
;
import
org.activiti.Task
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeployer
;
import
org.junit.After
;
...
...
@@ -30,7 +29,7 @@ import org.junit.Test;
/**
* @author Joram Barrez
*/
public
class
StandaloneTaskTest
extends
ActivitiTestCase
{
public
class
StandaloneTaskTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-examples/src/test/java/org/activiti/examples/taskforms/TaskFormsTest.java
浏览文件 @
131be3e8
...
...
@@ -20,7 +20,6 @@ import java.util.HashMap;
import
java.util.Map
;
import
org.activiti.Task
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -33,7 +32,7 @@ import org.junit.Test;
* @author Tom Baeyens
* @author Joram Barrez
*/
public
class
TaskFormsTest
extends
ActivitiTestCase
{
public
class
TaskFormsTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-examples/src/test/java/org/activiti/examples/variables/VariablesTest.java
浏览文件 @
131be3e8
...
...
@@ -23,7 +23,6 @@ import java.util.List;
import
java.util.Map
;
import
org.activiti.ProcessInstance
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -33,7 +32,7 @@ import org.junit.Test;
/**
* @author Tom Baeyens
*/
public
class
VariablesTest
extends
ActivitiTestCase
{
public
class
VariablesTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-init/src/main/java/org/activiti/impl/servlet/ProcessEnginesServlet.java
浏览文件 @
131be3e8
...
...
@@ -12,16 +12,8 @@
*/
package
org.activiti.impl.servlet
;
import
java.io.IOException
;
import
java.util.Map
;
import
javax.servlet.ServletException
;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.HttpServlet
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
org.activiti.ProcessEngine
;
import
org.activiti.ProcessEngines
;
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/StartToEndTest.java
浏览文件 @
131be3e8
...
...
@@ -15,7 +15,6 @@ package org.activiti.test.bpmn;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
org.activiti.ProcessInstance
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -25,7 +24,7 @@ import org.junit.Test;
/**
* @author Joram Barrez
*/
public
class
StartToEndTest
extends
ActivitiTestCase
{
public
class
StartToEndTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/event/timer/BoundaryTimerEventTest.java
浏览文件 @
131be3e8
...
...
@@ -23,7 +23,6 @@ import org.activiti.JobQuery;
import
org.activiti.ProcessInstance
;
import
org.activiti.Task
;
import
org.activiti.impl.time.Clock
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.JobExecutorPoller
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
...
...
@@ -34,7 +33,7 @@ import org.junit.Test;
/**
* @author jbarrez
*/
public
class
BoundaryTimerEventTest
extends
ActivitiTestCase
{
public
class
BoundaryTimerEventTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/gateway/ExclusiveGatewayTest.java
浏览文件 @
131be3e8
...
...
@@ -16,7 +16,6 @@ import static org.junit.Assert.assertEquals;
import
org.activiti.ActivitiException
;
import
org.activiti.ProcessInstance
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -28,7 +27,7 @@ import org.junit.rules.ExpectedException;
/**
* @author Joram Barrez
*/
public
class
ExclusiveGatewayTest
extends
ActivitiTestCase
{
public
class
ExclusiveGatewayTest
{
@Rule
public
ExpectedException
exception
=
ExpectedException
.
none
();
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/parse/InvalidProcessTest.java
浏览文件 @
131be3e8
...
...
@@ -13,9 +13,8 @@
package
org.activiti.test.bpmn.parse
;
import
org.activiti.ActivitiException
;
import
org.activiti.test.
ActivitiTestCase
;
import
org.activiti.test.
ProcessDeployer
;
import
org.activiti.test.ProcessEngineBuilder
;
import
org.activiti.test.ResourceUtils
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.junit.rules.ExpectedException
;
...
...
@@ -38,7 +37,7 @@ public class InvalidProcessTest {
public
void
testInvalidProcessDefinition
()
{
exception
.
expect
(
ActivitiException
.
class
);
exception
.
expectMessage
(
"Attribute 'invalidAttribute' is not allowed to appear in element 'process'"
);
String
resource
=
ResourceUtils
.
getProcessDefinitionResource
(
getClass
(),
(
getClass
().
getSimpleName
()+
".testInvalidProcessDefinition.bpmn20.xml"
)
);
String
resource
=
ProcessDeployer
.
getBpmnProcessDefinitionResource
(
getClass
(),
"testInvalidProcessDefinition"
);
processEngineBuilder
.
getProcessService
().
createDeployment
().
name
(
resource
).
addClasspathResource
(
resource
).
deploy
();
}
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/property/PropertyTest.java
浏览文件 @
131be3e8
...
...
@@ -23,7 +23,6 @@ import java.util.Map;
import
org.activiti.Execution
;
import
org.activiti.ProcessInstance
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -34,7 +33,7 @@ import org.junit.Test;
/**
* @author Joram Barrez
*/
public
class
PropertyTest
extends
ActivitiTestCase
{
public
class
PropertyTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/servicetask/JavaServiceTaskTest.java
浏览文件 @
131be3e8
...
...
@@ -14,7 +14,6 @@ package org.activiti.test.bpmn.servicetask;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -24,7 +23,7 @@ import org.junit.Test;
/**
* @author Joram Barrez
*/
public
class
JavaServiceTaskTest
extends
ActivitiTestCase
{
public
class
JavaServiceTaskTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/bpmn/usertask/TaskAssignmentExtensionsTest.java
浏览文件 @
131be3e8
...
...
@@ -17,13 +17,13 @@ import static org.junit.Assert.assertEquals;
import
java.util.List
;
import
org.activiti.ActivitiException
;
import
org.activiti.IdentityService
;
import
org.activiti.Task
;
import
org.activiti.TaskQuery
;
import
org.activiti.
test.ActivitiTestCas
e
;
import
org.activiti.
TaskServic
e
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
import
org.activiti.test.ResourceUtils
;
import
org.junit.After
;
import
org.junit.Before
;
import
org.junit.Rule
;
...
...
@@ -35,36 +35,40 @@ import org.junit.rules.ExpectedException;
*
* @author Joram Barrez
*/
public
class
TaskAssignmentExtensionsTest
extends
ActivitiTestCase
{
public
class
TaskAssignmentExtensionsTest
{
@Rule
public
ExpectedException
exception
=
ExpectedException
.
none
();
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
@Rule
public
ProcessDeployer
deployer
=
new
ProcessDeployer
();
@Before
public
void
setUp
()
throws
Exception
{
deployer
.
getIdentityService
().
saveUser
(
deployer
.
getIdentityService
().
newUser
(
"kermit"
));
deployer
.
getIdentityService
().
saveUser
(
deployer
.
getIdentityService
().
newUser
(
"gonzo"
));
deployer
.
getIdentityService
().
saveUser
(
deployer
.
getIdentityService
().
newUser
(
"fozzie"
));
IdentityService
identityService
=
deployer
.
getIdentityService
();
identityService
.
saveUser
(
identityService
.
newUser
(
"kermit"
));
identityService
.
saveUser
(
identityService
.
newUser
(
"gonzo"
));
identityService
.
saveUser
(
identityService
.
newUser
(
"fozzie"
));
deployer
.
getIdentityService
().
saveGroup
(
deployer
.
getIdentityService
()
.
newGroup
(
"management"
));
deployer
.
getIdentityService
().
saveGroup
(
deployer
.
getIdentityService
()
.
newGroup
(
"accountancy"
));
identityService
.
saveGroup
(
identityService
.
newGroup
(
"management"
));
identityService
.
saveGroup
(
identityService
.
newGroup
(
"accountancy"
));
deployer
.
getIdentityService
()
.
createMembership
(
"kermit"
,
"management"
);
deployer
.
getIdentityService
()
.
createMembership
(
"kermit"
,
"accountancy"
);
deployer
.
getIdentityService
()
.
createMembership
(
"fozzie"
,
"management"
);
identityService
.
createMembership
(
"kermit"
,
"management"
);
identityService
.
createMembership
(
"kermit"
,
"accountancy"
);
identityService
.
createMembership
(
"fozzie"
,
"management"
);
}
@After
public
void
tearDown
()
throws
Exception
{
deployer
.
getIdentityService
().
deleteGroup
(
"accountancy"
);
deployer
.
getIdentityService
().
deleteGroup
(
"management"
);
deployer
.
getIdentityService
().
deleteUser
(
"fozzie"
);
deployer
.
getIdentityService
().
deleteUser
(
"gonzo"
);
deployer
.
getIdentityService
().
deleteUser
(
"kermit"
);
IdentityService
identityService
=
deployer
.
getIdentityService
();
identityService
.
deleteGroup
(
"accountancy"
);
identityService
.
deleteGroup
(
"management"
);
identityService
.
deleteUser
(
"fozzie"
);
identityService
.
deleteUser
(
"gonzo"
);
identityService
.
deleteUser
(
"kermit"
);
}
@Test
...
...
@@ -80,8 +84,8 @@ public class TaskAssignmentExtensionsTest extends ActivitiTestCase {
public
void
testDuplicateAssigneeDeclaration
()
{
exception
.
expect
(
ActivitiException
.
class
);
exception
.
expectMessage
(
"duplicate assignee declaration for task"
);
String
resource
=
ResourceUtils
.
getProcessDefinitionResource
(
getClass
(),
(
getClass
().
getSimpleName
()+
".testDuplicateAssigneeDeclaration.bpmn20.xml"
)
);
deployer
.
getProcessService
().
createDeployment
().
name
(
resource
).
addClasspathResource
(
resource
).
deploy
();
String
resource
=
ProcessDeployer
.
getBpmnProcessDefinitionResource
(
getClass
(),
"testDuplicateAssigneeDeclaration"
);
deployer
.
createDeployment
().
name
(
resource
).
addClasspathResource
(
resource
).
deploy
();
}
@Test
...
...
@@ -101,16 +105,17 @@ public class TaskAssignmentExtensionsTest extends ActivitiTestCase {
// Bugfix check: potentially the query could return 2 tasks since
// kermit is a member of the two candidate groups
List
<
Task
>
tasks
=
deployer
.
getTaskService
().
findUnassignedTasks
(
"kermit"
);
TaskService
taskService
=
deployer
.
getTaskService
();
List
<
Task
>
tasks
=
taskService
.
findUnassignedTasks
(
"kermit"
);
assertEquals
(
1
,
tasks
.
size
());
assertEquals
(
"make profit"
,
tasks
.
get
(
0
).
getName
());
tasks
=
deployer
.
getTaskService
()
.
findUnassignedTasks
(
"fozzie"
);
tasks
=
taskService
.
findUnassignedTasks
(
"fozzie"
);
assertEquals
(
1
,
tasks
.
size
());
assertEquals
(
"make profit"
,
tasks
.
get
(
0
).
getName
());
// Test the task query find-by-candidate-group operation
TaskQuery
query
=
deployer
.
getTaskService
()
.
createTaskQuery
();
TaskQuery
query
=
taskService
.
createTaskQuery
();
assertEquals
(
1
,
query
.
candidateGroup
(
"management"
).
count
());
assertEquals
(
1
,
query
.
candidateGroup
(
"accountancy"
).
count
());
}
...
...
@@ -122,16 +127,17 @@ public class TaskAssignmentExtensionsTest extends ActivitiTestCase {
public
void
testMixedCandidateUserDefinition
()
{
deployer
.
getProcessService
().
startProcessInstanceByKey
(
"mixedCandidateUser"
);
List
<
Task
>
tasks
=
deployer
.
getTaskService
().
findUnassignedTasks
(
"kermit"
);
TaskService
taskService
=
deployer
.
getTaskService
();
List
<
Task
>
tasks
=
taskService
.
findUnassignedTasks
(
"kermit"
);
assertEquals
(
1
,
tasks
.
size
());
tasks
=
deployer
.
getTaskService
()
.
findUnassignedTasks
(
"fozzie"
);
tasks
=
taskService
.
findUnassignedTasks
(
"fozzie"
);
assertEquals
(
1
,
tasks
.
size
());
tasks
=
deployer
.
getTaskService
()
.
findUnassignedTasks
(
"gonzo"
);
tasks
=
taskService
.
findUnassignedTasks
(
"gonzo"
);
assertEquals
(
1
,
tasks
.
size
());
tasks
=
deployer
.
getTaskService
()
.
findUnassignedTasks
(
"mispiggy"
);
tasks
=
taskService
.
findUnassignedTasks
(
"mispiggy"
);
assertEquals
(
0
,
tasks
.
size
());
}
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/deploy/DeploymentTest.java
浏览文件 @
131be3e8
...
...
@@ -20,7 +20,6 @@ import java.util.List;
import
org.activiti.Deployment
;
import
org.activiti.impl.util.IoUtil
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeployer
;
import
org.junit.Rule
;
...
...
@@ -30,7 +29,7 @@ import org.junit.Test;
* @author Tom Baeyens
* @author Joram Barrez
*/
public
class
DeploymentTest
extends
ActivitiTestCase
{
public
class
DeploymentTest
{
private
static
final
String
TO_REPLACE
=
"to_replace"
;
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/jobexecutor/JobExecutorCmdExceptionTest.java
浏览文件 @
131be3e8
...
...
@@ -9,7 +9,6 @@ import org.activiti.impl.interceptor.Command;
import
org.activiti.impl.interceptor.CommandContext
;
import
org.activiti.impl.interceptor.CommandExecutor
;
import
org.activiti.impl.job.MessageImpl
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.JobExecutorPoller
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -22,7 +21,7 @@ import org.junit.Test;
* @author tombaeyens
*
*/
public
class
JobExecutorCmdExceptionTest
extends
ActivitiTestCase
{
public
class
JobExecutorCmdExceptionTest
{
protected
TweetExceptionHandler
tweetExceptionHandler
=
new
TweetExceptionHandler
();
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/jobexecutor/JobExecutorTestCase.java
浏览文件 @
131be3e8
...
...
@@ -17,7 +17,6 @@ import java.util.Date;
import
org.activiti.impl.ProcessEngineImpl
;
import
org.activiti.impl.job.MessageImpl
;
import
org.activiti.impl.job.TimerImpl
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeployer
;
import
org.junit.After
;
...
...
@@ -27,7 +26,7 @@ import org.junit.Rule;
/**
* @author Tom Baeyens
*/
public
class
JobExecutorTestCase
extends
ActivitiTestCase
{
public
class
JobExecutorTestCase
{
protected
TweetHandler
tweetHandler
=
new
TweetHandler
();
@Rule
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/json/JsonTest.java
浏览文件 @
131be3e8
...
...
@@ -18,7 +18,6 @@ import org.activiti.ProcessDefinition;
import
org.activiti.ProcessService
;
import
org.activiti.json.JsonListConverter
;
import
org.activiti.json.JsonProcessDefinitionConverter
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeployer
;
import
org.junit.Rule
;
...
...
@@ -28,7 +27,7 @@ import org.junit.Test;
/**
* @author Tom Baeyens
*/
public
class
JsonTest
extends
ActivitiTestCase
{
public
class
JsonTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/processinstance/ProcessInstanceQueryTest.java
浏览文件 @
131be3e8
...
...
@@ -17,7 +17,6 @@ import static org.junit.Assert.assertNotNull;
import
org.activiti.ActivitiException
;
import
org.activiti.ProcessInstanceQuery
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -29,7 +28,7 @@ import org.junit.rules.ExpectedException;
/**
* @author Joram Barrez
*/
public
class
ProcessInstanceQueryTest
extends
ActivitiTestCase
{
public
class
ProcessInstanceQueryTest
{
@Rule
public
ExpectedException
exception
=
ExpectedException
.
none
();
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/service/ProcessServiceTest.java
浏览文件 @
131be3e8
...
...
@@ -20,7 +20,6 @@ import java.util.List;
import
org.activiti.ActivitiException
;
import
org.activiti.ProcessDefinition
;
import
org.activiti.ProcessInstance
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -31,7 +30,7 @@ import org.junit.rules.ExpectedException;
/**
* @author Joram Barrez
*/
public
class
ProcessServiceTest
extends
ActivitiTestCase
{
public
class
ProcessServiceTest
{
@Rule
public
ExpectedException
exception
=
ExpectedException
.
none
();
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/service/TaskServiceTest.java
浏览文件 @
131be3e8
...
...
@@ -19,7 +19,6 @@ import java.util.Map;
import
org.activiti.ProcessInstance
;
import
org.activiti.Task
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeclared
;
import
org.activiti.test.ProcessDeployer
;
...
...
@@ -29,7 +28,7 @@ import org.junit.Test;
/**
* @author Joram Barrez
*/
public
class
TaskServiceTest
extends
ActivitiTestCase
{
public
class
TaskServiceTest
{
@Rule
public
LogInitializer
logSetup
=
new
LogInitializer
();
...
...
modules/activiti-engine-test-api/src/test/java/org/activiti/test/task/TaskQueryTest.java
浏览文件 @
131be3e8
...
...
@@ -24,7 +24,6 @@ import org.activiti.ActivitiException;
import
org.activiti.IdentityService
;
import
org.activiti.Task
;
import
org.activiti.TaskQuery
;
import
org.activiti.test.ActivitiTestCase
;
import
org.activiti.test.LogInitializer
;
import
org.activiti.test.ProcessDeployer
;
import
org.junit.After
;
...
...
@@ -35,7 +34,7 @@ import org.junit.Test;
/**
* @author Joram Barrez
*/
public
class
TaskQueryTest
extends
ActivitiTestCase
{
public
class
TaskQueryTest
{
private
List
<
String
>
taskIds
;
@Rule
...
...
modules/activiti-engine/src/main/java/org/activiti/impl/bytes/ByteArrayImpl.java
浏览文件 @
131be3e8
...
...
@@ -14,7 +14,6 @@ package org.activiti.impl.bytes;
import
java.io.Serializable
;
import
org.activiti.impl.interceptor.CommandContext
;
import
org.activiti.impl.persistence.PersistentObject
;
import
org.activiti.impl.variable.ByteArrayType
;
...
...
modules/activiti-engine/src/main/java/org/activiti/impl/definition/ScopeElementImpl.java
浏览文件 @
131be3e8
...
...
@@ -21,7 +21,6 @@ import java.util.Map;
import
org.activiti.impl.timer.TimerDeclarationImpl
;
import
org.activiti.pvm.Listener
;
import
org.apache.ibatis.builder.xml.dynamic.SetSqlNode
;
/**
* @author Tom Baeyens
...
...
modules/activiti-engine/src/main/java/org/activiti/impl/embeddedstate/EmbeddedState.java
浏览文件 @
131be3e8
...
...
@@ -23,7 +23,6 @@ import org.activiti.ProcessInstance;
import
org.activiti.impl.definition.ProcessDefinitionImpl
;
import
org.activiti.impl.execution.ExecutionImpl
;
import
org.activiti.pvm.Activity
;
import
org.activiti.pvm.ActivityExecution
;
import
org.activiti.pvm.Transition
;
/**
...
...
modules/activiti-engine/src/main/java/org/activiti/impl/form/JuelFormEngine.java
浏览文件 @
131be3e8
...
...
@@ -12,20 +12,9 @@
*/
package
org.activiti.impl.form
;
import
java.io.ByteArrayInputStream
;
import
java.io.InputStreamReader
;
import
java.io.Reader
;
import
java.io.StringWriter
;
import
java.io.Writer
;
import
javax.el.ELContext
;
import
javax.el.ELResolver
;
import
javax.el.ExpressionFactory
;
import
javax.el.FunctionMapper
;
import
javax.el.MethodExpression
;
import
javax.el.ValueExpression
;
import
javax.el.VariableMapper
;
import
org.activiti.ActivitiException
;
import
org.activiti.impl.bytes.ByteArrayImpl
;
import
org.activiti.impl.repository.DeploymentImpl
;
...
...
modules/activiti-engine/src/main/java/org/activiti/impl/io/ResourceStreamSource.java
浏览文件 @
131be3e8
...
...
@@ -13,8 +13,6 @@
package
org.activiti.impl.io
;
import
java.io.InputStream
;
import
java.rmi.activation.ActivateFailedException
;
import
org.activiti.ActivitiException
;
...
...
modules/activiti-engine/src/main/java/org/activiti/impl/query/AbstractQuery.java
浏览文件 @
131be3e8
...
...
@@ -12,14 +12,7 @@
*/
package
org.activiti.impl.query
;
import
java.util.List
;
import
org.activiti.ActivitiException
;
import
org.activiti.Page
;
import
org.activiti.impl.ProcessEngineImpl
;
import
org.activiti.impl.interceptor.Command
;
import
org.activiti.impl.interceptor.CommandExecutor
;
import
org.activiti.impl.interceptor.CommandContext
;
/**
...
...
modules/activiti-engine/src/main/java/org/activiti/impl/repository/DeploymentImpl.java
浏览文件 @
131be3e8
...
...
@@ -21,7 +21,6 @@ import java.util.Map;
import
org.activiti.Deployment
;
import
org.activiti.impl.bytes.ByteArrayImpl
;
import
org.activiti.impl.interceptor.CommandContext
;
import
org.activiti.impl.persistence.PersistenceSession
;
/**
* @author Tom Baeyens
...
...
modules/activiti-engine/src/main/java/org/activiti/impl/scripting/ExpressionCondition.java
浏览文件 @
131be3e8
...
...
@@ -14,7 +14,6 @@ package org.activiti.impl.scripting;
import
org.activiti.ActivitiException
;
import
org.activiti.impl.execution.ExecutionImpl
;
import
org.activiti.impl.interceptor.CommandContext
;
import
org.activiti.pvm.ActivityExecution
;
import
org.activiti.pvm.Condition
;
...
...
modules/activiti-engine/src/main/java/org/activiti/impl/task/TaskImpl.java
浏览文件 @
131be3e8
...
...
@@ -28,8 +28,6 @@ import org.activiti.impl.db.execution.DbExecutionImpl;
import
org.activiti.impl.execution.ExecutionImpl
;
import
org.activiti.impl.execution.VariableMap
;
import
org.activiti.impl.interceptor.CommandContext
;
import
org.activiti.impl.json.JSONObject
;
import
org.activiti.impl.persistence.PersistenceSession
;
import
org.activiti.impl.persistence.PersistentObject
;
import
org.activiti.impl.time.Clock
;
import
org.activiti.pvm.ActivityExecution
;
...
...
modules/activiti-engine/src/main/java/org/activiti/impl/task/TaskInvolvement.java
浏览文件 @
131be3e8
...
...
@@ -16,7 +16,6 @@ import java.io.Serializable;
import
org.activiti.ActivitiException
;
import
org.activiti.impl.interceptor.CommandContext
;
import
org.activiti.impl.persistence.PersistenceSession
;
import
org.activiti.impl.persistence.PersistentObject
;
...
...
modules/activiti-engine/src/main/java/org/activiti/test/ActivitiTestCase.java
已删除
100644 → 0
浏览文件 @
15e821de
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.activiti.test
;
/**
* @author Tom Baeyens
*/
public
abstract
class
ActivitiTestCase
{
}
modules/activiti-engine/src/main/java/org/activiti/test/ProcessDeployer.java
浏览文件 @
131be3e8
...
...
@@ -27,14 +27,51 @@ import org.activiti.impl.bpmn.BpmnDeployer;
import
org.junit.runners.model.FrameworkMethod
;
/**
* <p>
* a JUnit @Rule that can be used to deploy and automatically undeploy
* processes.
* processes. The easiest way to use it is to simply declare it as a rule and
* then use the {@link ProcessDeclared} annotation on your test method. For
* example:
* </p>
*
* <pre>
* @Rule
* public ProcessDeployer deployer = new ProcessDeployer();
*
* @Test
* @ProcessDeclared
* public void testTaskAssignee() {
* ...
* }
* </pre>
*
* <p>
* This will load a process definition from a resource on the classpath with a
* name equal to
* {@link ProcessDeployer#getBpmnProcessDefinitionResource(Class, String)
* <className>.<methodName>.bpmn20.xml)}.
* <p/>
*
* <p>
* The annotation can also be used to specify a list of resources explicitly.
* See the {@link ProcessDeclared javadocs} for more information.
* <p/>
*
* <p>
* An alternative to the annotation, giving more control over the deployment, is
* the {@link #createDeployment()} method. This can be used to create a builder
* that registers its deployment with the test case, so that it can be
* automatically cleaned up after the test method completes.
* </p>
*
* @see ProcessDeclared
* @see ResourceUtils
*
* @author Dave Syer
*/
public
class
ProcessDeployer
extends
ProcessEngineBuilder
{
private
static
Logger
log
=
Logger
.
getLogger
(
ActivitiTestCase
.
class
.
getName
());
private
static
Logger
log
=
Logger
.
getLogger
(
ProcessDeployer
.
class
.
getName
());
private
Set
<
String
>
registeredDeploymentIds
=
new
HashSet
<
String
>();
...
...
@@ -49,7 +86,7 @@ public class ProcessDeployer extends ProcessEngineBuilder {
resources
=
resources
.
length
==
0
?
process
.
value
()
:
resources
;
if
(
resources
.
length
==
0
)
{
String
name
=
method
.
getName
();
String
resource
=
ResourceUtils
.
getBpmnProcessDefinitionResource
(
method
.
getMethod
().
getDeclaringClass
(),
name
);
String
resource
=
ProcessDeployer
.
getBpmnProcessDefinitionResource
(
method
.
getMethod
().
getDeclaringClass
(),
name
);
log
.
fine
(
"deploying bpmn process resource: "
+
resource
);
createDeployment
().
name
(
resource
).
addClasspathResource
(
resource
).
deploy
();
}
else
{
...
...
@@ -58,7 +95,7 @@ public class ProcessDeployer extends ProcessEngineBuilder {
if
(
resource
.
startsWith
(
"/"
))
{
resource
=
resource
.
substring
(
1
);
}
else
{
resource
=
ResourceUtils
.
getProcessDefinitionResource
(
method
.
getMethod
().
getDeclaringClass
(),
resource
);
resource
=
getProcessDefinitionResource
(
method
.
getMethod
().
getDeclaringClass
(),
resource
);
}
builder
.
addClasspathResource
(
resource
);
}
...
...
@@ -110,6 +147,17 @@ public class ProcessDeployer extends ProcessEngineBuilder {
registeredDeploymentIds
.
add
(
deploymentId
);
}
public
static
String
getBpmnProcessDefinitionResource
(
Class
<
?
>
type
,
String
name
)
{
return
type
.
getName
().
replace
(
'.'
,
'/'
)
+
"."
+
name
+
"."
+
BpmnDeployer
.
BPMN_RESOURCE_SUFFIX
;
}
private
static
String
getProcessDefinitionResource
(
Class
<
?
>
type
,
String
name
)
{
String
path
=
type
.
getName
();
path
=
path
.
substring
(
0
,
path
.
lastIndexOf
(
type
.
getSimpleName
())
-
1
);
System
.
err
.
println
(
path
);
return
path
.
replace
(
'.'
,
'/'
)
+
"/"
+
name
;
}
/**
* Method invoker wrapping a {@link DeploymentBuilder} and intercepting the
* <code>deploy</code> method to register the deployment for automatic removal
...
...
modules/activiti-engine/src/main/java/org/activiti/test/ResourceUtils.java
已删除
100644 → 0
浏览文件 @
15e821de
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.activiti.test
;
import
org.activiti.impl.bpmn.BpmnDeployer
;
/**
* @author Dave Syer
*/
public
class
ResourceUtils
{
public
static
String
getBpmnProcessDefinitionResource
(
Class
<
?
>
type
,
String
name
)
{
return
type
.
getName
().
replace
(
'.'
,
'/'
)
+
"."
+
name
+
"."
+
BpmnDeployer
.
BPMN_RESOURCE_SUFFIX
;
}
public
static
String
getProcessDefinitionResource
(
Class
<
?
>
type
,
String
name
)
{
String
path
=
type
.
getName
();
path
=
path
.
substring
(
0
,
path
.
lastIndexOf
(
type
.
getSimpleName
())
-
1
);
System
.
err
.
println
(
path
);
return
path
.
replace
(
'.'
,
'/'
)
+
"/"
+
name
;
}
}
modules/activiti-rest/src/main/java/org/activiti/rest/api/management/TableDataGet.java
浏览文件 @
131be3e8
...
...
@@ -12,7 +12,6 @@
*/
package
org.activiti.rest.api.management
;
import
org.activiti.TablePage
;
import
org.activiti.TablePageQuery
;
import
org.activiti.rest.util.ActivitiWebScript
;
import
org.springframework.extensions.webscripts.Cache
;
...
...
@@ -24,7 +23,7 @@ import java.util.Map;
/**
* Returns data, metadata and paging info about a table.
*
* @author Erik Winlf
* @author Erik Winl
�
f
*/
public
class
TableDataGet
extends
ActivitiWebScript
{
...
...
modules/activiti-rest/src/main/java/org/activiti/rest/api/management/TableGet.java
浏览文件 @
131be3e8
...
...
@@ -14,7 +14,6 @@ package org.activiti.rest.api.management;
import
java.util.Map
;
import
org.activiti.TablePage
;
import
org.activiti.rest.util.ActivitiWebScript
;
import
org.springframework.extensions.webscripts.Cache
;
import
org.springframework.extensions.webscripts.Status
;
...
...
@@ -23,7 +22,7 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
/**
* Returns data, metadata and paging info about a table.
*
* @author Erik Winlf
* @author Erik Winl
�
f
*/
public
class
TableGet
extends
ActivitiWebScript
{
...
...
modules/activiti-rest/src/main/java/org/activiti/rest/api/tasks/TaskOperationPut.java
浏览文件 @
131be3e8
...
...
@@ -12,7 +12,6 @@
*/
package
org.activiti.rest.api.tasks
;
import
org.activiti.Task
;
import
org.activiti.rest.util.ActivitiWebScript
;
import
org.springframework.extensions.webscripts.Cache
;
import
org.springframework.extensions.webscripts.Status
;
...
...
@@ -24,7 +23,7 @@ import java.util.Map;
/**
* Performs a given action on a task.
*
* @author Erik Winlf
* @author Erik Winl
�
f
*/
public
class
TaskOperationPut
extends
ActivitiWebScript
{
...
...
modules/activiti-rest/src/main/java/org/activiti/rest/api/tasks/TasksGet.java
浏览文件 @
131be3e8
...
...
@@ -14,7 +14,6 @@ package org.activiti.rest.api.tasks;
import
java.util.Map
;
import
org.activiti.Page
;
import
org.activiti.TaskQuery
;
import
org.activiti.rest.util.ActivitiWebScript
;
import
org.springframework.extensions.webscripts.*
;
...
...
@@ -22,7 +21,7 @@ import org.springframework.extensions.webscripts.*;
/**
* Returns info about a list of tasks depending on the search filters.
*
* @author Erik Winlf
* @author Erik Winl
�
f
*/
public
class
TasksGet
extends
ActivitiWebScript
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录