Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
3c17178b
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
3c17178b
编写于
10月 30, 2019
作者:
C
Christoph Dreis
提交者:
Juergen Hoeller
10月 30, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix Mockito deprecations
上级
4beb25b3
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
33 addition
and
32 deletion
+33
-32
spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
...amework/aop/aspectj/AfterReturningAdviceBindingTests.java
+2
-2
spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
...mework/context/annotation/EnableLoadTimeWeavingTests.java
+3
-3
spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
...jb/access/LocalStatelessSessionProxyFactoryBeanTests.java
+2
-2
spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
...ss/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
+2
-2
spring-core/src/test/java/org/springframework/util/concurrent/ListenableFutureTaskTests.java
...gframework/util/concurrent/ListenableFutureTaskTests.java
+3
-3
spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java
...essaging/rsocket/DefaultRSocketRequesterBuilderTests.java
+2
-2
spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java
...ssaging/simp/user/UserDestinationMessageHandlerTests.java
+5
-4
spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java
...k/messaging/support/ExecutorSubscribableChannelTests.java
+2
-2
spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java
...n/interceptor/AbstractReactiveTransactionAspectTests.java
+2
-2
spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
...ansaction/interceptor/AbstractTransactionAspectTests.java
+2
-2
spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
.../transaction/interceptor/BeanFactoryTransactionTests.java
+2
-2
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java
...k/web/reactive/function/client/DefaultWebClientTests.java
+2
-2
spring-webmvc/src/test/java/org/springframework/web/servlet/HandlerExecutionChainTests.java
...ringframework/web/servlet/HandlerExecutionChainTests.java
+2
-2
spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java
...rk/web/socket/messaging/StompSubProtocolHandlerTests.java
+2
-2
未找到文件。
spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
浏览文件 @
3c17178b
...
...
@@ -29,7 +29,7 @@ import org.springframework.tests.sample.beans.TestBean;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verify
Zer
oInteractions
;
import
static
org
.
mockito
.
Mockito
.
verify
N
oInteractions
;
/**
* Tests for various parameter binding scenarios with before advice.
...
...
@@ -129,7 +129,7 @@ public class AfterReturningAdviceBindingTests {
public
void
testNoInvokeWhenReturningParameterTypeDoesNotMatch
()
{
testBeanProxy
.
setSpouse
(
this
.
testBeanProxy
);
testBeanProxy
.
getSpouse
();
verify
Zer
oInteractions
(
mockCollaborator
);
verify
N
oInteractions
(
mockCollaborator
);
}
@Test
...
...
spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java
浏览文件 @
3c17178b
...
...
@@ -27,7 +27,7 @@ import org.springframework.instrument.classloading.LoadTimeWeaver;
import
static
org
.
mockito
.
ArgumentMatchers
.
isA
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verify
Zer
oInteractions
;
import
static
org
.
mockito
.
Mockito
.
verify
N
oInteractions
;
/**
* Unit tests for @EnableLoadTimeWeaving
...
...
@@ -50,7 +50,7 @@ public class EnableLoadTimeWeavingTests {
ctx
.
register
(
EnableLTWConfig_withAjWeavingDisabled
.
class
);
ctx
.
refresh
();
LoadTimeWeaver
loadTimeWeaver
=
ctx
.
getBean
(
"loadTimeWeaver"
,
LoadTimeWeaver
.
class
);
verify
Zer
oInteractions
(
loadTimeWeaver
);
verify
N
oInteractions
(
loadTimeWeaver
);
}
@Test
...
...
@@ -61,7 +61,7 @@ public class EnableLoadTimeWeavingTests {
LoadTimeWeaver
loadTimeWeaver
=
ctx
.
getBean
(
"loadTimeWeaver"
,
LoadTimeWeaver
.
class
);
// no expectations -> a class file transformer should NOT be added
// because no META-INF/aop.xml is present on the classpath
verify
Zer
oInteractions
(
loadTimeWeaver
);
verify
N
oInteractions
(
loadTimeWeaver
);
}
@Test
...
...
spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java
浏览文件 @
3c17178b
...
...
@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
import
static
org
.
mockito
.
BDDMockito
.
given
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verify
Zer
oInteractions
;
import
static
org
.
mockito
.
Mockito
.
verify
N
oInteractions
;
/**
* @author Rod Johnson
...
...
@@ -175,7 +175,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests {
.
withMessageContaining
(
"businessInterface"
);
// Expect no methods on home
verify
Zer
oInteractions
(
home
);
verify
N
oInteractions
(
home
);
}
...
...
spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java
浏览文件 @
3c17178b
...
...
@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
import
static
org
.
mockito
.
BDDMockito
.
given
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verify
Zer
oInteractions
;
import
static
org
.
mockito
.
Mockito
.
verify
N
oInteractions
;
/**
* @author Rod Johnson
...
...
@@ -260,7 +260,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem
.
withMessageContaining
(
"businessInterface"
);
// Expect no methods on home
verify
Zer
oInteractions
(
home
);
verify
N
oInteractions
(
home
);
}
...
...
spring-core/src/test/java/org/springframework/util/concurrent/ListenableFutureTaskTests.java
浏览文件 @
3c17178b
...
...
@@ -27,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
fail
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verify
Zer
oInteractions
;
import
static
org
.
mockito
.
Mockito
.
verify
N
oInteractions
;
/**
* @author Arjen Poutsma
...
...
@@ -98,7 +98,7 @@ class ListenableFutureTaskTests {
task
.
addCallback
(
successCallback
,
failureCallback
);
task
.
run
();
verify
(
successCallback
).
onSuccess
(
s
);
verify
Zer
oInteractions
(
failureCallback
);
verify
N
oInteractions
(
failureCallback
);
assertThat
(
task
.
get
()).
isSameAs
(
s
);
assertThat
(
task
.
completable
().
get
()).
isSameAs
(
s
);
...
...
@@ -119,7 +119,7 @@ class ListenableFutureTaskTests {
task
.
addCallback
(
successCallback
,
failureCallback
);
task
.
run
();
verify
(
failureCallback
).
onFailure
(
ex
);
verify
Zer
oInteractions
(
successCallback
);
verify
N
oInteractions
(
successCallback
);
assertThatExceptionOfType
(
ExecutionException
.
class
).
isThrownBy
(
task:
:
get
)
...
...
spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java
浏览文件 @
3c17178b
...
...
@@ -53,7 +53,7 @@ import static org.mockito.ArgumentMatchers.anyInt;
import
static
org
.
mockito
.
BDDMockito
.
given
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verify
Zer
oInteractions
;
import
static
org
.
mockito
.
Mockito
.
verify
N
oInteractions
;
/**
* Unit tests for {@link DefaultRSocketRequesterBuilder}.
...
...
@@ -85,7 +85,7 @@ public class DefaultRSocketRequesterBuilderTests {
.
rsocketStrategies
(
strategiesConfigurer
)
.
connect
(
this
.
transport
);
verify
Zer
oInteractions
(
this
.
transport
);
verify
N
oInteractions
(
this
.
transport
);
assertThat
(
this
.
rsocketFactoryConfigurer
.
rsocketFactory
()).
isNull
();
}
...
...
spring-messaging/src/test/java/org/springframework/messaging/simp/user/UserDestinationMessageHandlerTests.java
浏览文件 @
3c17178b
...
...
@@ -36,6 +36,7 @@ import org.springframework.messaging.support.MessageBuilder;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
mockito
.
BDDMockito
.
given
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
verifyNoInteractions
;
import
static
org
.
mockito
.
Mockito
.
verifyNoMoreInteractions
;
import
static
org
.
springframework
.
messaging
.
simp
.
SimpMessageHeaderAccessor
.
ORIGINAL_DESTINATION
;
...
...
@@ -173,19 +174,19 @@ public class UserDestinationMessageHandlerTests {
// no destination
this
.
handler
.
handleMessage
(
createWith
(
SimpMessageType
.
MESSAGE
,
"joe"
,
"123"
,
null
));
Mockito
.
verifyZer
oInteractions
(
this
.
brokerChannel
);
verifyN
oInteractions
(
this
.
brokerChannel
);
// not a user destination
this
.
handler
.
handleMessage
(
createWith
(
SimpMessageType
.
MESSAGE
,
"joe"
,
"123"
,
"/queue/foo"
));
Mockito
.
verifyZer
oInteractions
(
this
.
brokerChannel
);
verifyN
oInteractions
(
this
.
brokerChannel
);
// subscribe + not a user destination
this
.
handler
.
handleMessage
(
createWith
(
SimpMessageType
.
SUBSCRIBE
,
"joe"
,
"123"
,
"/queue/foo"
));
Mockito
.
verifyZer
oInteractions
(
this
.
brokerChannel
);
verifyN
oInteractions
(
this
.
brokerChannel
);
// no match on message type
this
.
handler
.
handleMessage
(
createWith
(
SimpMessageType
.
CONNECT
,
"joe"
,
"123"
,
"user/joe/queue/foo"
));
Mockito
.
verifyZer
oInteractions
(
this
.
brokerChannel
);
verifyN
oInteractions
(
this
.
brokerChannel
);
}
...
...
spring-messaging/src/test/java/org/springframework/messaging/support/ExecutorSubscribableChannelTests.java
浏览文件 @
3c17178b
...
...
@@ -38,8 +38,8 @@ import static org.mockito.Mockito.mock;
import
static
org
.
mockito
.
Mockito
.
never
;
import
static
org
.
mockito
.
Mockito
.
times
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verifyNoInteractions
;
import
static
org
.
mockito
.
Mockito
.
verifyNoMoreInteractions
;
import
static
org
.
mockito
.
Mockito
.
verifyZeroInteractions
;
/**
* Unit tests for {@link ExecutorSubscribableChannel}.
...
...
@@ -126,7 +126,7 @@ public class ExecutorSubscribableChannelTests {
catch
(
MessageDeliveryException
actualException
)
{
assertThat
(
actualException
.
getCause
()).
isEqualTo
(
ex
);
}
verify
Zer
oInteractions
(
secondHandler
);
verify
N
oInteractions
(
secondHandler
);
}
@Test
...
...
spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractReactiveTransactionAspectTests.java
浏览文件 @
3c17178b
...
...
@@ -37,7 +37,7 @@ import static org.mockito.BDDMockito.given;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
times
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verify
Zer
oInteractions
;
import
static
org
.
mockito
.
Mockito
.
verify
N
oInteractions
;
/**
* Abstract support class to test {@link TransactionAspectSupport} with reactive methods.
...
...
@@ -79,7 +79,7 @@ public abstract class AbstractReactiveTransactionAspectTests {
checkReactiveTransaction
(
false
);
// expect no calls
verify
Zer
oInteractions
(
rtm
);
verify
N
oInteractions
(
rtm
);
}
/**
...
...
spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
浏览文件 @
3c17178b
...
...
@@ -42,7 +42,7 @@ import static org.mockito.BDDMockito.willThrow;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
times
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verify
Zer
oInteractions
;
import
static
org
.
mockito
.
Mockito
.
verify
N
oInteractions
;
/**
* Mock object based tests for transaction aspects. A true unit test in that it
...
...
@@ -90,7 +90,7 @@ public abstract class AbstractTransactionAspectTests {
checkTransactionStatus
(
false
);
// expect no calls
verify
Zer
oInteractions
(
ptm
);
verify
N
oInteractions
(
ptm
);
}
/**
...
...
spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
浏览文件 @
3c17178b
...
...
@@ -45,7 +45,7 @@ import org.springframework.transaction.TransactionStatus;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThatExceptionOfType
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
verify
Zer
oInteractions
;
import
static
org
.
mockito
.
Mockito
.
verify
N
oInteractions
;
/**
* Test cases for AOP transaction management.
...
...
@@ -148,7 +148,7 @@ public class BeanFactoryTransactionTests {
assertThat
(
testBean
.
getAge
()
==
666
).
as
(
"Age should not be "
+
testBean
.
getAge
()).
isTrue
();
// Expect no methods
verify
Zer
oInteractions
(
ptm
);
verify
N
oInteractions
(
ptm
);
// Install facade expecting a call
final
TransactionStatus
ts
=
mock
(
TransactionStatus
.
class
);
...
...
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java
浏览文件 @
3c17178b
...
...
@@ -41,8 +41,8 @@ import static org.mockito.ArgumentMatchers.any;
import
static
org
.
mockito
.
BDDMockito
.
given
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verifyNoInteractions
;
import
static
org
.
mockito
.
Mockito
.
verifyNoMoreInteractions
;
import
static
org
.
mockito
.
Mockito
.
verifyZeroInteractions
;
/**
* Unit tests for {@link DefaultWebClient}.
...
...
@@ -303,7 +303,7 @@ public class DefaultWebClientTests {
)
.
build
();
Mono
<
ClientResponse
>
exchange
=
client
.
get
().
uri
(
"/path"
).
exchange
();
verify
Zer
oInteractions
(
this
.
exchangeFunction
);
verify
N
oInteractions
(
this
.
exchangeFunction
);
exchange
.
block
(
Duration
.
ofSeconds
(
10
));
ClientRequest
request
=
verifyAndGetRequest
();
assertThat
(
request
.
headers
().
getFirst
(
"Custom"
)).
isEqualTo
(
"value"
);
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/HandlerExecutionChainTests.java
浏览文件 @
3c17178b
...
...
@@ -27,7 +27,7 @@ import static org.mockito.BDDMockito.given;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
never
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verify
Zer
oInteractions
;
import
static
org
.
mockito
.
Mockito
.
verify
N
oInteractions
;
/**
* A test fixture with HandlerExecutionChain and mock handler interceptors.
...
...
@@ -120,7 +120,7 @@ public class HandlerExecutionChainTests {
@Test
public
void
exceptionBeforePreHandle
()
throws
Exception
{
this
.
chain
.
triggerAfterCompletion
(
this
.
request
,
this
.
response
,
null
);
verify
Zer
oInteractions
(
this
.
interceptor1
,
this
.
interceptor2
,
this
.
interceptor3
);
verify
N
oInteractions
(
this
.
interceptor1
,
this
.
interceptor2
,
this
.
interceptor3
);
}
@Test
...
...
spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java
浏览文件 @
3c17178b
...
...
@@ -66,8 +66,8 @@ import static org.mockito.Mockito.mock;
import
static
org
.
mockito
.
Mockito
.
reset
;
import
static
org
.
mockito
.
Mockito
.
times
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
verifyNoInteractions
;
import
static
org
.
mockito
.
Mockito
.
verifyNoMoreInteractions
;
import
static
org
.
mockito
.
Mockito
.
verifyZeroInteractions
;
/**
* Test fixture for {@link StompSubProtocolHandler} tests.
...
...
@@ -402,7 +402,7 @@ public class StompSubProtocolHandlerTests {
this
.
protocolHandler
.
afterSessionStarted
(
this
.
session
,
this
.
channel
);
this
.
protocolHandler
.
handleMessageFromClient
(
this
.
session
,
textMessage
,
this
.
channel
);
verify
Zer
oInteractions
(
this
.
channel
);
verify
N
oInteractions
(
this
.
channel
);
assertThat
(
this
.
session
.
getSentMessages
().
size
()).
isEqualTo
(
1
);
TextMessage
actual
=
(
TextMessage
)
this
.
session
.
getSentMessages
().
get
(
0
);
assertThat
(
actual
.
getPayload
().
startsWith
(
"ERROR"
)).
isTrue
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录