Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
7fb3c745
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,发现更多精彩内容 >>
提交
7fb3c745
编写于
3月 31, 2014
作者:
T
Tijs Rademakers
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/Activiti/Activiti
上级
45fc1920
befb0f33
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
6 addition
and
6 deletion
+6
-6
modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ExecutionVariableCollectionResource.java
.../runtime/process/ExecutionVariableCollectionResource.java
+1
-1
modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/task/TaskVariableCollectionResource.java
...vice/api/runtime/task/TaskVariableCollectionResource.java
+1
-1
modules/activiti-rest/src/test/java/org/activiti/rest/service/api/runtime/ProcessInstanceVariablesCollectionResourceTest.java
...ntime/ProcessInstanceVariablesCollectionResourceTest.java
+2
-2
modules/activiti-rest/src/test/java/org/activiti/rest/service/api/runtime/TaskVariablesCollectionResourceTest.java
...vice/api/runtime/TaskVariablesCollectionResourceTest.java
+2
-2
未找到文件。
modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ExecutionVariableCollectionResource.java
浏览文件 @
7fb3c745
...
...
@@ -115,7 +115,7 @@ public class ExecutionVariableCollectionResource extends BaseExecutionVariableRe
RestVariable
[]
restVariables
=
getConverterService
().
toObject
(
representation
,
RestVariable
[].
class
,
this
);
if
(
restVariables
==
null
||
restVariables
.
length
==
0
)
{
throw
new
ActivitiIllegalArgumentException
(
"Request didn't c
a
ntain a list of variables to create."
);
throw
new
ActivitiIllegalArgumentException
(
"Request didn't c
o
ntain a list of variables to create."
);
}
RestVariableScope
sharedScope
=
null
;
...
...
modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/task/TaskVariableCollectionResource.java
浏览文件 @
7fb3c745
...
...
@@ -86,7 +86,7 @@ public class TaskVariableCollectionResource extends TaskVariableBaseResource {
RestVariable
[]
restVariables
=
getConverterService
().
toObject
(
representation
,
RestVariable
[].
class
,
this
);
if
(
restVariables
==
null
||
restVariables
.
length
==
0
)
{
throw
new
ActivitiIllegalArgumentException
(
"Request didn't c
a
ntain a list of variables to create."
);
throw
new
ActivitiIllegalArgumentException
(
"Request didn't c
o
ntain a list of variables to create."
);
}
RestVariableScope
sharedScope
=
null
;
...
...
modules/activiti-rest/src/test/java/org/activiti/rest/service/api/runtime/ProcessInstanceVariablesCollectionResourceTest.java
浏览文件 @
7fb3c745
...
...
@@ -257,7 +257,7 @@ public class ProcessInstanceVariablesCollectionResourceTest extends BaseRestTest
fail
(
"Exception expected"
);
}
catch
(
ResourceException
expected
)
{
assertEquals
(
Status
.
CLIENT_ERROR_BAD_REQUEST
,
expected
.
getStatus
());
assertEquals
(
"Request didn't c
a
ntain a list of variables to create."
,
expected
.
getStatus
().
getDescription
());
assertEquals
(
"Request didn't c
o
ntain a list of variables to create."
,
expected
.
getStatus
().
getDescription
());
}
// Test passing in object instead of array
...
...
@@ -267,7 +267,7 @@ public class ProcessInstanceVariablesCollectionResourceTest extends BaseRestTest
fail
(
"Exception expected"
);
}
catch
(
ResourceException
expected
)
{
assertEquals
(
Status
.
CLIENT_ERROR_BAD_REQUEST
,
expected
.
getStatus
());
assertEquals
(
"Request didn't c
a
ntain a list of variables to create."
,
expected
.
getStatus
().
getDescription
());
assertEquals
(
"Request didn't c
o
ntain a list of variables to create."
,
expected
.
getStatus
().
getDescription
());
}
}
...
...
modules/activiti-rest/src/test/java/org/activiti/rest/service/api/runtime/TaskVariablesCollectionResourceTest.java
浏览文件 @
7fb3c745
...
...
@@ -400,7 +400,7 @@ public class TaskVariablesCollectionResourceTest extends BaseRestTestCase {
fail
(
"Exception expected"
);
}
catch
(
ResourceException
expected
)
{
assertEquals
(
Status
.
CLIENT_ERROR_BAD_REQUEST
,
expected
.
getStatus
());
assertEquals
(
"Request didn't c
a
ntain a list of variables to create."
,
expected
.
getStatus
().
getDescription
());
assertEquals
(
"Request didn't c
o
ntain a list of variables to create."
,
expected
.
getStatus
().
getDescription
());
}
// Test passing in object instead of array
...
...
@@ -410,7 +410,7 @@ public class TaskVariablesCollectionResourceTest extends BaseRestTestCase {
fail
(
"Exception expected"
);
}
catch
(
ResourceException
expected
)
{
assertEquals
(
Status
.
CLIENT_ERROR_BAD_REQUEST
,
expected
.
getStatus
());
assertEquals
(
"Request didn't c
a
ntain a list of variables to create."
,
expected
.
getStatus
().
getDescription
());
assertEquals
(
"Request didn't c
o
ntain a list of variables to create."
,
expected
.
getStatus
().
getDescription
());
}
}
finally
{
// Clean adhoc-tasks even if test fails
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录