Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
f6d520d4
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f6d520d4
编写于
7月 12, 2011
作者:
J
Jerome Lacoste
提交者:
Kohsuke Kawaguchi
7月 16, 2011
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix TaskThread.ListenerAndText chicken and egg issue
上级
cbbee982
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
74 addition
and
7 deletion
+74
-7
core/src/main/java/hudson/model/TaskThread.java
core/src/main/java/hudson/model/TaskThread.java
+7
-7
core/src/test/java/hudson/model/TaskActionTest.java
core/src/test/java/hudson/model/TaskActionTest.java
+67
-0
未找到文件。
core/src/main/java/hudson/model/TaskThread.java
浏览文件 @
f6d520d4
...
...
@@ -56,7 +56,7 @@ public abstract class TaskThread extends Thread {
/**
* Represents the output from this task thread.
*/
private
final
AnnotatedLargeText
<
Task
Thread
>
log
;
private
final
AnnotatedLargeText
<
Task
Action
>
log
;
/**
* Represents the interface to produce output.
...
...
@@ -151,9 +151,9 @@ public abstract class TaskThread extends Thread {
*/
public
static
final
class
ListenerAndText
{
final
TaskListener
listener
;
final
AnnotatedLargeText
<
Task
Thread
>
text
;
final
AnnotatedLargeText
<
Task
Action
>
text
;
public
ListenerAndText
(
TaskListener
listener
,
AnnotatedLargeText
<
Task
Thread
>
text
)
{
public
ListenerAndText
(
TaskListener
listener
,
AnnotatedLargeText
<
Task
Action
>
text
)
{
this
.
listener
=
listener
;
this
.
text
=
text
;
}
...
...
@@ -177,23 +177,23 @@ public abstract class TaskThread extends Thread {
/**
* Creates one that's backed by memory.
*/
public
static
ListenerAndText
forMemory
(
Task
Thread
context
)
{
public
static
ListenerAndText
forMemory
(
Task
Action
context
)
{
// StringWriter is synchronized
ByteBuffer
log
=
new
ByteBuffer
();
return
new
ListenerAndText
(
new
StreamTaskListener
(
log
),
new
AnnotatedLargeText
<
Task
Thread
>(
log
,
Charset
.
defaultCharset
(),
false
,
context
)
new
AnnotatedLargeText
<
Task
Action
>(
log
,
Charset
.
defaultCharset
(),
false
,
context
)
);
}
/**
* Creates one that's backed by a file.
*/
public
static
ListenerAndText
forFile
(
File
f
,
Task
Thread
context
)
throws
IOException
{
public
static
ListenerAndText
forFile
(
File
f
,
Task
Action
context
)
throws
IOException
{
return
new
ListenerAndText
(
new
StreamTaskListener
(
f
),
new
AnnotatedLargeText
<
Task
Thread
>(
f
,
Charset
.
defaultCharset
(),
false
,
context
)
new
AnnotatedLargeText
<
Task
Action
>(
f
,
Charset
.
defaultCharset
(),
false
,
context
)
);
}
}
...
...
core/src/test/java/hudson/model/TaskActionTest.java
0 → 100644
浏览文件 @
f6d520d4
package
hudson.model
;
import
junit.framework.TestCase
;
import
java.io.ByteArrayOutputStream
;
import
hudson.console.AnnotatedLargeText
;
import
hudson.security.ACL
;
import
hudson.security.Permission
;
import
hudson.security.PermissionGroup
;
import
org.acegisecurity.Authentication
;
/**
* @author Jerome Lacoste
*/
public
class
TaskActionTest
extends
TestCase
{
private
static
class
MyTaskThread
extends
TaskThread
{
MyTaskThread
(
TaskAction
taskAction
)
{
super
(
taskAction
,
ListenerAndText
.
forMemory
(
taskAction
));
}
protected
void
perform
(
TaskListener
listener
)
throws
Exception
{
listener
.
hyperlink
(
"/localpath"
,
"a link"
);
}
}
private
static
class
MyTaskAction
extends
TaskAction
{
void
start
()
{
workerThread
=
new
MyTaskThread
(
this
);
workerThread
.
start
();
}
public
String
getIconFileName
()
{
return
"Iconfilename"
;
}
public
String
getDisplayName
()
{
return
"My Task Thread"
;
}
public
String
getUrlName
()
{
return
"xyz"
;
}
protected
Permission
getPermission
()
{
return
Permission
.
READ
;
}
protected
ACL
getACL
()
{
return
new
ACL
()
{
public
boolean
hasPermission
(
Authentication
a
,
Permission
permission
)
{
return
true
;
}
};
}
}
public
void
testAnnotatedText
()
throws
Exception
{
MyTaskAction
action
=
new
MyTaskAction
();
action
.
start
();
AnnotatedLargeText
annotatedText
=
action
.
obtainLog
();
while
(!
annotatedText
.
isComplete
())
{
Thread
.
sleep
(
10
);
}
ByteArrayOutputStream
os
=
new
ByteArrayOutputStream
();
annotatedText
.
writeLogTo
(
0
,
os
);
assertTrue
(
os
.
toString
(
"UTF-8"
).
startsWith
(
"a linkCompleted"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录