Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
306c44d2
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
306c44d2
编写于
12月 26, 2011
作者:
V
Vishnu Atrai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove ForClassicTestUnit support for ruby 1.8
上级
bec7cf2d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
112 deletion
+2
-112
activesupport/lib/active_support/testing/performance.rb
activesupport/lib/active_support/testing/performance.rb
+1
-48
activesupport/lib/active_support/testing/setup_and_teardown.rb
...esupport/lib/active_support/testing/setup_and_teardown.rb
+1
-64
未找到文件。
activesupport/lib/active_support/testing/performance.rb
浏览文件 @
306c44d2
...
...
@@ -13,12 +13,7 @@ module Performance
included
do
superclass_delegating_accessor
:profile_options
self
.
profile_options
=
{}
if
defined?
(
MiniTest
::
Assertions
)
&&
TestCase
<
MiniTest
::
Assertions
include
ForMiniTest
else
include
ForClassicTestUnit
end
include
ForMiniTest
end
# each implementation should define metrics and freeze the defaults
...
...
@@ -77,48 +72,6 @@ def run_test(metric, mode)
end
end
module
ForClassicTestUnit
def
run
(
result
)
return
if
method_name
=~
/^default_test$/
yield
(
self
.
class
::
STARTED
,
name
)
@_result
=
result
run_warmup
if
full_profile_options
&&
metrics
=
full_profile_options
[
:metrics
]
metrics
.
each
do
|
metric_name
|
if
klass
=
Metrics
[
metric_name
.
to_sym
]
run_profile
(
klass
.
new
)
result
.
add_run
else
puts
'%20s: unsupported'
%
metric_name
end
end
end
yield
(
self
.
class
::
FINISHED
,
name
)
end
def
run_test
(
metric
,
mode
)
run_callbacks
:setup
setup
metric
.
send
(
mode
)
{
__send__
@method_name
}
rescue
::
Test
::
Unit
::
AssertionFailedError
=>
e
add_failure
(
e
.
message
,
e
.
backtrace
)
rescue
StandardError
,
ScriptError
=>
e
add_error
(
e
)
ensure
begin
teardown
run_callbacks
:teardown
,
:enumerator
=>
:reverse_each
rescue
::
Test
::
Unit
::
AssertionFailedError
=>
e
add_failure
(
e
.
message
,
e
.
backtrace
)
rescue
StandardError
,
ScriptError
=>
e
add_error
(
e
)
end
end
end
protected
# overridden by each implementation
def
run_gc
;
end
...
...
activesupport/lib/active_support/testing/setup_and_teardown.rb
浏览文件 @
306c44d2
...
...
@@ -10,11 +10,7 @@ module SetupAndTeardown
include
ActiveSupport
::
Callbacks
define_callbacks
:setup
,
:teardown
if
defined?
(
MiniTest
::
Assertions
)
&&
TestCase
<
MiniTest
::
Assertions
include
ForMiniTest
else
include
ForClassicTestUnit
end
include
ForMiniTest
end
module
ClassMethods
...
...
@@ -47,65 +43,6 @@ def run(runner)
end
end
module
ForClassicTestUnit
# For compatibility with Ruby < 1.8.6
PASSTHROUGH_EXCEPTIONS
=
Test
::
Unit
::
TestCase
::
PASSTHROUGH_EXCEPTIONS
rescue
[
NoMemoryError
,
SignalException
,
Interrupt
,
SystemExit
]
# This redefinition is unfortunate but test/unit shows us no alternative.
# Doubly unfortunate: hax to support Mocha's hax.
def
run
(
result
)
return
if
@method_name
.
to_s
==
"default_test"
mocha_counter
=
retrieve_mocha_counter
(
result
)
yield
(
Test
::
Unit
::
TestCase
::
STARTED
,
name
)
@_result
=
result
begin
begin
run_callbacks
:setup
do
setup
__send__
(
@method_name
)
mocha_verify
(
mocha_counter
)
if
mocha_counter
end
rescue
Mocha
::
ExpectationError
=>
e
add_failure
(
e
.
message
,
e
.
backtrace
)
rescue
Test
::
Unit
::
AssertionFailedError
=>
e
add_failure
(
e
.
message
,
e
.
backtrace
)
rescue
Exception
=>
e
raise
if
PASSTHROUGH_EXCEPTIONS
.
include?
(
e
.
class
)
add_error
(
e
)
ensure
begin
teardown
run_callbacks
:teardown
rescue
Test
::
Unit
::
AssertionFailedError
=>
e
add_failure
(
e
.
message
,
e
.
backtrace
)
rescue
Exception
=>
e
raise
if
PASSTHROUGH_EXCEPTIONS
.
include?
(
e
.
class
)
add_error
(
e
)
end
end
ensure
mocha_teardown
if
mocha_counter
end
result
.
add_run
yield
(
Test
::
Unit
::
TestCase
::
FINISHED
,
name
)
end
protected
def
retrieve_mocha_counter
(
result
)
#:nodoc:
if
respond_to?
(
:mocha_verify
)
# using mocha
if
defined?
(
Mocha
::
TestCaseAdapter
::
AssertionCounter
)
Mocha
::
TestCaseAdapter
::
AssertionCounter
.
new
(
result
)
else
Mocha
::
Integration
::
TestUnit
::
AssertionCounter
.
new
(
result
)
end
end
end
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录